Skip to content

Commit ecd2025

Browse files
committed
Add search_is_some_fixable_* edition 2021 specific tests
1 parent 62a9cad commit ecd2025

12 files changed

+167
-60
lines changed

tests/ui/search_is_some_fixable_none.fixed

+3-4
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,9 @@ mod issue7392 {
214214
}
215215

216216
fn ref_bindings() {
217-
let _ = ![&(&1, 2), &(&3, 4), &(&5, 4)].iter().any(|(&x, y)| x == *y);
218-
//~^ search_is_some
219-
let _ = ![&(&1, 2), &(&3, 4), &(&5, 4)].iter().any(|(&x, y)| x == *y);
220-
//~^ search_is_some
217+
let _ = ![&(&1, 2), &(&3, 4), &(&5, 4)]
218+
//~^ search_is_some
219+
.iter().any(|&&(&x, ref y)| x == *y);
221220
}
222221

223222
fn test_string_1(s: &str) -> bool {

tests/ui/search_is_some_fixable_none.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,11 @@ mod issue7392 {
221221
}
222222

223223
fn ref_bindings() {
224-
let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().find(|(&x, y)| x == *y).is_none();
225-
//~^ search_is_some
226-
let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().find(|&(&x, y)| x == *y).is_none();
227-
//~^ search_is_some
224+
let _ = [&(&1, 2), &(&3, 4), &(&5, 4)]
225+
//~^ search_is_some
226+
.iter()
227+
.find(|&&&(&x, ref y)| x == *y)
228+
.is_none();
228229
}
229230

230231
fn test_string_1(s: &str) -> bool {

tests/ui/search_is_some_fixable_none.stderr

+31-25
Original file line numberDiff line numberDiff line change
@@ -248,116 +248,122 @@ LL | let _ = vfoo.iter().find(|v| v.by_ref(&v.bar)).is_none();
248248
error: called `is_none()` after searching an `Iterator` with `find`
249249
--> tests/ui/search_is_some_fixable_none.rs:224:17
250250
|
251-
LL | let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().find(|(&x, y)| x == *y).is_none();
252-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `![&(&1, 2), &(&3, 4), &(&5, 4)].iter().any(|(&x, y)| x == *y)`
253-
254-
error: called `is_none()` after searching an `Iterator` with `find`
255-
--> tests/ui/search_is_some_fixable_none.rs:226:17
251+
LL | let _ = [&(&1, 2), &(&3, 4), &(&5, 4)]
252+
| _________________^
253+
LL | |
254+
LL | | .iter()
255+
LL | | .find(|&&&(&x, ref y)| x == *y)
256+
LL | | .is_none();
257+
| |______________________^
258+
|
259+
help: consider using
260+
|
261+
LL ~ let _ = ![&(&1, 2), &(&3, 4), &(&5, 4)]
262+
LL +
263+
LL ~ .iter().any(|&&(&x, ref y)| x == *y);
256264
|
257-
LL | let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().find(|&(&x, y)| x == *y).is_none();
258-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `![&(&1, 2), &(&3, 4), &(&5, 4)].iter().any(|(&x, y)| x == *y)`
259265

260266
error: called `is_none()` after searching an `Iterator` with `find`
261-
--> tests/ui/search_is_some_fixable_none.rs:246:17
267+
--> tests/ui/search_is_some_fixable_none.rs:247:17
262268
|
263269
LL | let _ = v.iter().find(|s| s[0].is_empty()).is_none();
264270
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `!v.iter().any(|s| s[0].is_empty())`
265271

266272
error: called `is_none()` after searching an `Iterator` with `find`
267-
--> tests/ui/search_is_some_fixable_none.rs:248:17
273+
--> tests/ui/search_is_some_fixable_none.rs:249:17
268274
|
269275
LL | let _ = v.iter().find(|s| test_string_1(&s[0])).is_none();
270276
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `!v.iter().any(|s| test_string_1(&s[0]))`
271277

272278
error: called `is_none()` after searching an `Iterator` with `find`
273-
--> tests/ui/search_is_some_fixable_none.rs:258:17
279+
--> tests/ui/search_is_some_fixable_none.rs:259:17
274280
|
275281
LL | let _ = v.iter().find(|fp| fp.field.is_power_of_two()).is_none();
276282
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `!v.iter().any(|fp| fp.field.is_power_of_two())`
277283

278284
error: called `is_none()` after searching an `Iterator` with `find`
279-
--> tests/ui/search_is_some_fixable_none.rs:260:17
285+
--> tests/ui/search_is_some_fixable_none.rs:261:17
280286
|
281287
LL | let _ = v.iter().find(|fp| test_u32_1(fp.field)).is_none();
282288
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `!v.iter().any(|fp| test_u32_1(fp.field))`
283289

284290
error: called `is_none()` after searching an `Iterator` with `find`
285-
--> tests/ui/search_is_some_fixable_none.rs:262:17
291+
--> tests/ui/search_is_some_fixable_none.rs:263:17
286292
|
287293
LL | let _ = v.iter().find(|fp| test_u32_2(*fp.field)).is_none();
288294
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `!v.iter().any(|fp| test_u32_2(*fp.field))`
289295

290296
error: called `is_none()` after searching an `Iterator` with `find`
291-
--> tests/ui/search_is_some_fixable_none.rs:279:17
297+
--> tests/ui/search_is_some_fixable_none.rs:280:17
292298
|
293299
LL | let _ = v.iter().find(|x| **x == 42).is_none();
294300
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `!v.iter().any(|x| *x == 42)`
295301

296302
error: called `is_none()` after searching an `Iterator` with `find`
297-
--> tests/ui/search_is_some_fixable_none.rs:281:17
303+
--> tests/ui/search_is_some_fixable_none.rs:282:17
298304
|
299305
LL | Foo.bar(v.iter().find(|x| **x == 42).is_none());
300306
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `!v.iter().any(|x| *x == 42)`
301307

302308
error: called `is_none()` after searching an `Iterator` with `find`
303-
--> tests/ui/search_is_some_fixable_none.rs:287:9
309+
--> tests/ui/search_is_some_fixable_none.rs:288:9
304310
|
305311
LL | v.iter().find(|x| **x == 42).is_none().then(computations);
306312
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `(!v.iter().any(|x| *x == 42))`
307313

308314
error: called `is_none()` after searching an `Iterator` with `find`
309-
--> tests/ui/search_is_some_fixable_none.rs:293:9
315+
--> tests/ui/search_is_some_fixable_none.rs:294:9
310316
|
311317
LL | v.iter().find(|x| **x == 42).is_none().then_some(0);
312318
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `(!v.iter().any(|x| *x == 42))`
313319

314320
error: called `is_none()` after calling `find()` on a string
315-
--> tests/ui/search_is_some_fixable_none.rs:299:17
321+
--> tests/ui/search_is_some_fixable_none.rs:300:17
316322
|
317323
LL | let _ = s.find("world").is_none();
318324
| ^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `!s.contains("world")`
319325

320326
error: called `is_none()` after calling `find()` on a string
321-
--> tests/ui/search_is_some_fixable_none.rs:301:17
327+
--> tests/ui/search_is_some_fixable_none.rs:302:17
322328
|
323329
LL | Foo.bar(s.find("world").is_none());
324330
| ^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `!s.contains("world")`
325331

326332
error: called `is_none()` after calling `find()` on a string
327-
--> tests/ui/search_is_some_fixable_none.rs:304:17
333+
--> tests/ui/search_is_some_fixable_none.rs:305:17
328334
|
329335
LL | let _ = s.find("world").is_none();
330336
| ^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `!s.contains("world")`
331337

332338
error: called `is_none()` after calling `find()` on a string
333-
--> tests/ui/search_is_some_fixable_none.rs:306:17
339+
--> tests/ui/search_is_some_fixable_none.rs:307:17
334340
|
335341
LL | Foo.bar(s.find("world").is_none());
336342
| ^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `!s.contains("world")`
337343

338344
error: called `is_none()` after calling `find()` on a string
339-
--> tests/ui/search_is_some_fixable_none.rs:312:17
345+
--> tests/ui/search_is_some_fixable_none.rs:313:17
340346
|
341347
LL | let _ = s.find("world").is_none().then(computations);
342348
| ^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `(!s.contains("world"))`
343349

344350
error: called `is_none()` after calling `find()` on a string
345-
--> tests/ui/search_is_some_fixable_none.rs:315:17
351+
--> tests/ui/search_is_some_fixable_none.rs:316:17
346352
|
347353
LL | let _ = s.find("world").is_none().then(computations);
348354
| ^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `(!s.contains("world"))`
349355

350356
error: called `is_none()` after calling `find()` on a string
351-
--> tests/ui/search_is_some_fixable_none.rs:321:17
357+
--> tests/ui/search_is_some_fixable_none.rs:322:17
352358
|
353359
LL | let _ = s.find("world").is_none().then_some(0);
354360
| ^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `(!s.contains("world"))`
355361

356362
error: called `is_none()` after calling `find()` on a string
357-
--> tests/ui/search_is_some_fixable_none.rs:324:17
363+
--> tests/ui/search_is_some_fixable_none.rs:325:17
358364
|
359365
LL | let _ = s.find("world").is_none().then_some(0);
360366
| ^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `(!s.contains("world"))`
361367

362-
error: aborting due to 55 previous errors
368+
error: aborting due to 54 previous errors
363369

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//@edition: 2021
2+
#![warn(clippy::search_is_some)]
3+
4+
fn main() {
5+
fn ref_bindings() {
6+
let _ = ![&(&1, 2), &(&3, 4), &(&5, 4)].iter().any(|(&x, y)| x == *y);
7+
//~^ search_is_some
8+
let _ = ![&(&1, 2), &(&3, 4), &(&5, 4)].iter().any(|(&x, y)| x == *y);
9+
//~^ search_is_some
10+
let _ = ![&(&1, 2), &(&3, 4), &(&5, 4)]
11+
//~^ search_is_some
12+
.iter().any(|&&(&x, ref y)| x == *y);
13+
}
14+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
//@edition: 2021
2+
#![warn(clippy::search_is_some)]
3+
4+
fn main() {
5+
fn ref_bindings() {
6+
let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().find(|(&x, y)| x == *y).is_none();
7+
//~^ search_is_some
8+
let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().find(|&(&x, y)| x == *y).is_none();
9+
//~^ search_is_some
10+
let _ = [&(&1, 2), &(&3, 4), &(&5, 4)]
11+
//~^ search_is_some
12+
.iter()
13+
.find(|&&&(&x, ref y)| x == *y)
14+
.is_none();
15+
}
16+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
error: called `is_none()` after searching an `Iterator` with `find`
2+
--> tests/ui/search_is_some_fixable_none_2021.rs:6:17
3+
|
4+
LL | let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().find(|(&x, y)| x == *y).is_none();
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `![&(&1, 2), &(&3, 4), &(&5, 4)].iter().any(|(&x, y)| x == *y)`
6+
|
7+
= note: `-D clippy::search-is-some` implied by `-D warnings`
8+
= help: to override `-D warnings` add `#[allow(clippy::search_is_some)]`
9+
10+
error: called `is_none()` after searching an `Iterator` with `find`
11+
--> tests/ui/search_is_some_fixable_none_2021.rs:8:17
12+
|
13+
LL | let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().find(|&(&x, y)| x == *y).is_none();
14+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `![&(&1, 2), &(&3, 4), &(&5, 4)].iter().any(|(&x, y)| x == *y)`
15+
16+
error: called `is_none()` after searching an `Iterator` with `find`
17+
--> tests/ui/search_is_some_fixable_none_2021.rs:10:17
18+
|
19+
LL | let _ = [&(&1, 2), &(&3, 4), &(&5, 4)]
20+
| _________________^
21+
LL | |
22+
LL | | .iter()
23+
LL | | .find(|&&&(&x, ref y)| x == *y)
24+
LL | | .is_none();
25+
| |______________________^
26+
|
27+
help: consider using
28+
|
29+
LL ~ let _ = ![&(&1, 2), &(&3, 4), &(&5, 4)]
30+
LL +
31+
LL ~ .iter().any(|&&(&x, ref y)| x == *y);
32+
|
33+
34+
error: aborting due to 3 previous errors
35+

tests/ui/search_is_some_fixable_some.fixed

+3-4
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,9 @@ mod issue7392 {
214214
}
215215

216216
fn ref_bindings() {
217-
let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().any(|(&x, y)| x == *y);
218-
//~^ search_is_some
219-
let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().any(|(&x, y)| x == *y);
220-
//~^ search_is_some
217+
let _ = [&(&1, 2), &(&3, 4), &(&5, 4)]
218+
.iter()
219+
.any(|&&(&x, ref y)| x == *y);
221220
}
222221

223222
fn test_string_1(s: &str) -> bool {

tests/ui/search_is_some_fixable_some.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,11 @@ mod issue7392 {
220220
}
221221

222222
fn ref_bindings() {
223-
let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().find(|(&x, y)| x == *y).is_some();
224-
//~^ search_is_some
225-
let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().find(|&(&x, y)| x == *y).is_some();
226-
//~^ search_is_some
223+
let _ = [&(&1, 2), &(&3, 4), &(&5, 4)]
224+
.iter()
225+
.find(|&&&(&x, ref y)| x == *y)
226+
//~^ search_is_some
227+
.is_some();
227228
}
228229

229230
fn test_string_1(s: &str) -> bool {

tests/ui/search_is_some_fixable_some.stderr

+16-19
Original file line numberDiff line numberDiff line change
@@ -227,70 +227,67 @@ LL | let _ = vfoo.iter().find(|v| v.by_ref(&v.bar)).is_some();
227227
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `any(|v| v.by_ref(&v.bar))`
228228

229229
error: called `is_some()` after searching an `Iterator` with `find`
230-
--> tests/ui/search_is_some_fixable_some.rs:223:55
230+
--> tests/ui/search_is_some_fixable_some.rs:225:14
231231
|
232-
LL | let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().find(|(&x, y)| x == *y).is_some();
233-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `any(|(&x, y)| x == *y)`
234-
235-
error: called `is_some()` after searching an `Iterator` with `find`
236-
--> tests/ui/search_is_some_fixable_some.rs:225:55
237-
|
238-
LL | let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().find(|&(&x, y)| x == *y).is_some();
239-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `any(|(&x, y)| x == *y)`
232+
LL | .find(|&&&(&x, ref y)| x == *y)
233+
| ______________^
234+
LL | |
235+
LL | | .is_some();
236+
| |______________________^ help: consider using: `any(|&&(&x, ref y)| x == *y)`
240237

241238
error: called `is_some()` after searching an `Iterator` with `find`
242-
--> tests/ui/search_is_some_fixable_some.rs:245:26
239+
--> tests/ui/search_is_some_fixable_some.rs:246:26
243240
|
244241
LL | let _ = v.iter().find(|s| s[0].is_empty()).is_some();
245242
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `any(|s| s[0].is_empty())`
246243

247244
error: called `is_some()` after searching an `Iterator` with `find`
248-
--> tests/ui/search_is_some_fixable_some.rs:247:26
245+
--> tests/ui/search_is_some_fixable_some.rs:248:26
249246
|
250247
LL | let _ = v.iter().find(|s| test_string_1(&s[0])).is_some();
251248
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `any(|s| test_string_1(&s[0]))`
252249

253250
error: called `is_some()` after searching an `Iterator` with `find`
254-
--> tests/ui/search_is_some_fixable_some.rs:257:26
251+
--> tests/ui/search_is_some_fixable_some.rs:258:26
255252
|
256253
LL | let _ = v.iter().find(|fp| fp.field.is_power_of_two()).is_some();
257254
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `any(|fp| fp.field.is_power_of_two())`
258255

259256
error: called `is_some()` after searching an `Iterator` with `find`
260-
--> tests/ui/search_is_some_fixable_some.rs:259:26
257+
--> tests/ui/search_is_some_fixable_some.rs:260:26
261258
|
262259
LL | let _ = v.iter().find(|fp| test_u32_1(fp.field)).is_some();
263260
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `any(|fp| test_u32_1(fp.field))`
264261

265262
error: called `is_some()` after searching an `Iterator` with `find`
266-
--> tests/ui/search_is_some_fixable_some.rs:261:26
263+
--> tests/ui/search_is_some_fixable_some.rs:262:26
267264
|
268265
LL | let _ = v.iter().find(|fp| test_u32_2(*fp.field)).is_some();
269266
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `any(|fp| test_u32_2(*fp.field))`
270267

271268
error: called `is_some()` after searching an `Iterator` with `find`
272-
--> tests/ui/search_is_some_fixable_some.rs:277:18
269+
--> tests/ui/search_is_some_fixable_some.rs:278:18
273270
|
274271
LL | v.iter().find(|x: &&u32| func(x)).is_some()
275272
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `any(|x: &u32| func(&x))`
276273

277274
error: called `is_some()` after searching an `Iterator` with `find`
278-
--> tests/ui/search_is_some_fixable_some.rs:287:26
275+
--> tests/ui/search_is_some_fixable_some.rs:288:26
279276
|
280277
LL | let _ = v.iter().find(|x: &&u32| arg_no_deref_impl(x)).is_some();
281278
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `any(|x: &u32| arg_no_deref_impl(&x))`
282279

283280
error: called `is_some()` after searching an `Iterator` with `find`
284-
--> tests/ui/search_is_some_fixable_some.rs:291:26
281+
--> tests/ui/search_is_some_fixable_some.rs:292:26
285282
|
286283
LL | let _ = v.iter().find(|x: &&u32| arg_no_deref_dyn(x)).is_some();
287284
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `any(|x: &u32| arg_no_deref_dyn(&x))`
288285

289286
error: called `is_some()` after searching an `Iterator` with `find`
290-
--> tests/ui/search_is_some_fixable_some.rs:295:26
287+
--> tests/ui/search_is_some_fixable_some.rs:296:26
291288
|
292289
LL | let _ = v.iter().find(|x: &&u32| (*arg_no_deref_dyn)(x)).is_some();
293290
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: `any(|x: &u32| (*arg_no_deref_dyn)(&x))`
294291

295-
error: aborting due to 47 previous errors
292+
error: aborting due to 46 previous errors
296293

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
//@edition: 2021
2+
#![warn(clippy::search_is_some)]
3+
4+
fn main() {
5+
fn ref_bindings() {
6+
let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().any(|(&x, y)| x == *y);
7+
//~^ search_is_some
8+
let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().any(|(&x, y)| x == *y);
9+
//~^ search_is_some
10+
}
11+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
//@edition: 2021
2+
#![warn(clippy::search_is_some)]
3+
4+
fn main() {
5+
fn ref_bindings() {
6+
let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().find(|(&x, y)| x == *y).is_some();
7+
//~^ search_is_some
8+
let _ = [&(&1, 2), &(&3, 4), &(&5, 4)].iter().find(|&(&x, y)| x == *y).is_some();
9+
//~^ search_is_some
10+
}
11+
}

0 commit comments

Comments
 (0)