From 551e7919395e17cc7efe9a68024a64512ac8282f Mon Sep 17 00:00:00 2001 From: Artyom Pavlov Date: Fri, 31 Jan 2025 15:53:05 +0300 Subject: [PATCH] Fix `clippy::precedence` lints (#466) --- belt-block/src/consts.rs | 2 +- serpent/src/lib.rs | 18 +++++++++--------- twofish/src/lib.rs | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/belt-block/src/consts.rs b/belt-block/src/consts.rs index ce2a4cc5..38b1bcae 100644 --- a/belt-block/src/consts.rs +++ b/belt-block/src/consts.rs @@ -174,7 +174,7 @@ mod tests { let mut h: [u32; 256] = [0u32; 256]; for x in 0..256 { let mut y: u32 = H[x] as u32; - y = y << r | y >> (32 - r); + y = (y << r) | (y >> (32 - r)); h[x] = y; } match r { diff --git a/serpent/src/lib.rs b/serpent/src/lib.rs index 90f2ab21..d6bb553c 100644 --- a/serpent/src/lib.rs +++ b/serpent/src/lib.rs @@ -92,9 +92,9 @@ fn apply_s_bitslice(index: usize, [w1, w2, w3, w4]: Words) -> Words { let quad = apply_s( index, get_bit(w1 as usize, i) - | get_bit(w2 as usize, i) << 1 - | get_bit(w3 as usize, i) << 2 - | get_bit(w4 as usize, i) << 3, + | (get_bit(w2 as usize, i) << 1) + | (get_bit(w3 as usize, i) << 2) + | (get_bit(w4 as usize, i) << 3), ); for l in 0..4 { @@ -111,9 +111,9 @@ fn apply_s_inverse_bitslice(index: usize, [w1, w2, w3, w4]: Words) -> Words { let quad = apply_s_inverse( index, get_bit(w1 as usize, i) - | get_bit(w2 as usize, i) << 1 - | get_bit(w3 as usize, i) << 2 - | get_bit(w4 as usize, i) << 3, + | (get_bit(w2 as usize, i) << 1) + | (get_bit(w3 as usize, i) << 2) + | (get_bit(w4 as usize, i) << 3), ); for l in 0..4 { words[l] |= u32::from(get_bit(quad as usize, l)) << i; @@ -183,9 +183,9 @@ impl KeyInit for Serpent { // calculate keys in bitslicing mode for j in 0..32 { let input = get_bit(a as usize, j) - | get_bit(b as usize, j) << 1 - | get_bit(c as usize, j) << 2 - | get_bit(d as usize, j) << 3; + | (get_bit(b as usize, j) << 1) + | (get_bit(c as usize, j) << 2) + | (get_bit(d as usize, j) << 3); let output = apply_s(sbox_index, input); for l in 0..4 { k[4 * i + l] |= u32::from(get_bit(output as usize, l)) << j; diff --git a/twofish/src/lib.rs b/twofish/src/lib.rs index 84db5a6c..4a6b7abf 100644 --- a/twofish/src/lib.rs +++ b/twofish/src/lib.rs @@ -62,7 +62,7 @@ fn gf_mult(mut a: u8, mut b: u8, p: u8) -> u8 { // q_i sbox fn sbox(i: usize, x: u8) -> u8 { - let (a0, b0) = (x >> 4 & 15, x & 15); + let (a0, b0) = ((x >> 4) & 15, x & 15); let a1 = a0 ^ b0; let b1 = (a0 ^ ((b0 << 3) | (b0 >> 1)) ^ (a0 << 3)) & 15; let (a2, b2) = (QBOX[i][0][a1 as usize], QBOX[i][1][b1 as usize]);