Skip to content

Commit 23ac809

Browse files
committed
Changed all '%' operations to is_multiple_of() to remove clippy warnings
1 parent ff40535 commit 23ac809

File tree

15 files changed

+33
-20
lines changed

15 files changed

+33
-20
lines changed

src/ciphers/aes.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ fn key_expansion(init_key: &[Byte], num_rounds: usize) -> Vec<Byte> {
318318
}
319319

320320
fn add_round_key(data: &mut [Byte], round_key: &[Byte]) {
321-
assert!(data.len() % AES_BLOCK_SIZE == 0 && round_key.len() == AES_BLOCK_SIZE);
321+
assert!(data.len().is_multiple_of(AES_BLOCK_SIZE) && round_key.len() == AES_BLOCK_SIZE);
322322
let num_blocks = data.len() / AES_BLOCK_SIZE;
323323
data.iter_mut()
324324
.zip(round_key.repeat(num_blocks))
@@ -348,7 +348,7 @@ fn mix_column_blocks(data: &mut [Byte], mode: AesMode) {
348348
}
349349

350350
fn padding<T: Clone + Default>(data: &[T], block_size: usize) -> Vec<T> {
351-
if data.len() % block_size == 0 {
351+
if data.len().is_multiple_of(block_size) {
352352
Vec::from(data)
353353
} else {
354354
let num_blocks = data.len() / block_size + 1;

src/ciphers/blake2b.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ fn add(a: &mut Word, b: Word) {
5555

5656
#[inline]
5757
const fn ceil(dividend: usize, divisor: usize) -> usize {
58-
(dividend / divisor) + ((dividend % divisor != 0) as usize)
58+
(dividend / divisor) + (!(dividend.is_multiple_of(divisor)) as usize)
5959
}
6060

6161
fn g(v: &mut [Word; 16], a: usize, b: usize, c: usize, d: usize, x: Word, y: Word) {

src/ciphers/sha3.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ fn h2b(h: &[u8], n: usize) -> Vec<bool> {
271271
}
272272

273273
fn b2h(s: &[bool]) -> Vec<u8> {
274-
let m = if s.len() % U8BITS != 0 {
274+
let m = if !(s.len().is_multiple_of(U8BITS)) {
275275
(s.len() / 8) + 1
276276
} else {
277277
s.len() / 8

src/data_structures/probabilistic/bloom_filter.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ pub struct MultiBinaryBloomFilter {
109109

110110
impl MultiBinaryBloomFilter {
111111
pub fn with_dimensions(filter_size: usize, hash_count: usize) -> Self {
112-
let bytes_count = filter_size / 8 + usize::from(filter_size % 8 > 0); // we need 8 times less entries in the array, since we are using bytes. Careful that we have at least one element though
112+
// changed the % operation to .is_multiple_of()
113+
let bytes_count = filter_size / 8 + usize::from(!(filter_size.is_multiple_of(8))); // we need 8 times less entries in the array, since we are using bytes. Careful that we have at least one element though
113114
Self {
114115
filter_size,
115116
bytes: vec![0; bytes_count],

src/general/permutations/heap.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ fn heap_recurse<T: Clone + Debug>(arr: &mut [T], k: usize, collector: &mut Vec<V
2323
// Heap's algorithm has a more clever way of permuting the elements so that we never need to swap back!
2424
for i in 0..k {
2525
// now deal with [a, b]
26-
let swap_idx = if k % 2 == 0 { i } else { 0 };
26+
// changed % operator to is_multiple_of()
27+
let swap_idx = if k.is_multiple_of(2) { i } else { 0 };
2728
arr.swap(swap_idx, k - 1);
2829
heap_recurse(arr, k - 1, collector);
2930
}

src/math/aliquot_sum.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ pub fn aliquot_sum(number: u64) -> u64 {
1010
if number == 0 {
1111
panic!("Input has to be positive.")
1212
}
13-
14-
(1..=number / 2).filter(|&d| number % d == 0).sum()
13+
// changed % operator to .is_multiple_of()
14+
(1..=number / 2).filter(|&d| number.is_multiple_of(d)).sum()
1515
}
1616

1717
#[cfg(test)]

src/math/collatz_sequence.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pub fn sequence(mut n: usize) -> Option<Vec<usize>> {
66
let mut list: Vec<usize> = vec![];
77
while n != 1 {
88
list.push(n);
9-
if n % 2 == 0 {
9+
if n.is_multiple_of(2) {
1010
n /= 2;
1111
} else {
1212
n = 3 * n + 1;

src/math/factors.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ pub fn factors(number: u64) -> Vec<u64> {
77
let mut factors: Vec<u64> = Vec::new();
88

99
for i in 1..=((number as f64).sqrt() as u64) {
10-
if number % i == 0 {
10+
// changed % operation to .is_multiple_of()
11+
if number.is_multiple_of(i) {
1112
factors.push(i);
1213
if i != number / i {
1314
factors.push(number / i);

src/math/interquartile_range.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ pub fn find_median(numbers: &[f64]) -> f64 {
1212
let length = numbers.len();
1313
let mid = length / 2;
1414

15-
if length % 2 == 0 {
15+
// changed % operation to .is_multiple_of()
16+
if length.is_multiple_of(2) {
1617
f64::midpoint(numbers[mid - 1], numbers[mid])
1718
} else {
1819
numbers[mid]
@@ -29,7 +30,8 @@ pub fn interquartile_range(numbers: &[f64]) -> f64 {
2930

3031
let length = numbers.len();
3132
let mid = length / 2;
32-
let (q1, q3) = if length % 2 == 0 {
33+
// changed % operation to is_multiple_of()
34+
let (q1, q3) = if length.is_multiple_of(2) {
3335
let first_half = &numbers[0..mid];
3436
let second_half = &numbers[mid..length];
3537
(find_median(first_half), find_median(second_half))

src/math/perfect_numbers.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ pub fn is_perfect_number(num: usize) -> bool {
22
let mut sum = 0;
33

44
for i in 1..num - 1 {
5-
if num % i == 0 {
5+
// changed % operation to is_multiple_of()
6+
if num.is_multiple_of(i) {
67
sum += i;
78
}
89
}

0 commit comments

Comments
 (0)