wrap everything in span_lint_and_then

separate commit to improve diffs

Author: ada4a

clippy_lints/src/methods/filter_map_next.rs

@@ -1,4 +1,4 @@
-use clippy_utils::diagnostics::{span_lint, span_lint_and_sugg};
+use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::msrvs::{self, Msrv};
 use clippy_utils::res::{MaybeDef, MaybeTypeckRes};
 use clippy_utils::source::snippet;
@@ -12,22 +12,24 @@ use super::FILTER_MAP_NEXT;
 pub(super) fn check(cx: &LateContext<'_>, expr: &Expr<'_>, recv: &Expr<'_>, arg: &Expr<'_>, msrv: Msrv) {
     if cx.ty_based_def(expr).opt_parent(cx).is_diag_item(cx, sym::Iterator) && msrv.meets(cx, msrvs::ITERATOR_FIND_MAP)
     {
-        let msg = "called `filter_map(..).next()` on an `Iterator`. \
-            This is more succinctly expressed by calling `.find_map(..)` instead";
-        let filter_snippet = snippet(cx, arg.span, "..");
-        if filter_snippet.lines().count() <= 1 {
-            let iter_snippet = snippet(cx, recv.span, "..");
-            span_lint_and_sugg(
-                cx,
-                FILTER_MAP_NEXT,
-                expr.span,
-                msg,
-                "try",
-                format!("{iter_snippet}.find_map({filter_snippet})"),
-                Applicability::MachineApplicable,
-            );
-        } else {
-            span_lint(cx, FILTER_MAP_NEXT, expr.span, msg);
-        }
+        span_lint_and_then(
+            cx,
+            FILTER_MAP_NEXT,
+            expr.span,
+            "called `filter_map(..).next()` on an `Iterator`. \
+            This is more succinctly expressed by calling `.find_map(..)` instead",
+            |diag| {
+                let filter_snippet = snippet(cx, arg.span, "..");
+                if filter_snippet.lines().count() <= 1 {
+                    let iter_snippet = snippet(cx, recv.span, "..");
+                    diag.span_suggestion(
+                        expr.span,
+                        "try",
+                        format!("{iter_snippet}.find_map({filter_snippet})"),
+                        Applicability::MachineApplicable,
+                    );
+                }
+            },
+        );
     }
 }