Skip to content

Commit 428e60a

Browse files
unvalleyunvalley
committed
refactor: rename variable
1 parent bbf7e47 commit 428e60a

File tree

3 files changed

+69
-47
lines changed

3 files changed

+69
-47
lines changed

‎tests/ui/manual_retain.fixed

+20-9
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,31 @@ fn main() {
1717
}
1818

1919
fn binary_heap_retain() {
20-
let mut heap = BinaryHeap::from([1, 2, 3]);
20+
let mut binary_heap = BinaryHeap::from([1, 2, 3]);
2121
// Do lint.
22-
heap.retain(|x| x % 2 == 0);
23-
heap.retain(|x| x % 2 == 0);
24-
heap.retain(|x| x % 2 == 0);
22+
binary_heap.retain(|x| x % 2 == 0);
23+
binary_heap.retain(|x| x % 2 == 0);
24+
binary_heap.retain(|x| x % 2 == 0);
2525

2626
// Do not lint, because type conversion is performed
27-
heap = heap.into_iter().filter(|x| x % 2 == 0).collect::<BinaryHeap<i8>>();
28-
heap = heap.iter().filter(|&x| x % 2 == 0).copied().collect::<BinaryHeap<i8>>();
29-
heap = heap.iter().filter(|&x| x % 2 == 0).cloned().collect::<BinaryHeap<i8>>();
27+
binary_heap = binary_heap
28+
.into_iter()
29+
.filter(|x| x % 2 == 0)
30+
.collect::<BinaryHeap<i8>>();
31+
binary_heap = binary_heap
32+
.iter()
33+
.filter(|&x| x % 2 == 0)
34+
.copied()
35+
.collect::<BinaryHeap<i8>>();
36+
binary_heap = binary_heap
37+
.iter()
38+
.filter(|&x| x % 2 == 0)
39+
.cloned()
40+
.collect::<BinaryHeap<i8>>();
3041

3142
// Do not lint, because this expression is not assign.
32-
let mut bar: BinaryHeap<i8> = heap.iter().filter(|&x| x % 2 == 0).copied().collect();
33-
let mut foobar: BinaryHeap<i8> = heap.into_iter().filter(|x| x % 2 == 0).collect();
43+
let mut bar: BinaryHeap<i8> = binary_heap.iter().filter(|&x| x % 2 == 0).copied().collect();
44+
let mut foobar: BinaryHeap<i8> = binary_heap.into_iter().filter(|x| x % 2 == 0).collect();
3445

3546
// Do not lint, because it is an assignment to a different variable.
3647
bar = foobar.iter().filter(|&x| x % 2 == 0).copied().collect();

‎tests/ui/manual_retain.rs

+20-9
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,31 @@ fn main() {
1717
}
1818

1919
fn binary_heap_retain() {
20-
let mut heap = BinaryHeap::from([1, 2, 3]);
20+
let mut binary_heap = BinaryHeap::from([1, 2, 3]);
2121
// Do lint.
22-
heap = heap.into_iter().filter(|x| x % 2 == 0).collect();
23-
heap = heap.iter().filter(|&x| x % 2 == 0).copied().collect();
24-
heap = heap.iter().filter(|&x| x % 2 == 0).cloned().collect();
22+
binary_heap = binary_heap.into_iter().filter(|x| x % 2 == 0).collect();
23+
binary_heap = binary_heap.iter().filter(|&x| x % 2 == 0).copied().collect();
24+
binary_heap = binary_heap.iter().filter(|&x| x % 2 == 0).cloned().collect();
2525

2626
// Do not lint, because type conversion is performed
27-
heap = heap.into_iter().filter(|x| x % 2 == 0).collect::<BinaryHeap<i8>>();
28-
heap = heap.iter().filter(|&x| x % 2 == 0).copied().collect::<BinaryHeap<i8>>();
29-
heap = heap.iter().filter(|&x| x % 2 == 0).cloned().collect::<BinaryHeap<i8>>();
27+
binary_heap = binary_heap
28+
.into_iter()
29+
.filter(|x| x % 2 == 0)
30+
.collect::<BinaryHeap<i8>>();
31+
binary_heap = binary_heap
32+
.iter()
33+
.filter(|&x| x % 2 == 0)
34+
.copied()
35+
.collect::<BinaryHeap<i8>>();
36+
binary_heap = binary_heap
37+
.iter()
38+
.filter(|&x| x % 2 == 0)
39+
.cloned()
40+
.collect::<BinaryHeap<i8>>();
3041

3142
// Do not lint, because this expression is not assign.
32-
let mut bar: BinaryHeap<i8> = heap.iter().filter(|&x| x % 2 == 0).copied().collect();
33-
let mut foobar: BinaryHeap<i8> = heap.into_iter().filter(|x| x % 2 == 0).collect();
43+
let mut bar: BinaryHeap<i8> = binary_heap.iter().filter(|&x| x % 2 == 0).copied().collect();
44+
let mut foobar: BinaryHeap<i8> = binary_heap.into_iter().filter(|x| x % 2 == 0).collect();
3445

3546
// Do not lint, because it is an assignment to a different variable.
3647
bar = foobar.iter().filter(|&x| x % 2 == 0).copied().collect();

‎tests/ui/manual_retain.stderr

+29-29
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
error: this expression can be written more simply using `.retain()`
2-
--> $DIR/manual_retain.rs:23:5
2+
--> $DIR/manual_retain.rs:22:5
33
|
4-
LL | heap = heap.into_iter().filter(|x| x % 2 == 0).collect();
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `heap.retain(|x| x % 2 == 0)`
4+
LL | binary_heap = binary_heap.into_iter().filter(|x| x % 2 == 0).collect();
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `binary_heap.retain(|x| x % 2 == 0)`
66
|
77
= note: `-D clippy::manual-retain` implied by `-D warnings`
88

99
error: this expression can be written more simply using `.retain()`
10-
--> $DIR/manual_retain.rs:24:5
10+
--> $DIR/manual_retain.rs:23:5
1111
|
12-
LL | heap = heap.iter().filter(|&x| x % 2 == 0).copied().collect();
13-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `heap.retain(|x| x % 2 == 0)`
12+
LL | binary_heap = binary_heap.iter().filter(|&x| x % 2 == 0).copied().collect();
13+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `binary_heap.retain(|x| x % 2 == 0)`
1414

1515
error: this expression can be written more simply using `.retain()`
16-
--> $DIR/manual_retain.rs:25:5
16+
--> $DIR/manual_retain.rs:24:5
1717
|
18-
LL | heap = heap.iter().filter(|&x| x % 2 == 0).cloned().collect();
19-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `heap.retain(|x| x % 2 == 0)`
18+
LL | binary_heap = binary_heap.iter().filter(|&x| x % 2 == 0).cloned().collect();
19+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `binary_heap.retain(|x| x % 2 == 0)`
2020

2121
error: this expression can be written more simply using `.retain()`
22-
--> $DIR/manual_retain.rs:44:5
22+
--> $DIR/manual_retain.rs:54:5
2323
|
2424
LL | btree_map = btree_map.into_iter().filter(|(k, _)| k % 2 == 0).collect();
2525
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `btree_map.retain(|k, _| k % 2 == 0)`
2626

2727
error: this expression can be written more simply using `.retain()`
28-
--> $DIR/manual_retain.rs:45:5
28+
--> $DIR/manual_retain.rs:55:5
2929
|
3030
LL | btree_map = btree_map.into_iter().filter(|(_, v)| v % 2 == 0).collect();
3131
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `btree_map.retain(|_, &mut v| v % 2 == 0)`
3232

3333
error: this expression can be written more simply using `.retain()`
34-
--> $DIR/manual_retain.rs:46:5
34+
--> $DIR/manual_retain.rs:56:5
3535
|
3636
LL | / btree_map = btree_map
3737
LL | | .into_iter()
@@ -40,37 +40,37 @@ LL | | .collect();
4040
| |__________________^ help: consider calling `.retain()` instead: `btree_map.retain(|k, &mut v| (k % 2 == 0) && (v % 2 == 0))`
4141

4242
error: this expression can be written more simply using `.retain()`
43-
--> $DIR/manual_retain.rs:68:5
43+
--> $DIR/manual_retain.rs:78:5
4444
|
4545
LL | btree_set = btree_set.iter().filter(|&x| x % 2 == 0).copied().collect();
4646
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `btree_set.retain(|x| x % 2 == 0)`
4747

4848
error: this expression can be written more simply using `.retain()`
49-
--> $DIR/manual_retain.rs:69:5
49+
--> $DIR/manual_retain.rs:79:5
5050
|
5151
LL | btree_set = btree_set.iter().filter(|&x| x % 2 == 0).cloned().collect();
5252
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `btree_set.retain(|x| x % 2 == 0)`
5353

5454
error: this expression can be written more simply using `.retain()`
55-
--> $DIR/manual_retain.rs:70:5
55+
--> $DIR/manual_retain.rs:80:5
5656
|
5757
LL | btree_set = btree_set.into_iter().filter(|x| x % 2 == 0).collect();
5858
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `btree_set.retain(|x| x % 2 == 0)`
5959

6060
error: this expression can be written more simply using `.retain()`
61-
--> $DIR/manual_retain.rs:100:5
61+
--> $DIR/manual_retain.rs:110:5
6262
|
6363
LL | hash_map = hash_map.into_iter().filter(|(k, _)| k % 2 == 0).collect();
6464
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `hash_map.retain(|k, _| k % 2 == 0)`
6565

6666
error: this expression can be written more simply using `.retain()`
67-
--> $DIR/manual_retain.rs:101:5
67+
--> $DIR/manual_retain.rs:111:5
6868
|
6969
LL | hash_map = hash_map.into_iter().filter(|(_, v)| v % 2 == 0).collect();
7070
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `hash_map.retain(|_, &mut v| v % 2 == 0)`
7171

7272
error: this expression can be written more simply using `.retain()`
73-
--> $DIR/manual_retain.rs:102:5
73+
--> $DIR/manual_retain.rs:112:5
7474
|
7575
LL | / hash_map = hash_map
7676
LL | | .into_iter()
@@ -79,67 +79,67 @@ LL | | .collect();
7979
| |__________________^ help: consider calling `.retain()` instead: `hash_map.retain(|k, &mut v| (k % 2 == 0) && (v % 2 == 0))`
8080

8181
error: this expression can be written more simply using `.retain()`
82-
--> $DIR/manual_retain.rs:123:5
82+
--> $DIR/manual_retain.rs:133:5
8383
|
8484
LL | hash_set = hash_set.into_iter().filter(|x| x % 2 == 0).collect();
8585
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `hash_set.retain(|x| x % 2 == 0)`
8686

8787
error: this expression can be written more simply using `.retain()`
88-
--> $DIR/manual_retain.rs:124:5
88+
--> $DIR/manual_retain.rs:134:5
8989
|
9090
LL | hash_set = hash_set.iter().filter(|&x| x % 2 == 0).copied().collect();
9191
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `hash_set.retain(|x| x % 2 == 0)`
9292

9393
error: this expression can be written more simply using `.retain()`
94-
--> $DIR/manual_retain.rs:125:5
94+
--> $DIR/manual_retain.rs:135:5
9595
|
9696
LL | hash_set = hash_set.iter().filter(|&x| x % 2 == 0).cloned().collect();
9797
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `hash_set.retain(|x| x % 2 == 0)`
9898

9999
error: this expression can be written more simply using `.retain()`
100-
--> $DIR/manual_retain.rs:154:5
100+
--> $DIR/manual_retain.rs:164:5
101101
|
102102
LL | s = s.chars().filter(|&c| c != 'o').to_owned().collect();
103103
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `s.retain(|c| c != 'o')`
104104

105105
error: this expression can be written more simply using `.retain()`
106-
--> $DIR/manual_retain.rs:166:5
106+
--> $DIR/manual_retain.rs:176:5
107107
|
108108
LL | vec = vec.iter().filter(|&x| x % 2 == 0).copied().collect();
109109
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `vec.retain(|x| x % 2 == 0)`
110110

111111
error: this expression can be written more simply using `.retain()`
112-
--> $DIR/manual_retain.rs:167:5
112+
--> $DIR/manual_retain.rs:177:5
113113
|
114114
LL | vec = vec.iter().filter(|&x| x % 2 == 0).cloned().collect();
115115
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `vec.retain(|x| x % 2 == 0)`
116116

117117
error: this expression can be written more simply using `.retain()`
118-
--> $DIR/manual_retain.rs:168:5
118+
--> $DIR/manual_retain.rs:178:5
119119
|
120120
LL | vec = vec.into_iter().filter(|x| x % 2 == 0).collect();
121121
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `vec.retain(|x| x % 2 == 0)`
122122

123123
error: this expression can be written more simply using `.retain()`
124-
--> $DIR/manual_retain.rs:190:5
124+
--> $DIR/manual_retain.rs:200:5
125125
|
126126
LL | vec_deque = vec_deque.iter().filter(|&x| x % 2 == 0).copied().collect();
127127
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `vec_deque.retain(|x| x % 2 == 0)`
128128

129129
error: this expression can be written more simply using `.retain()`
130-
--> $DIR/manual_retain.rs:191:5
130+
--> $DIR/manual_retain.rs:201:5
131131
|
132132
LL | vec_deque = vec_deque.iter().filter(|&x| x % 2 == 0).cloned().collect();
133133
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `vec_deque.retain(|x| x % 2 == 0)`
134134

135135
error: this expression can be written more simply using `.retain()`
136-
--> $DIR/manual_retain.rs:192:5
136+
--> $DIR/manual_retain.rs:202:5
137137
|
138138
LL | vec_deque = vec_deque.into_iter().filter(|x| x % 2 == 0).collect();
139139
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `vec_deque.retain(|x| x % 2 == 0)`
140140

141141
error: this expression can be written more simply using `.retain()`
142-
--> $DIR/manual_retain.rs:220:5
142+
--> $DIR/manual_retain.rs:230:5
143143
|
144144
LL | heap = heap.into_iter().filter(|x| x % 2 == 0).collect();
145145
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider calling `.retain()` instead: `heap.retain(|x| x % 2 == 0)`

0 commit comments

Comments
 (0)