diff options
| author | bors <bors@rust-lang.org> | 2014-01-17 20:36:47 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-17 20:36:47 -0800 |
| commit | c58d2bacb78ed0d2b9c0c0909e56f390b525aabd (patch) | |
| tree | cfdb77d3b7fc5febbbe2e7cca33a4d1bb11efcd1 /src/libstd/num/f32.rs | |
| parent | f4498c71e21308f6657d0150d5f473835e4b436f (diff) | |
| parent | ed7e576d9cf807169b17b5a4c572e874e38681cf (diff) | |
| download | rust-c58d2bacb78ed0d2b9c0c0909e56f390b525aabd.tar.gz rust-c58d2bacb78ed0d2b9c0c0909e56f390b525aabd.zip | |
auto merge of #11503 : FlaPer87/rust/master, r=huonw
The patch adds the missing pow method for all the implementations of the Integer trait. This is a small addition that will most likely be improved by the work happening in #10387. Fixes #11499
Diffstat (limited to 'src/libstd/num/f32.rs')
| -rw-r--r-- | src/libstd/num/f32.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs index a8eaa895650..e77348268c7 100644 --- a/src/libstd/num/f32.rs +++ b/src/libstd/num/f32.rs @@ -409,7 +409,7 @@ impl Real for f32 { fn recip(&self) -> f32 { 1.0 / *self } #[inline] - fn pow(&self, n: &f32) -> f32 { pow(*self, *n) } + fn powf(&self, n: &f32) -> f32 { pow(*self, *n) } #[inline] fn sqrt(&self) -> f32 { sqrt(*self) } @@ -1265,7 +1265,7 @@ mod tests { fn test_integer_decode() { assert_eq!(3.14159265359f32.integer_decode(), (13176795u64, -22i16, 1i8)); assert_eq!((-8573.5918555f32).integer_decode(), (8779358u64, -10i16, -1i8)); - assert_eq!(2f32.pow(&100.0).integer_decode(), (8388608u64, 77i16, 1i8)); + assert_eq!(2f32.powf(&100.0).integer_decode(), (8388608u64, 77i16, 1i8)); assert_eq!(0f32.integer_decode(), (0u64, -150i16, 1i8)); assert_eq!((-0f32).integer_decode(), (0u64, -150i16, -1i8)); assert_eq!(INFINITY.integer_decode(), (8388608u64, 105i16, 1i8)); |