Improve lint message; add note for future autofixable updates

diff --git a/clippy_lints/src/loops.rs b/clippy_lints/src/loops.rs
index 817230a29c639e1a3d118b6ef57303e77b3cd81b..663c2df23e22bd77ea0cfe1b3cdfbe0b3f3756ae 100644 (file)
--- a/clippy_lints/src/loops.rs
+++ b/clippy_lints/src/loops.rs
@@ -2051,7 +2051,7 @@ fn check_manual_flatten<'tcx>(
                         );
                         diag.span_help(
                             inner_expr.span,
-                            "also remove the `if let` statement in the for loop",
+                            "...and remove the `if let` statement in the for loop",
                         );
                     }
                 );

diff --git a/tests/ui/manual_flatten.rs b/tests/ui/manual_flatten.rs
index ea3440f6da2146a31d0260e78c8b12e44b6c3b5c..cff68eca933743338acd6b184c3b25c0883aa9c1 100644 (file)
--- a/tests/ui/manual_flatten.rs
+++ b/tests/ui/manual_flatten.rs
@@ -25,7 +25,7 @@ fn main() {
     }
 
     // Test for loop over an implicit reference
-    // Note: If `clippy::manual_flatten` is made autofixable, this case will
+    // Note: if `clippy::manual_flatten` is made autofixable, this case will
     // lead to a follow-up lint `clippy::into_iter_on_ref`
     let z = &y;
     for n in z {
@@ -44,6 +44,8 @@ fn main() {
     }
 
     // Using the `None` variant should not trigger the lint
+    // Note: for an autofixable suggestion, the binding in the for loop has to take the
+    // name of the binding in the `if let`
     let z = vec![Some(1), Some(2), Some(3)];
     for n in z {
         if n.is_none() {

diff --git a/tests/ui/manual_flatten.stderr b/tests/ui/manual_flatten.stderr
index 49b8ed0564aee742b0d24857b2e3dcf2535e5951..855dd9130e2fbbdc8e9c77047a4d69d1c5ebae9e 100644 (file)
--- a/tests/ui/manual_flatten.stderr
+++ b/tests/ui/manual_flatten.stderr
@@ -12,7 +12,7 @@ LL | |     }
    | |_____^
    |
    = note: `-D clippy::manual-flatten` implied by `-D warnings`
-help: also remove the `if let` statement in the for loop
+help: ...and remove the `if let` statement in the for loop
   --> $DIR/manual_flatten.rs:7:9
    |
 LL | /         if let Some(y) = n {
@@ -33,7 +33,7 @@ LL | |         };
 LL | |     }
    | |_____^
    |
-help: also remove the `if let` statement in the for loop
+help: ...and remove the `if let` statement in the for loop
   --> $DIR/manual_flatten.rs:15:9
    |
 LL | /         if let Ok(n) = n {
@@ -54,7 +54,7 @@ LL | |         }
 LL | |     }
    | |_____^
    |
-help: also remove the `if let` statement in the for loop
+help: ...and remove the `if let` statement in the for loop
   --> $DIR/manual_flatten.rs:22:9
    |
 LL | /         if let Ok(n) = n {
@@ -75,7 +75,7 @@ LL | |         }
 LL | |     }
    | |_____^
    |
-help: also remove the `if let` statement in the for loop
+help: ...and remove the `if let` statement in the for loop
   --> $DIR/manual_flatten.rs:32:9
    |
 LL | /         if let Ok(n) = n {
@@ -96,7 +96,7 @@ LL | |         }
 LL | |     }
    | |_____^
    |
-help: also remove the `if let` statement in the for loop
+help: ...and remove the `if let` statement in the for loop
   --> $DIR/manual_flatten.rs:41:9
    |
 LL | /         if let Some(m) = n {