Skip to content

Commit 208a715

Browse files
committed
Address Clippy failures, increase reps for randomness test
1 parent 6b432e1 commit 208a715

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ before_script:
4949

5050
script:
5151
- bash -c 'if [[ "$RUN_TEST" == "true" ]]; then
52-
export CI_RUST_VERSION="$TRAVIS_RUST_VERSION"
53-
cargo test --release
52+
cargo test --release && cargo test --release -- --nocapture --ignored
5453
;
5554
fi'
5655
- bash -c 'if [[ "$RUN_RUSTFMT" == "true" ]]; then

src/lib.rs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ impl Iterator for Permutor {
9191
self.values_returned += 1;
9292
return Some(next);
9393
}
94-
return None;
94+
None
9595
}
9696
}
9797

@@ -231,8 +231,7 @@ impl FeistelNetwork {
231231
}
232232

233233
let result = (left << self.half_width) | right;
234-
let result = result & (self.left_mask | self.right_mask);
235-
result
234+
result & (self.left_mask | self.right_mask)
236235
}
237236

238237
fn round_function(&self, right: u64, round: u8, key: &[u8], mask: u64) -> u64 {
@@ -248,7 +247,7 @@ impl FeistelNetwork {
248247
}
249248

250249
fn slice_to_u64(input: &[u8]) -> u64 {
251-
((input[7] as u64) << 0)
250+
(input[7] as u64)
252251
| ((input[6] as u64) << 8)
253252
| ((input[5] as u64) << 16)
254253
| ((input[4] as u64) << 24)
@@ -276,13 +275,13 @@ fn u8_to_1slice(input: u8) -> [u8; 1] {
276275
/// ```
277276
pub fn u64_to_8slice(input: u64) -> [u8; 8] {
278277
let mut result: [u8; 8] = [0; 8];
279-
result[7] = ((input & 0xFF) >> 0) as u8;
278+
result[7] = (input & 0xFF) as u8;
280279
result[6] = ((input & 0xFF00) >> 8) as u8;
281-
result[5] = ((input & 0xFF00_00) >> 16) as u8;
280+
result[5] = ((input & 0x00FF_0000) >> 16) as u8;
282281
result[4] = ((input & 0xFF00_0000) >> 24) as u8;
283-
result[3] = ((input & 0xFF00_0000_00) >> 32) as u8;
282+
result[3] = ((input & 0x00FF_0000_0000) >> 32) as u8;
284283
result[2] = ((input & 0xFF00_0000_0000) >> 40) as u8;
285-
result[1] = ((input & 0xFF00_0000_0000_00) >> 48) as u8;
284+
result[1] = ((input & 0x00FF_0000_0000_0000) >> 48) as u8;
286285
result[0] = ((input & 0xFF00_0000_0000_0000) >> 56) as u8;
287286
result
288287
}
@@ -303,8 +302,6 @@ pub fn u64_to_8slice(input: u64) -> [u8; 8] {
303302
pub fn u64_to_32slice(input: u64) -> [u8; 32] {
304303
let result8 = u64_to_8slice(input);
305304
let mut result: [u8; 32] = [0; 32];
306-
for i in 0..8 {
307-
result[i] = result8[i];
308-
}
305+
result[..8].clone_from_slice(&result8[..8]);
309306
result
310307
}

tests/randomness.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ mod tests {
1616
// The true random chi-squared value is very variable, [1, 15] almost, so testing very
1717
// small max_value permutations reliably is difficult.
1818
// (4, 100_000),
19-
(10, 40_000),
19+
(10, 60_000),
2020
(17, 24_000),
2121
(50, 8_000),
2222
(100, 4_000),

0 commit comments

Comments
 (0)