diff --git a/clippy_lints/src/methods/mod.rs b/clippy_lints/src/methods/mod.rs index d8595ea9004c..3ea18f1d14d4 100644 --- a/clippy_lints/src/methods/mod.rs +++ b/clippy_lints/src/methods/mod.rs @@ -1975,6 +1975,19 @@ fn lint_search_is_some<'a, 'tcx>( ); let search_snippet = snippet(cx, search_args[1].span, ".."); if search_snippet.lines().count() <= 1 { + // suggest `any(|x| ..)` instead of `any(|&x| ..)` for `find(|&x| ..).is_some()` + let any_search_snippet = if_chain! { + if search_method == "find"; + if let hir::ExprKind::Closure(_, _, body_id, ..) = search_args[1].node; + let closure_body = cx.tcx.hir().body(body_id); + if let Some(closure_arg) = closure_body.arguments.get(0); + if let hir::PatKind::Ref(..) = closure_arg.pat.node; + then { + Some(search_snippet.replacen('&', "", 1)) + } else { + None + } + }; // add note if not multi-line span_note_and_lint( cx, @@ -1983,8 +1996,10 @@ fn lint_search_is_some<'a, 'tcx>( &msg, expr.span, &format!( - "replace `{0}({1}).is_some()` with `any({1})`", - search_method, search_snippet + "replace `{0}({1}).is_some()` with `any({2})`", + search_method, + search_snippet, + any_search_snippet.as_ref().map_or(&*search_snippet, String::as_str) ), ); } else { diff --git a/tests/ui/methods.stderr b/tests/ui/methods.stderr index ba93be5f4623..4bf53acf01ef 100644 --- a/tests/ui/methods.stderr +++ b/tests/ui/methods.stderr @@ -155,7 +155,7 @@ LL | let _ = v.iter().find(|&x| *x < 0).is_some(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: `-D clippy::search-is-some` implied by `-D warnings` - = note: replace `find(|&x| *x < 0).is_some()` with `any(|&x| *x < 0)` + = note: replace `find(|&x| *x < 0).is_some()` with `any(|x| *x < 0)` error: called `is_some()` after searching an `Iterator` with find. This is more succinctly expressed by calling `any()`. --> $DIR/methods.rs:236:13