Skip to content

Commit a3dd786

Browse files
committed
Clippy warnings in 1.85+
1 parent 51970ca commit a3dd786

File tree

11 files changed

+29
-29
lines changed

11 files changed

+29
-29
lines changed

src/fpu.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use core::borrow::Borrow;
44

55
use super::{
66
softfloat::{
7-
float32_t, float64_t, i32_to_f32, i32_to_f64, i64_to_f32, i64_to_f64,
8-
init_detectTininess, ui32_to_f32, ui32_to_f64, ui64_to_f32, ui64_to_f64,
7+
float32_t, float64_t, i32_to_f32, i32_to_f64, i64_to_f32, i64_to_f64, init_detectTininess,
8+
ui32_to_f32, ui32_to_f64, ui64_to_f32, ui64_to_f64,
99
},
1010
wrapper::{ExceptionFlags, Float, RoundingMode, TininessMode},
1111
};

src/softfloat/f32_classify.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ pub const fn f32_classify(a: float32_t) -> u16 {
1010
let isSNaN = softfloat_isSigNaNF32UI(a.v);
1111

1212
return ((sign && infOrNaN && fracZero) as u16)
13-
| ((sign && !infOrNaN && !subnormalOrZero) as u16) << 1
14-
| ((sign && subnormalOrZero && !fracZero) as u16) << 2
15-
| ((sign && subnormalOrZero && fracZero) as u16) << 3
16-
| ((!sign && infOrNaN && fracZero) as u16) << 7
17-
| ((!sign && !infOrNaN && !subnormalOrZero) as u16) << 6
18-
| ((!sign && subnormalOrZero && !fracZero) as u16) << 5
19-
| ((!sign && subnormalOrZero && fracZero) as u16) << 4
20-
| ((isNaN && isSNaN) as u16) << 8
21-
| ((isNaN && !isSNaN) as u16) << 9;
13+
| (((sign && !infOrNaN && !subnormalOrZero) as u16) << 1)
14+
| (((sign && subnormalOrZero && !fracZero) as u16) << 2)
15+
| (((sign && subnormalOrZero && fracZero) as u16) << 3)
16+
| (((!sign && infOrNaN && fracZero) as u16) << 7)
17+
| (((!sign && !infOrNaN && !subnormalOrZero) as u16) << 6)
18+
| (((!sign && subnormalOrZero && !fracZero) as u16) << 5)
19+
| (((!sign && subnormalOrZero && fracZero) as u16) << 4)
20+
| (((isNaN && isSNaN) as u16) << 8)
21+
| (((isNaN && !isSNaN) as u16) << 9);
2222
}

src/softfloat/f64_classify.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ pub const fn f64_classify(a: float64_t) -> u16 {
1010
let isSNaN = softfloat_isSigNaNF64UI(a.v);
1111

1212
return ((sign && infOrNaN && fracZero) as u16)
13-
| ((sign && !infOrNaN && !subnormalOrZero) as u16) << 1
14-
| ((sign && subnormalOrZero && !fracZero) as u16) << 2
15-
| ((sign && subnormalOrZero && fracZero) as u16) << 3
16-
| ((!sign && infOrNaN && fracZero) as u16) << 7
17-
| ((!sign && !infOrNaN && !subnormalOrZero) as u16) << 6
18-
| ((!sign && subnormalOrZero && !fracZero) as u16) << 5
19-
| ((!sign && subnormalOrZero && fracZero) as u16) << 4
20-
| ((isNaN && isSNaN) as u16) << 8
21-
| ((isNaN && !isSNaN) as u16) << 9;
13+
| (((sign && !infOrNaN && !subnormalOrZero) as u16) << 1)
14+
| (((sign && subnormalOrZero && !fracZero) as u16) << 2)
15+
| (((sign && subnormalOrZero && fracZero) as u16) << 3)
16+
| (((!sign && infOrNaN && fracZero) as u16) << 7)
17+
| (((!sign && !infOrNaN && !subnormalOrZero) as u16) << 6)
18+
| (((!sign && subnormalOrZero && !fracZero) as u16) << 5)
19+
| (((!sign && subnormalOrZero && fracZero) as u16) << 4)
20+
| (((isNaN && isSNaN) as u16) << 8)
21+
| (((isNaN && !isSNaN) as u16) << 9);
2222
}

