Skip to content

Commit 3b641c2

Browse files
samueltardieusamueltardieu
committed
Use .is_multiple_of() in Clippy tests sources
This prevents triggering the new `manual_is_multiple_of` lint on unrelated lint tests.
1 parent 6e21c0a commit 3b641c2

15 files changed

+76
-60
lines changed

‎tests/ui/box_default.fixed

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ fn issue_10381() {
126126
impl Bar for Foo {}
127127

128128
fn maybe_get_bar(i: u32) -> Option<Box<dyn Bar>> {
129-
if i % 2 == 0 {
129+
if i.is_multiple_of(2) {
130130
Some(Box::new(Foo::default()))
131131
} else {
132132
None

‎tests/ui/box_default.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ fn issue_10381() {
126126
impl Bar for Foo {}
127127

128128
fn maybe_get_bar(i: u32) -> Option<Box<dyn Bar>> {
129-
if i % 2 == 0 {
129+
if i.is_multiple_of(2) {
130130
Some(Box::new(Foo::default()))
131131
} else {
132132
None

‎tests/ui/infinite_iter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fn infinite_iters() {
3838
//~^ infinite_iter
3939

4040
// infinite iter
41-
(0_u64..).filter(|x| x % 2 == 0).last();
41+
(0_u64..).filter(|x| x.is_multiple_of(2)).last();
4242
//~^ infinite_iter
4343

4444
// not an infinite, because ranges are double-ended

‎tests/ui/infinite_iter.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ LL | (0_usize..).flat_map(|x| 0..x).product::<usize>();
4242
error: infinite iteration detected
4343
--> tests/ui/infinite_iter.rs:41:5
4444
|
45-
LL | (0_u64..).filter(|x| x % 2 == 0).last();
46-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
45+
LL | (0_u64..).filter(|x| x.is_multiple_of(2)).last();
46+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4747

4848
error: possible infinite iteration detected
4949
--> tests/ui/infinite_iter.rs:53:5

‎tests/ui/iter_kv_map.fixed

+14-6
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,19 @@ fn main() {
3030

3131
let _ = map.clone().values().collect::<Vec<_>>();
3232
//~^ iter_kv_map
33-
let _ = map.keys().filter(|x| *x % 2 == 0).count();
33+
let _ = map.keys().filter(|x| x.is_multiple_of(2)).count();
3434
//~^ iter_kv_map
3535

3636
// Don't lint
37-
let _ = map.iter().filter(|(_, val)| *val % 2 == 0).map(|(key, _)| key).count();
37+
let _ = map
38+
.iter()
39+
.filter(|(_, val)| val.is_multiple_of(2))
40+
.map(|(key, _)| key)
41+
.count();
3842
let _ = map.iter().map(get_key).collect::<Vec<_>>();
3943

4044
// Linting the following could be an improvement to the lint
41-
// map.iter().filter_map(|(_, val)| (val % 2 == 0).then(val * 17)).count();
45+
// map.iter().filter_map(|(_, val)| (val.is_multiple_of(2)).then(val * 17)).count();
4246

4347
// Lint
4448
let _ = map.keys().map(|key| key * 9).count();
@@ -84,15 +88,19 @@ fn main() {
8488

8589
let _ = map.clone().values().collect::<Vec<_>>();
8690
//~^ iter_kv_map
87-
let _ = map.keys().filter(|x| *x % 2 == 0).count();
91+
let _ = map.keys().filter(|x| x.is_multiple_of(2)).count();
8892
//~^ iter_kv_map
8993

9094
// Don't lint
91-
let _ = map.iter().filter(|(_, val)| *val % 2 == 0).map(|(key, _)| key).count();
95+
let _ = map
96+
.iter()
97+
.filter(|(_, val)| val.is_multiple_of(2))
98+
.map(|(key, _)| key)
99+
.count();
92100
let _ = map.iter().map(get_key).collect::<Vec<_>>();
93101

94102
// Linting the following could be an improvement to the lint
95-
// map.iter().filter_map(|(_, val)| (val % 2 == 0).then(val * 17)).count();
103+
// map.iter().filter_map(|(_, val)| (val.is_multiple_of(2)).then(val * 17)).count();
96104

97105
// Lint
98106
let _ = map.keys().map(|key| key * 9).count();

‎tests/ui/iter_kv_map.rs

+14-6
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,19 @@ fn main() {
3030

3131
let _ = map.clone().iter().map(|(_, val)| val).collect::<Vec<_>>();
3232
//~^ iter_kv_map
33-
let _ = map.iter().map(|(key, _)| key).filter(|x| *x % 2 == 0).count();
33+
let _ = map.iter().map(|(key, _)| key).filter(|x| x.is_multiple_of(2)).count();
3434
//~^ iter_kv_map
3535

3636
// Don't lint
37-
let _ = map.iter().filter(|(_, val)| *val % 2 == 0).map(|(key, _)| key).count();
37+
let _ = map
38+
.iter()
39+
.filter(|(_, val)| val.is_multiple_of(2))
40+
.map(|(key, _)| key)
41+
.count();
3842
let _ = map.iter().map(get_key).collect::<Vec<_>>();
3943

4044
// Linting the following could be an improvement to the lint
41-
// map.iter().filter_map(|(_, val)| (val % 2 == 0).then(val * 17)).count();
45+
// map.iter().filter_map(|(_, val)| (val.is_multiple_of(2)).then(val * 17)).count();
4246

4347
// Lint
4448
let _ = map.iter().map(|(key, _value)| key * 9).count();
@@ -86,15 +90,19 @@ fn main() {
8690

8791
let _ = map.clone().iter().map(|(_, val)| val).collect::<Vec<_>>();
8892
//~^ iter_kv_map
89-
let _ = map.iter().map(|(key, _)| key).filter(|x| *x % 2 == 0).count();
93+
let _ = map.iter().map(|(key, _)| key).filter(|x| x.is_multiple_of(2)).count();
9094
//~^ iter_kv_map
9195

9296
// Don't lint
93-
let _ = map.iter().filter(|(_, val)| *val % 2 == 0).map(|(key, _)| key).count();
97+
let _ = map
98+
.iter()
99+
.filter(|(_, val)| val.is_multiple_of(2))
100+
.map(|(key, _)| key)
101+
.count();
94102
let _ = map.iter().map(get_key).collect::<Vec<_>>();
95103

96104
// Linting the following could be an improvement to the lint
97-
// map.iter().filter_map(|(_, val)| (val % 2 == 0).then(val * 17)).count();
105+
// map.iter().filter_map(|(_, val)| (val.is_multiple_of(2)).then(val * 17)).count();
98106

99107
// Lint
100108
let _ = map.iter().map(|(key, _value)| key * 9).count();

‎tests/ui/iter_kv_map.stderr

+32-32
Original file line numberDiff line numberDiff line change
@@ -52,29 +52,29 @@ LL | let _ = map.clone().iter().map(|(_, val)| val).collect::<Vec<_>>();
5252
error: iterating on a map's keys
5353
--> tests/ui/iter_kv_map.rs:33:13
5454
|
55-
LL | let _ = map.iter().map(|(key, _)| key).filter(|x| *x % 2 == 0).count();
55+
LL | let _ = map.iter().map(|(key, _)| key).filter(|x| x.is_multiple_of(2)).count();
5656
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.keys()`
5757

5858
error: iterating on a map's keys
59-
--> tests/ui/iter_kv_map.rs:44:13
59+
--> tests/ui/iter_kv_map.rs:48:13
6060
|
6161
LL | let _ = map.iter().map(|(key, _value)| key * 9).count();
6262
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.keys().map(|key| key * 9)`
6363

6464
error: iterating on a map's values
65-
--> tests/ui/iter_kv_map.rs:46:13
65+
--> tests/ui/iter_kv_map.rs:50:13
6666
|
6767
LL | let _ = map.iter().map(|(_key, value)| value * 17).count();
6868
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.values().map(|value| value * 17)`
6969

7070
error: iterating on a map's values
71-
--> tests/ui/iter_kv_map.rs:50:13
71+
--> tests/ui/iter_kv_map.rs:54:13
7272
|
7373
LL | let _ = map.clone().into_iter().map(|(_, ref val)| ref_acceptor(val)).count();
7474
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.clone().into_values().map(|ref val| ref_acceptor(val))`
7575

7676
error: iterating on a map's values
77-
--> tests/ui/iter_kv_map.rs:54:13
77+
--> tests/ui/iter_kv_map.rs:58:13
7878
|
7979
LL | let _ = map
8080
| _____________^
@@ -97,85 +97,85 @@ LL + })
9797
|
9898

9999
error: iterating on a map's values
100-
--> tests/ui/iter_kv_map.rs:65:13
100+
--> tests/ui/iter_kv_map.rs:69:13
101101
|
102102
LL | let _ = map.clone().into_iter().map(|(_, mut val)| val).count();
103103
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.clone().into_values()`
104104

105105
error: iterating on a map's keys
106-
--> tests/ui/iter_kv_map.rs:70:13
106+
--> tests/ui/iter_kv_map.rs:74:13
107107
|
108108
LL | let _ = map.iter().map(|(key, _)| key).collect::<Vec<_>>();
109109
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.keys()`
110110

111111
error: iterating on a map's values
112-
--> tests/ui/iter_kv_map.rs:72:13
112+
--> tests/ui/iter_kv_map.rs:76:13
113113
|
114114
LL | let _ = map.iter().map(|(_, value)| value).collect::<Vec<_>>();
115115
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.values()`
116116

117117
error: iterating on a map's values
118-
--> tests/ui/iter_kv_map.rs:74:13
118+
--> tests/ui/iter_kv_map.rs:78:13
119119
|
120120
LL | let _ = map.iter().map(|(_, v)| v + 2).collect::<Vec<_>>();
121121
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.values().map(|v| v + 2)`
122122

123123
error: iterating on a map's keys
124-
--> tests/ui/iter_kv_map.rs:77:13
124+
--> tests/ui/iter_kv_map.rs:81:13
125125
|
126126
LL | let _ = map.clone().into_iter().map(|(key, _)| key).collect::<Vec<_>>();
127127
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.clone().into_keys()`
128128

129129
error: iterating on a map's keys
130-
--> tests/ui/iter_kv_map.rs:79:13
130+
--> tests/ui/iter_kv_map.rs:83:13
131131
|
132132
LL | let _ = map.clone().into_iter().map(|(key, _)| key + 2).collect::<Vec<_>>();
133133
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.clone().into_keys().map(|key| key + 2)`
134134

135135
error: iterating on a map's values
136-
--> tests/ui/iter_kv_map.rs:82:13
136+
--> tests/ui/iter_kv_map.rs:86:13
137137
|
138138
LL | let _ = map.clone().into_iter().map(|(_, val)| val).collect::<Vec<_>>();
139139
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.clone().into_values()`
140140

141141
error: iterating on a map's values
142-
--> tests/ui/iter_kv_map.rs:84:13
142+
--> tests/ui/iter_kv_map.rs:88:13
143143
|
144144
LL | let _ = map.clone().into_iter().map(|(_, val)| val + 2).collect::<Vec<_>>();
145145
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.clone().into_values().map(|val| val + 2)`
146146

147147
error: iterating on a map's values
148-
--> tests/ui/iter_kv_map.rs:87:13
148+
--> tests/ui/iter_kv_map.rs:91:13
149149
|
150150
LL | let _ = map.clone().iter().map(|(_, val)| val).collect::<Vec<_>>();
151151
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.clone().values()`
152152

153153
error: iterating on a map's keys
154-
--> tests/ui/iter_kv_map.rs:89:13
154+
--> tests/ui/iter_kv_map.rs:93:13
155155
|
156-
LL | let _ = map.iter().map(|(key, _)| key).filter(|x| *x % 2 == 0).count();
156+
LL | let _ = map.iter().map(|(key, _)| key).filter(|x| x.is_multiple_of(2)).count();
157157
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.keys()`
158158

159159
error: iterating on a map's keys
160-
--> tests/ui/iter_kv_map.rs:100:13
160+
--> tests/ui/iter_kv_map.rs:108:13
161161
|
162162
LL | let _ = map.iter().map(|(key, _value)| key * 9).count();
163163
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.keys().map(|key| key * 9)`
164164

165165
error: iterating on a map's values
166-
--> tests/ui/iter_kv_map.rs:102:13
166+
--> tests/ui/iter_kv_map.rs:110:13
167167
|
168168
LL | let _ = map.iter().map(|(_key, value)| value * 17).count();
169169
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.values().map(|value| value * 17)`
170170

171171
error: iterating on a map's values
172-
--> tests/ui/iter_kv_map.rs:106:13
172+
--> tests/ui/iter_kv_map.rs:114:13
173173
|
174174
LL | let _ = map.clone().into_iter().map(|(_, ref val)| ref_acceptor(val)).count();
175175
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.clone().into_values().map(|ref val| ref_acceptor(val))`
176176

177177
error: iterating on a map's values
178-
--> tests/ui/iter_kv_map.rs:110:13
178+
--> tests/ui/iter_kv_map.rs:118:13
179179
|
180180
LL | let _ = map
181181
| _____________^
@@ -198,73 +198,73 @@ LL + })
198198
|
199199

200200
error: iterating on a map's values
201-
--> tests/ui/iter_kv_map.rs:121:13
201+
--> tests/ui/iter_kv_map.rs:129:13
202202
|
203203
LL | let _ = map.clone().into_iter().map(|(_, mut val)| val).count();
204204
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.clone().into_values()`
205205

206206
error: iterating on a map's keys
207-
--> tests/ui/iter_kv_map.rs:137:13
207+
--> tests/ui/iter_kv_map.rs:145:13
208208
|
209209
LL | let _ = map.iter().map(|(key, _)| key).collect::<Vec<_>>();
210210
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.keys()`
211211

212212
error: iterating on a map's values
213-
--> tests/ui/iter_kv_map.rs:140:13
213+
--> tests/ui/iter_kv_map.rs:148:13
214214
|
215215
LL | let _ = map.iter().map(|(_, value)| value).collect::<Vec<_>>();
216216
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.values()`
217217

218218
error: iterating on a map's values
219-
--> tests/ui/iter_kv_map.rs:143:13
219+
--> tests/ui/iter_kv_map.rs:151:13
220220
|
221221
LL | let _ = map.iter().map(|(_, v)| v + 2).collect::<Vec<_>>();
222222
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.values().map(|v| v + 2)`
223223

224224
error: iterating on a map's keys
225-
--> tests/ui/iter_kv_map.rs:152:13
225+
--> tests/ui/iter_kv_map.rs:160:13
226226
|
227227
LL | let _ = map.clone().into_iter().map(|(key, _)| key).collect::<Vec<_>>();
228228
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.clone().into_keys()`
229229

230230
error: iterating on a map's keys
231-
--> tests/ui/iter_kv_map.rs:155:13
231+
--> tests/ui/iter_kv_map.rs:163:13
232232
|
233233
LL | let _ = map.clone().into_iter().map(|(key, _)| key + 2).collect::<Vec<_>>();
234234
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.clone().into_keys().map(|key| key + 2)`
235235

236236
error: iterating on a map's values
237-
--> tests/ui/iter_kv_map.rs:158:13
237+
--> tests/ui/iter_kv_map.rs:166:13
238238
|
239239
LL | let _ = map.clone().into_iter().map(|(_, val)| val).collect::<Vec<_>>();
240240
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.clone().into_values()`
241241

242242
error: iterating on a map's values
243-
--> tests/ui/iter_kv_map.rs:161:13
243+
--> tests/ui/iter_kv_map.rs:169:13
244244
|
245245
LL | let _ = map.clone().into_iter().map(|(_, val)| val + 2).collect::<Vec<_>>();
246246
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.clone().into_values().map(|val| val + 2)`
247247

248248
error: iterating on a map's keys
249-
--> tests/ui/iter_kv_map.rs:164:13
249+
--> tests/ui/iter_kv_map.rs:172:13
250250
|
251251
LL | let _ = map.iter().map(|(key, _)| key).collect::<Vec<_>>();
252252
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.keys()`
253253

254254
error: iterating on a map's values
255-
--> tests/ui/iter_kv_map.rs:167:13
255+
--> tests/ui/iter_kv_map.rs:175:13
256256
|
257257
LL | let _ = map.iter().map(|(_, value)| value).collect::<Vec<_>>();
258258
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.values()`
259259

260260
error: iterating on a map's values
261-
--> tests/ui/iter_kv_map.rs:170:13
261+
--> tests/ui/iter_kv_map.rs:178:13
262262
|
263263
LL | let _ = map.iter().map(|(_, v)| v + 2).collect::<Vec<_>>();
264264
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.values().map(|v| v + 2)`
265265

266266
error: iterating on a map's values
267-
--> tests/ui/iter_kv_map.rs:185:13
267+
--> tests/ui/iter_kv_map.rs:193:13
268268
|
269269
LL | let _ = map.as_ref().iter().map(|(_, v)| v).copied().collect::<Vec<_>>();
270270
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `map.as_ref().values()`

‎tests/ui/let_unit.fixed

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ fn multiline_sugg() {
6161
//~^ let_unit_value
6262
.into_iter()
6363
.map(|i| i * 2)
64-
.filter(|i| i % 2 == 0)
64+
.filter(|i| i.is_multiple_of(2))
6565
.map(|_| ())
6666
.next()
6767
.unwrap();

‎tests/ui/let_unit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ fn multiline_sugg() {
6161
//~^ let_unit_value
6262
.into_iter()
6363
.map(|i| i * 2)
64-
.filter(|i| i % 2 == 0)
64+
.filter(|i| i.is_multiple_of(2))
6565
.map(|_| ())
6666
.next()
6767
.unwrap();

‎tests/ui/let_unit.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ LL ~ v
2525
LL +
2626
LL + .into_iter()
2727
LL + .map(|i| i * 2)
28-
LL + .filter(|i| i % 2 == 0)
28+
LL + .filter(|i| i.is_multiple_of(2))
2929
LL + .map(|_| ())
3030
LL + .next()
3131
LL + .unwrap();

‎tests/ui/manual_contains.fixed

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fn should_not_lint() {
5858

5959
let vec: Vec<u32> = vec![1, 2, 3, 4, 5, 6];
6060
let values = &vec[..];
61-
let _ = values.iter().any(|&v| v % 2 == 0);
61+
let _ = values.iter().any(|&v| v.is_multiple_of(2));
6262
let _ = values.iter().any(|&v| v * 2 == 6);
6363
let _ = values.iter().any(|&v| v == v);
6464
let _ = values.iter().any(|&v| 4 == 4);

‎tests/ui/manual_contains.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fn should_not_lint() {
5858

5959
let vec: Vec<u32> = vec![1, 2, 3, 4, 5, 6];
6060
let values = &vec[..];
61-
let _ = values.iter().any(|&v| v % 2 == 0);
61+
let _ = values.iter().any(|&v| v.is_multiple_of(2));
6262
let _ = values.iter().any(|&v| v * 2 == 6);
6363
let _ = values.iter().any(|&v| v == v);
6464
let _ = values.iter().any(|&v| 4 == 4);

0 commit comments

Comments
 (0)