needless_for_each: cover single expr without braces

Author: profetia

clippy_lints/src/needless_for_each.rs

@@ -74,7 +74,7 @@ impl<'tcx> LateLintPass<'tcx> for NeedlessForEach {
             && let body = cx.tcx.hir_body(body)
             // Skip the lint if the body is not safe, so as not to suggest `for … in … unsafe {}`
             // and suggesting `for … in … { unsafe { } }` is a little ugly.
-            && let ExprKind::Block(Block { rules: BlockCheckMode::DefaultBlock, .. }, ..) = body.value.kind
+            && !matches!(body.value.kind, ExprKind::Block(Block { rules: BlockCheckMode::UnsafeBlock(_), .. }, ..))
         {
             let mut ret_collector = RetCollector::default();
             ret_collector.visit_expr(body.value);
@@ -107,12 +107,12 @@ impl<'tcx> LateLintPass<'tcx> for NeedlessForEach {
                 "for {} in {} {}",
                 body_param_sugg,
                 for_each_rev_sugg,
-                if let ExprKind::Block(block, _) = body.value.kind
-                    && is_let_desugar(block)
-                {
-                    format!("{{ {body_value_sugg} }}")
-                } else {
-                    body_value_sugg.to_string()
+                match body.value.kind {
+                    ExprKind::Block(block, _) if is_let_desugar(block) => {
+                        format!("{{ {body_value_sugg} }}")
+                    },
+                    ExprKind::Block(_, _) => body_value_sugg.to_string(),
+                    _ => format!("{{ {body_value_sugg}; }}"),
                 }
             );
 

tests/ui/needless_for_each_fixable.fixed

@@ -129,8 +129,17 @@ fn should_not_lint() {
 
 fn main() {}
 
-fn issue14734(rows: &[u8]) {
-    let mut v = vec![];
-    for x in rows.iter() { _ = v.push(x) }
-    //~^ needless_for_each
+mod issue14734 {
+    fn let_desugar(rows: &[u8]) {
+        let mut v = vec![];
+        for x in rows.iter() { _ = v.push(x) }
+        //~^ needless_for_each
+    }
+
+    fn do_something(_: &u8, _: u8) {}
+
+    fn single_expr(rows: &[u8]) {
+        for x in rows.iter() { do_something(x, 1u8); }
+        //~^ needless_for_each
+    }
 }

tests/ui/needless_for_each_fixable.rs

@@ -129,8 +129,17 @@ fn should_not_lint() {
 
 fn main() {}
 
-fn issue14734(rows: &[u8]) {
-    let mut v = vec![];
-    rows.iter().for_each(|x| _ = v.push(x));
-    //~^ needless_for_each
+mod issue14734 {
+    fn let_desugar(rows: &[u8]) {
+        let mut v = vec![];
+        rows.iter().for_each(|x| _ = v.push(x));
+        //~^ needless_for_each
+    }
+
+    fn do_something(_: &u8, _: u8) {}
+
+    fn single_expr(rows: &[u8]) {
+        rows.iter().for_each(|x| do_something(x, 1u8));
+        //~^ needless_for_each
+    }
 }

tests/ui/needless_for_each_fixable.stderr

@@ -137,10 +137,16 @@ LL +     }
    |
 
 error: needless use of `for_each`
-  --> tests/ui/needless_for_each_fixable.rs:134:5
+  --> tests/ui/needless_for_each_fixable.rs:135:9
    |
-LL |     rows.iter().for_each(|x| _ = v.push(x));
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `for x in rows.iter() { _ = v.push(x) }`
+LL |         rows.iter().for_each(|x| _ = v.push(x));
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `for x in rows.iter() { _ = v.push(x) }`
 
-error: aborting due to 9 previous errors
+error: needless use of `for_each`
+  --> tests/ui/needless_for_each_fixable.rs:142:9
+   |
+LL |         rows.iter().for_each(|x| do_something(x, 1u8));
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `for x in rows.iter() { do_something(x, 1u8); }`
+
+error: aborting due to 10 previous errors