user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request rust-lang/libm#151 from 4tm4j33tk4ur/clippy

Browse source 
fixed some clippy warnings
This commit is contained in:
Alex Crichton 2019-05-02 14:38:27 -05:00 • committed by GitHub
commit a3ed9fdfcd
27 changed files with 78 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

6
library/compiler-builtins/libm/src/math/acos.rs
View file

@ -52,7 +52,7 @@ const QS4: f64 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */
fn r(z: f64) -> f64 {
let p: f64 = z * (PS0 + z * (PS1 + z * (PS2 + z * (PS3 + z * (PS4 + z * PS5)))));
let q: f64 = 1.0 + z * (QS1 + z * (QS2 + z * (QS3 + z * QS4)));
return p / q;
p / q
}
#[inline]
@ -73,7 +73,7 @@ pub fn acos(x: f64) -> f64 {
if ix >= 0x3ff00000 {
let lx: u32 = x.to_bits() as u32;
if (ix - 0x3ff00000 | lx) == 0 {
if ((ix - 0x3ff00000) | lx) == 0 {
/* acos(1)=0, acos(-1)=pi */
if (hx >> 31) != 0 {
return 2. * PIO2_HI + x1p_120f;
@ -105,5 +105,5 @@ pub fn acos(x: f64) -> f64 {
c = (z - df * df) / (s + df);
w = r(z) * s + c;
return 2. * (df + w);
2. * (df + w)
}

8
library/compiler-builtins/libm/src/math/asin.rs
View file

@ -59,7 +59,7 @@ const Q_S4: f64 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */
fn comp_r(z: f64) -> f64 {
let p = z * (P_S0 + z * (P_S1 + z * (P_S2 + z * (P_S3 + z * (P_S4 + z * P_S5)))));
let q = 1.0 + z * (Q_S1 + z * (Q_S2 + z * (Q_S3 + z * Q_S4)));
return p / q;
p / q
}
#[inline]
@ -77,7 +77,7 @@ pub fn asin(mut x: f64) -> f64 {
if ix >= 0x3ff00000 {
let lx: u32;
lx = get_low_word(x);
if (ix - 0x3ff00000 | lx) == 0 {
if ((ix - 0x3ff00000) | lx) == 0 {
/* asin(1) = +-pi/2 with inexact */
return x * PIO2_HI + f64::from_bits(0x3870000000000000);
} else {
@ -109,8 +109,8 @@ pub fn asin(mut x: f64) -> f64 {
x = 0.5 * PIO2_HI - (2.0 * s * r - (PIO2_LO - 2.0 * c) - (0.5 * PIO2_HI - 2.0 * f));
}
if hx >> 31 != 0 {
return -x;
-x
} else {
return x;
x
}
}

16
library/compiler-builtins/libm/src/math/atan.rs
View file

@ -102,16 +102,14 @@ pub fn atan(x: f64) -> f64 {
x = (x - 1.) / (x + 1.);
1
}
} else if ix < 0x40038000 {
/* |x| < 2.4375 */
x = (x - 1.5) / (1. + 1.5 * x);
2
} else {
if ix < 0x40038000 {
/* |x| < 2.4375 */
x = (x - 1.5) / (1. + 1.5 * x);
2
} else {
/* 2.4375 <= |x| < 2^66 */
x = -1. / x;
3
}
/* 2.4375 <= |x| < 2^66 */
x = -1. / x;
3
}
};

2
library/compiler-builtins/libm/src/math/atan2.rs
View file

@ -53,7 +53,7 @@ pub fn atan2(y: f64, x: f64) -> f64 {
let lx = x.to_bits() as u32;
let mut iy = (y.to_bits() >> 32) as u32;
let ly = y.to_bits() as u32;
if (ix - 0x3ff00000 | lx) == 0 {
if ((ix - 0x3ff00000) | lx) == 0 {
/* x = 1.0 */
return atan(y);
}

16
library/compiler-builtins/libm/src/math/atanf.rs
View file

@ -80,16 +80,14 @@ pub fn atanf(mut x: f32) -> f32 {
x = (x - 1.) / (x + 1.);
1
}
} else if ix < 0x401c0000 {
/* |x| < 2.4375 */
x = (x - 1.5) / (1. + 1.5 * x);
2
} else {
if ix < 0x401c0000 {
/* |x| < 2.4375 */
x = (x - 1.5) / (1. + 1.5 * x);
2
} else {
/* 2.4375 <= |x| < 2**26 */
x = -1. / x;
3
}
/* 2.4375 <= |x| < 2**26 */
x = -1. / x;
3
}
};
/* end of argument reduction */

2
library/compiler-builtins/libm/src/math/ceil.rs
View file

@ -27,7 +27,7 @@ pub fn ceil(x: f64) -> f64 {
x + TOINT - TOINT - x
};
// special case because of non-nearest rounding modes
if e <= 0x3ff - 1 {
if e < 0x3ff {
force_eval!(y);
return if (u >> 63) != 0 { -0. } else { 1. };
}

2
library/compiler-builtins/libm/src/math/ceilf.rs
View file

@ -35,5 +35,5 @@ pub fn ceilf(x: f32) -> f32 {
return 1.0;
}
}
return f32::from_bits(ui);
f32::from_bits(ui)
}

16
library/compiler-builtins/libm/src/math/cosf.rs
View file

@ -50,12 +50,10 @@ pub fn cosf(x: f32) -> f32 {
if ix > 0x4016cbe3 {
/* |x| ~> 3*pi/4 */
return -k_cosf(if sign { x64 + C2_PIO2 } else { x64 - C2_PIO2 });
} else if sign {
return k_sinf(x64 + C1_PIO2);
} else {
if sign {
return k_sinf(x64 + C1_PIO2);
} else {
return k_sinf(C1_PIO2 - x64);
}
return k_sinf(C1_PIO2 - x64);
}
}
if ix <= 0x40e231d5 {
@ -63,12 +61,10 @@ pub fn cosf(x: f32) -> f32 {
if ix > 0x40afeddf {
/* |x| ~> 7*pi/4 */
return k_cosf(if sign { x64 + C4_PIO2 } else { x64 - C4_PIO2 });
} else if sign {
return k_sinf(-x64 - C3_PIO2);
} else {
if sign {
return k_sinf(-x64 - C3_PIO2);
} else {
return k_sinf(x64 - C3_PIO2);
}
return k_sinf(x64 - C3_PIO2);
}
}

2
library/compiler-builtins/libm/src/math/expo2.rs
View file

@ -11,5 +11,5 @@ pub fn expo2(x: f64) -> f64 {
/* note that k is odd and scale*scale overflows */
let scale = combine_words(((0x3ff + K / 2) as u32) << 20, 0);
/* exp(x - k ln2) * 2**(k-1) */
return exp(x - kln2) * scale * scale;
exp(x - kln2) * scale * scale
}

8
library/compiler-builtins/libm/src/math/fdim.rs
View file

@ -7,11 +7,9 @@ pub fn fdim(x: f64, y: f64) -> f64 {
x
} else if y.is_nan() {
y
} else if x > y {
x - y
} else {
if x > y {
x - y
} else {
0.0
}
0.0
}
}

8
library/compiler-builtins/libm/src/math/fdimf.rs
View file

@ -7,11 +7,9 @@ pub fn fdimf(x: f32, y: f32) -> f32 {
x
} else if y.is_nan() {
y
} else if x > y {
x - y
} else {
if x > y {
x - y
} else {
0.0
}
0.0
}
}

2
library/compiler-builtins/libm/src/math/floor.rs
View file

@ -26,7 +26,7 @@ pub fn floor(x: f64) -> f64 {
x + TOINT - TOINT - x
};
/* special case because of non-nearest rounding modes */
if e <= 0x3ff - 1 {
if e < 0x3ff {
force_eval!(y);
return if (ui >> 63) != 0 { -1. } else { 0. };
}

2
library/compiler-builtins/libm/src/math/floorf.rs
View file

@ -35,7 +35,7 @@ pub fn floorf(x: f32) -> f32 {
return -1.0;
}
}
return f32::from_bits(ui);
f32::from_bits(ui)
}
#[cfg(test)]

10
library/compiler-builtins/libm/src/math/fma.rs
View file

@ -83,7 +83,7 @@ pub fn fma(x: f64, y: f64, z: f64) -> f64 {
if d > 0 {
if d < 64 {
zlo = nz.m << d;
zhi = nz.m >> 64 - d;
zhi = nz.m >> (64 - d);
} else {
zlo = 0;
zhi = nz.m;
@ -91,7 +91,7 @@ pub fn fma(x: f64, y: f64, z: f64) -> f64 {
d -= 64;
if d == 0 {
} else if d < 64 {
rlo = rhi << 64 - d | rlo >> d | ((rlo << 64 - d) != 0) as u64;
rlo = rhi << (64 - d) | rlo >> d | ((rlo << (64 - d)) != 0) as u64;
rhi = rhi >> d;
} else {
rlo = 1;
@ -104,7 +104,7 @@ pub fn fma(x: f64, y: f64, z: f64) -> f64 {
if d == 0 {
zlo = nz.m;
} else if d < 64 {
zlo = nz.m >> d | ((nz.m << 64 - d) != 0) as u64;
zlo = nz.m >> d | ((nz.m << (64 - d)) != 0) as u64;
} else {
zlo = 1;
}
@ -136,7 +136,7 @@ pub fn fma(x: f64, y: f64, z: f64) -> f64 {
e += 64;
d = rhi.leading_zeros() as i32 - 1;
/* note: d > 0 */
rhi = rhi << d | rlo >> 64 - d | ((rlo << d) != 0) as u64;
rhi = rhi << d | rlo >> (64 - d) | ((rlo << d) != 0) as u64;
} else if rlo != 0 {
d = rlo.leading_zeros() as i32 - 1;
if d < 0 {
@ -191,7 +191,7 @@ pub fn fma(x: f64, y: f64, z: f64) -> f64 {
} else {
/* only round once when scaled */
d = 10;
i = ((rhi >> d | ((rhi << 64 - d) != 0) as u64) << d) as i64;
i = ((rhi >> d | ((rhi << (64 - d)) != 0) as u64) << d) as i64;
if sign != 0 {
i = -i;
}

2
library/compiler-builtins/libm/src/math/hypot.rs
View file

@ -72,5 +72,5 @@ pub fn hypot(mut x: f64, mut y: f64) -> f64 {
}
let (hx, lx) = sq(x);
let (hy, ly) = sq(y);
return z * sqrt(ly + lx + hy + hx);
z * sqrt(ly + lx + hy + hx)
}

2
library/compiler-builtins/libm/src/math/log.rs
View file

@ -114,5 +114,5 @@ pub fn log(mut x: f64) -> f64 {
let t2: f64 = z * (LG1 + w * (LG3 + w * (LG5 + w * LG7)));
let r: f64 = t2 + t1;
let dk: f64 = k as f64;
return s * (hfsq + r) + dk * LN2_LO - hfsq + f + dk * LN2_HI;
s * (hfsq + r) + dk * LN2_LO - hfsq + f + dk * LN2_HI
}

2
library/compiler-builtins/libm/src/math/log10.rs
View file

@ -114,5 +114,5 @@ pub fn log10(mut x: f64) -> f64 {
val_lo += (y - w) + val_hi;
val_hi = w;
return val_lo + val_hi;
val_lo + val_hi
}

2
library/compiler-builtins/libm/src/math/log10f.rs
View file

@ -88,5 +88,5 @@ pub fn log10f(mut x: f32) -> f32 {
hi = f32::from_bits(ui);
lo = f - hi - hfsq + s * (hfsq + r);
dk = k as f32;
return dk * LOG10_2LO + (lo + hi) * IVLN10LO + lo * IVLN10HI + hi * IVLN10HI + dk * LOG10_2HI;
dk * LOG10_2LO + (lo + hi) * IVLN10LO + lo * IVLN10HI + hi * IVLN10HI + dk * LOG10_2HI
}

2
library/compiler-builtins/libm/src/math/log1p.rs
View file

@ -140,5 +140,5 @@ pub fn log1p(x: f64) -> f64 {
t2 = z * (LG1 + w * (LG3 + w * (LG5 + w * LG7)));
r = t2 + t1;
dk = k as f64;
return s * (hfsq + r) + (dk * LN2_LO + c) - hfsq + f + dk * LN2_HI;
s * (hfsq + r) + (dk * LN2_LO + c) - hfsq + f + dk * LN2_HI
}

2
library/compiler-builtins/libm/src/math/log1pf.rs
View file

@ -95,5 +95,5 @@ pub fn log1pf(x: f32) -> f32 {
r = t2 + t1;
hfsq = 0.5 * f * f;
dk = k as f32;
return s * (hfsq + r) + (dk * LN2_LO + c) - hfsq + f + dk * LN2_HI;
s * (hfsq + r) + (dk * LN2_LO + c) - hfsq + f + dk * LN2_HI
}

2
library/compiler-builtins/libm/src/math/log2.rs
View file

@ -103,5 +103,5 @@ pub fn log2(mut x: f64) -> f64 {
val_lo += (y - w) + val_hi;
val_hi = w;
return val_lo + val_hi;
val_lo + val_hi
}

2
library/compiler-builtins/libm/src/math/log2f.rs
View file

@ -84,5 +84,5 @@ pub fn log2f(mut x: f32) -> f32 {
ui &= 0xfffff000;
hi = f32::from_bits(ui);
lo = f - hi - hfsq + s * (hfsq + r);
return (lo + hi) * IVLN2LO + lo * IVLN2HI + hi * IVLN2HI + k as f32;
(lo + hi) * IVLN2LO + lo * IVLN2HI + hi * IVLN2HI + k as f32
}

2
library/compiler-builtins/libm/src/math/pow.rs
View file

@ -406,7 +406,7 @@ pub fn pow(x: f64, y: f64) -> f64 {
z = with_set_high_word(z, j as u32);
}
return s * z;
s * z
}
#[cfg(test)]

24
library/compiler-builtins/libm/src/math/powf.rs
View file

@ -136,12 +136,12 @@ pub fn powf(x: f32, y: f32) -> f32 {
return x * x;
}
if hy == 0x3f000000 {
/* y is 0.5 */
if hx >= 0 {
/* x >= +0 */
return sqrtf(x);
}
if hy == 0x3f000000
/* y is 0.5 */
&& hx >= 0
{
/* x >= +0 */
return sqrtf(x);
}
ax = fabsf(x);
@ -296,11 +296,11 @@ pub fn powf(x: f32, y: f32) -> f32 {
/* z < -150 */
// FIXME: check should be (uint32_t)j > 0xc3160000
return sn * TINY * TINY; /* underflow */
} else if j as u32 == 0xc3160000 {
/* z == -150 */
if p_l <= z - p_h {
return sn * TINY * TINY; /* underflow */
}
} else if j as u32 == 0xc3160000
/* z == -150 */
&& p_l <= z - p_h
{
return sn * TINY * TINY; /* underflow */
}
/*
@ -339,5 +339,5 @@ pub fn powf(x: f32, y: f32) -> f32 {
} else {
z = f32::from_bits(j as u32);
}
return sn * z;
sn * z
}

24
library/compiler-builtins/libm/src/math/rem_pio2.rs
View file

@ -78,7 +78,7 @@ pub fn rem_pio2(x: f64) -> (i32, f64, f64) {
}
}
let y1 = (r - y0) - w;
return (n, y0, y1);
(n, y0, y1)
}
if ix <= 0x400f6a7a {
@ -100,18 +100,16 @@ pub fn rem_pio2(x: f64) -> (i32, f64, f64) {
let y1 = (z - y0) + PIO2_1T;
return (-1, y0, y1);
}
} else if sign == 0 {
let z = x - 2.0 * PIO2_1;
let y0 = z - 2.0 * PIO2_1T;
let y1 = (z - y0) - 2.0 * PIO2_1T;
return (2, y0, y1);
} else {
if sign == 0 {
let z = x - 2.0 * PIO2_1;
let y0 = z - 2.0 * PIO2_1T;
let y1 = (z - y0) - 2.0 * PIO2_1T;
return (2, y0, y1);
} else {
let z = x + 2.0 * PIO2_1;
let y0 = z + 2.0 * PIO2_1T;
let y1 = (z - y0) + 2.0 * PIO2_1T;
return (-2, y0, y1);
}
let z = x + 2.0 * PIO2_1;
let y0 = z + 2.0 * PIO2_1T;
let y1 = (z - y0) + 2.0 * PIO2_1T;
return (-2, y0, y1);
}
}
if ix <= 0x401c463b {
@ -185,5 +183,5 @@ pub fn rem_pio2(x: f64) -> (i32, f64, f64) {
if sign != 0 {
return (-n, -ty[0], -ty[1]);
}
return (n, ty[0], ty[1]);
(n, ty[0], ty[1])
}

2
library/compiler-builtins/libm/src/math/sinf.rs
View file

@ -88,7 +88,7 @@ pub fn sinf(x: f32) -> f32 {
match n & 3 {
0 => k_sinf(y),
1 => k_cosf(y),
2 => return k_sinf(-y),
2 => k_sinf(-y),
_ => -k_cosf(y),
}
}

2
library/compiler-builtins/libm/src/math/sinh.rs
View file

@ -46,5 +46,5 @@ pub fn sinh(x: f64) -> f64 {
/* |x| > log(DBL_MAX) or nan */
/* note: the result is stored to handle overflow */
t = 2.0 * h * expo2(absx);
return t;
t
}