bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #22631 - aepsil0n:issue-22098, r=aturon

Browse source 
Fixes #22098.
This commit is contained in:
Manish Goregaokar 2015-03-20 05:30:44 +05:30
commit 1ceb26b48c
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstd/num/f32.rs
View file

@ -191,8 +191,8 @@ impl Float for f32 {
/// Constructs a floating point number by multiplying `x` by 2 raised to the /// Constructs a floating point number by multiplying `x` by 2 raised to the
/// power of `exp` /// power of `exp`
#[inline] #[inline]
fn ldexp(x: f32, exp: int) -> f32 { fn ldexp(self, exp: isize) -> f32 {
unsafe { cmath::ldexpf(x, exp as c_int) } unsafe { cmath::ldexpf(self, exp as c_int) }
} }
/// Breaks the number into a normalized fraction and a base-2 exponent, /// Breaks the number into a normalized fraction and a base-2 exponent,
@ -2207,8 +2207,8 @@ mod tests {
let f1: f32 = FromStrRadix::from_str_radix("1p-123", 16).unwrap(); let f1: f32 = FromStrRadix::from_str_radix("1p-123", 16).unwrap();
let f2: f32 = FromStrRadix::from_str_radix("1p-111", 16).unwrap(); let f2: f32 = FromStrRadix::from_str_radix("1p-111", 16).unwrap();
let f3: f32 = FromStrRadix::from_str_radix("1.Cp-12", 16).unwrap(); let f3: f32 = FromStrRadix::from_str_radix("1.Cp-12", 16).unwrap();
assert_eq!(Float::ldexp(1f32, -123), f1); assert_eq!(1f32.ldexp(-123), f1);
assert_eq!(Float::ldexp(1f32, -111), f2); assert_eq!(1f32.ldexp(-111), f2);
assert_eq!(Float::ldexp(1.75f32, -12), f3); assert_eq!(Float::ldexp(1.75f32, -12), f3);
assert_eq!(Float::ldexp(0f32, -123), 0f32); assert_eq!(Float::ldexp(0f32, -123), 0f32);

8
src/libstd/num/f64.rs
View file

@ -200,8 +200,8 @@ impl Float for f64 {
fn to_radians(self) -> f64 { num::Float::to_radians(self) } fn to_radians(self) -> f64 { num::Float::to_radians(self) }
#[inline] #[inline]
fn ldexp(x: f64, exp: int) -> f64 { fn ldexp(self, exp: isize) -> f64 {
unsafe { cmath::ldexp(x, exp as c_int) } unsafe { cmath::ldexp(self, exp as c_int) }
} }
/// Breaks the number into a normalized fraction and a base-2 exponent, /// Breaks the number into a normalized fraction and a base-2 exponent,
@ -2214,8 +2214,8 @@ mod tests {
let f1: f64 = FromStrRadix::from_str_radix("1p-123", 16).unwrap(); let f1: f64 = FromStrRadix::from_str_radix("1p-123", 16).unwrap();
let f2: f64 = FromStrRadix::from_str_radix("1p-111", 16).unwrap(); let f2: f64 = FromStrRadix::from_str_radix("1p-111", 16).unwrap();
let f3: f64 = FromStrRadix::from_str_radix("1.Cp-12", 16).unwrap(); let f3: f64 = FromStrRadix::from_str_radix("1.Cp-12", 16).unwrap();
assert_eq!(Float::ldexp(1f64, -123), f1); assert_eq!(1f64.ldexp(-123), f1);
assert_eq!(Float::ldexp(1f64, -111), f2); assert_eq!(1f64.ldexp(-111), f2);
assert_eq!(Float::ldexp(1.75f64, -12), f3); assert_eq!(Float::ldexp(1.75f64, -12), f3);
assert_eq!(Float::ldexp(0f64, -123), 0f64); assert_eq!(Float::ldexp(0f64, -123), 0f64);

2
src/libstd/num/mod.rs
View file

@ -699,7 +699,7 @@ pub trait Float
/// ``` /// ```
#[unstable(feature = "std_misc", #[unstable(feature = "std_misc",
reason = "pending integer conventions")] reason = "pending integer conventions")]
fn ldexp(x: Self, exp: isize) -> Self; fn ldexp(self, exp: isize) -> Self;
/// Breaks the number into a normalized fraction and a base-2 exponent, /// Breaks the number into a normalized fraction and a base-2 exponent,
/// satisfying: /// satisfying:
/// ///