Skip to content

Commit 2f2edfb

Browse files
authored
style: include needless_for_each (#857)
1 parent 2ee7e59 commit 2f2edfb

File tree

4 files changed

+15
-20
lines changed

4 files changed

+15
-20
lines changed

Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ missing_fields_in_debug = { level = "allow", priority = 1 }
5757
missing_panics_doc = { level = "allow", priority = 1 }
5858
module_name_repetitions = { level = "allow", priority = 1 }
5959
must_use_candidate = { level = "allow", priority = 1 }
60-
needless_for_each = { level = "allow", priority = 1 }
6160
needless_pass_by_value = { level = "allow", priority = 1 }
6261
range_plus_one = { level = "allow", priority = 1 }
6362
redundant_closure_for_method_calls = { level = "allow", priority = 1 }

src/ciphers/transposition.rs

+11-15
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ pub fn transposition(decrypt_mode: bool, msg: &str, key: &str) -> String {
2020

2121
for cipher_key in keys.iter() {
2222
let mut key_order: Vec<usize> = Vec::new();
23-
let mut counter: u8 = 0;
2423

2524
// Removes any non-alphabet characters from 'msg'
2625
cipher_msg = cipher_msg
@@ -36,10 +35,9 @@ pub fn transposition(decrypt_mode: bool, msg: &str, key: &str) -> String {
3635

3736
key_ascii.sort_by_key(|&(_, key)| key);
3837

39-
key_ascii.iter_mut().for_each(|(_, key)| {
40-
*key = counter;
41-
counter += 1;
42-
});
38+
for (counter, (_, key)) in key_ascii.iter_mut().enumerate() {
39+
*key = counter as u8;
40+
}
4341

4442
key_ascii.sort_by_key(|&(index, _)| index);
4543

@@ -91,18 +89,16 @@ fn encrypt(mut msg: String, key_order: Vec<usize>) -> String {
9189
// alphabetical order of the keyword's characters
9290
let mut indexed_vec: Vec<(usize, &String)> = Vec::new();
9391
let mut indexed_msg: String = String::from("");
94-
let mut counter: usize = 0;
9592

96-
key_order.into_iter().for_each(|key_index| {
93+
for (counter, key_index) in key_order.into_iter().enumerate() {
9794
indexed_vec.push((key_index, &encrypted_vec[counter]));
98-
counter += 1;
99-
});
95+
}
10096

10197
indexed_vec.sort();
10298

103-
indexed_vec.into_iter().for_each(|(_, column)| {
99+
for (_, column) in indexed_vec {
104100
indexed_msg.push_str(column);
105-
});
101+
}
106102

107103
// Split the message by a space every nth character, determined by
108104
// 'message length divided by keyword length' to the next highest integer.
@@ -153,19 +149,19 @@ fn decrypt(mut msg: String, key_order: Vec<usize>) -> String {
153149
msg.replace_range(range, "");
154150
});
155151

156-
split_small.iter_mut().for_each(|key_index| {
152+
for key_index in split_small.iter_mut() {
157153
let (slice, rest_of_msg) = msg.split_at(split_size);
158154
indexed_vec.push((*key_index, (slice.to_string())));
159155
msg = rest_of_msg.to_string();
160-
});
156+
}
161157

162158
indexed_vec.sort();
163159

164-
key_order.into_iter().for_each(|key| {
160+
for key in key_order {
165161
if let Some((_, column)) = indexed_vec.iter().find(|(key_index, _)| key_index == &key) {
166162
decrypted_vec.push(column.to_string());
167163
}
168-
});
164+
}
169165

170166
// Concatenate the columns into a string, determined by the
171167
// alphabetical order of the keyword's characters

src/graph/two_satisfiability.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ pub fn solve_two_satisfiability(
2424
let mut sccs = SCCs::new(num_verts);
2525
let mut adj = Graph::new();
2626
adj.resize(num_verts, vec![]);
27-
expression.iter().for_each(|cond| {
27+
for cond in expression.iter() {
2828
let v1 = variable(cond.0);
2929
let v2 = variable(cond.1);
3030
adj[v1 ^ 1].push(v2);
3131
adj[v2 ^ 1].push(v1);
32-
});
32+
}
3333
sccs.find_components(&adj);
3434
result.resize(num_variables + 1, false);
3535
for var in (2..num_verts).step_by(2) {

src/searching/moore_voting.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pub fn moore_voting(arr: &[i32]) -> i32 {
4646
let mut cnt = 0; // initializing cnt
4747
let mut ele = 0; // initializing ele
4848

49-
arr.iter().for_each(|&item| {
49+
for &item in arr.iter() {
5050
if cnt == 0 {
5151
cnt = 1;
5252
ele = item;
@@ -55,7 +55,7 @@ pub fn moore_voting(arr: &[i32]) -> i32 {
5555
} else {
5656
cnt -= 1;
5757
}
58-
});
58+
}
5959

6060
let cnt_check = arr.iter().filter(|&&x| x == ele).count();
6161

0 commit comments

Comments
 (0)