Skip to content

Commit 551e791

Browse files
authored
Fix clippy::precedence lints (#466)
1 parent 81f1eb4 commit 551e791

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

belt-block/src/consts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ mod tests {
174174
let mut h: [u32; 256] = [0u32; 256];
175175
for x in 0..256 {
176176
let mut y: u32 = H[x] as u32;
177-
y = y << r | y >> (32 - r);
177+
y = (y << r) | (y >> (32 - r));
178178
h[x] = y;
179179
}
180180
match r {

serpent/src/lib.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ fn apply_s_bitslice(index: usize, [w1, w2, w3, w4]: Words) -> Words {
9292
let quad = apply_s(
9393
index,
9494
get_bit(w1 as usize, i)
95-
| get_bit(w2 as usize, i) << 1
96-
| get_bit(w3 as usize, i) << 2
97-
| get_bit(w4 as usize, i) << 3,
95+
| (get_bit(w2 as usize, i) << 1)
96+
| (get_bit(w3 as usize, i) << 2)
97+
| (get_bit(w4 as usize, i) << 3),
9898
);
9999

100100
for l in 0..4 {
@@ -111,9 +111,9 @@ fn apply_s_inverse_bitslice(index: usize, [w1, w2, w3, w4]: Words) -> Words {
111111
let quad = apply_s_inverse(
112112
index,
113113
get_bit(w1 as usize, i)
114-
| get_bit(w2 as usize, i) << 1
115-
| get_bit(w3 as usize, i) << 2
116-
| get_bit(w4 as usize, i) << 3,
114+
| (get_bit(w2 as usize, i) << 1)
115+
| (get_bit(w3 as usize, i) << 2)
116+
| (get_bit(w4 as usize, i) << 3),
117117
);
118118
for l in 0..4 {
119119
words[l] |= u32::from(get_bit(quad as usize, l)) << i;
@@ -183,9 +183,9 @@ impl KeyInit for Serpent {
183183
// calculate keys in bitslicing mode
184184
for j in 0..32 {
185185
let input = get_bit(a as usize, j)
186-
| get_bit(b as usize, j) << 1
187-
| get_bit(c as usize, j) << 2
188-
| get_bit(d as usize, j) << 3;
186+
| (get_bit(b as usize, j) << 1)
187+
| (get_bit(c as usize, j) << 2)
188+
| (get_bit(d as usize, j) << 3);
189189
let output = apply_s(sbox_index, input);
190190
for l in 0..4 {
191191
k[4 * i + l] |= u32::from(get_bit(output as usize, l)) << j;

twofish/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ fn gf_mult(mut a: u8, mut b: u8, p: u8) -> u8 {
6262

6363
// q_i sbox
6464
fn sbox(i: usize, x: u8) -> u8 {
65-
let (a0, b0) = (x >> 4 & 15, x & 15);
65+
let (a0, b0) = ((x >> 4) & 15, x & 15);
6666
let a1 = a0 ^ b0;
6767
let b1 = (a0 ^ ((b0 << 3) | (b0 >> 1)) ^ (a0 << 3)) & 15;
6868
let (a2, b2) = (QBOX[i][0][a1 as usize], QBOX[i][1][b1 as usize]);

0 commit comments

Comments
 (0)