src/softfloat/f64_sqrt.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pub const fn f64_sqrt(a: float64_t, roundingMode: u8, detectTininess: u8) -> (fl
5353
}
5454
let mut rem = sigA.wrapping_sub((sig32Z as u64).wrapping_mul(sig32Z as u64));
5555
let q = (((rem >> 2) as u64).wrapping_mul(recipSqrt32 as u64) >> 32) as u32;
56-
let mut sigZ = ((sig32Z as u64) << 32 | 1u64 << 5).wrapping_add((q as u64) << 3);
56+
let mut sigZ = (((sig32Z as u64) << 32) | (1u64 << 5)).wrapping_add((q as u64) << 3);
5757
// ------------------------------------------------------------------------
5858
if ((sigZ & 0x1FF) < 0x22) {
5959
sigZ &= !(0x3F as u64);

src/softfloat/s_mul64To128.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub const fn softfloat_mul64To128(a: u64, b: u64) -> uint128 {
1010
let mid1 = (a32 as u64).wrapping_mul(b0 as u64);
1111
let mut mid = mid1.wrapping_add((a0 as u64).wrapping_mul(b32 as u64));
1212
let mut z_v64 = (a32 as u64).wrapping_mul(b32 as u64);
13-
z_v64 = z_v64.wrapping_add((((mid < mid1) as u64) << 32) | mid >> 32);
13+
z_v64 = z_v64.wrapping_add((((mid < mid1) as u64) << 32) | (mid >> 32));
1414
mid <<= 32;
1515
z_v0 = z_v0.wrapping_add(mid);
1616
z_v64 = z_v64.wrapping_add((z_v0 < mid) as u64);

src/softfloat/s_shiftRightJam128.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub const fn softfloat_shiftRightJam128(a64: u64, a0: u64, dist: u32) -> uint128
77
let u8NegDist = dist.wrapping_neg() as u8;
88
uint128 {
99
v64: a64 >> dist,
10-
v0: a64 << (u8NegDist & 63) | a0 >> dist | ((a0 << (u8NegDist & 63)) != 0) as u64,
10+
v0: (a64 << (u8NegDist & 63)) | (a0 >> dist) | ((a0 << (u8NegDist & 63)) != 0) as u64,
1111
}
1212
} else {
1313
uint128 {

src/softfloat/s_shiftRightJam64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#[must_use]
33
pub const fn softfloat_shiftRightJam64(a: u64, dist: u32) -> u64 {
44
if dist < 63 {
5-
a >> dist | (a << (dist.wrapping_neg() & 63) != 0) as u64
5+
(a >> dist) | (a << (dist.wrapping_neg() & 63) != 0) as u64
66
} else {
77
(a != 0) as u64
88
}

src/softfloat/s_shortShiftLeft128.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ use super::uint128;
55
pub const fn softfloat_shortShiftLeft128(a64: u64, a0: u64, dist: u8) -> uint128 {
66
uint128 {
77
v0: a0 << dist,
8-
v64: a64 << dist | a0 >> (dist.wrapping_neg() & 63),
8+
v64: (a64 << dist) | (a0 >> (dist.wrapping_neg() & 63)),
99
}
1010
}

src/softfloat/s_shortShiftRightJam128.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use super::uint128;
55
pub const fn softfloat_shortShiftRightJam128(a64: u64, a0: u64, dist: u8) -> uint128 {
66
let uNegDist = dist.wrapping_neg() as u8;
77
let v64 = a64 >> dist;
8-
let v0 = a64 << (uNegDist & 63)
9-
| a0 >> dist as i32
8+
let v0 = (a64 << (uNegDist & 63))
9+
| (a0 >> dist as i32)
1010
| (a0 << (uNegDist as i32 & 63 as i32) != 0 as i32 as u64) as i32 as u64;
1111
uint128 { v0, v64 }
1212
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#[inline]
22
#[must_use]
33
pub const fn softfloat_shortShiftRightJam64(a: u64, dist: u8) -> u64 {
4-
return a >> dist | (a & ((1 as u64) << dist).wrapping_sub(1) != 0 as u64) as u64;
4+
return (a >> dist) | (a & ((1 as u64) << dist).wrapping_sub(1) != 0 as u64) as u64;
55
}

0 commit comments

Comments
 (0)