fix: match_single_binding suggests wrongly inside tuple

Author: profetia

clippy_lints/src/matches/match_single_binding.rs

@@ -310,7 +310,7 @@ fn expr_in_nested_block(cx: &LateContext<'_>, match_expr: &Expr<'_>) -> bool {
 fn expr_must_have_curlies(cx: &LateContext<'_>, match_expr: &Expr<'_>) -> bool {
     let parent = cx.tcx.parent_hir_node(match_expr.hir_id);
     if let Node::Expr(Expr {
-        kind: ExprKind::Closure(..) | ExprKind::Binary(..),
+        kind: ExprKind::Closure(..) | ExprKind::Binary(..) | ExprKind::Tup(..),
         ..
     })
     | Node::AnonConst(..) = parent

tests/ui/match_single_binding.fixed

@@ -266,3 +266,22 @@ fn issue15269(a: usize, b: usize, c: usize) -> bool {
     a < b
         && b < c
 }
+
+#[allow(clippy::blocks_in_conditions, clippy::unused_unit)]
+fn issue15537(a: i32, b: i32, nothing: ((), (), ()), x: bool) -> ((), (), ()) {
+    'scope: {
+        (
+            {
+                let _z = b;
+                if x {
+                    break 'scope nothing;
+                }
+            },
+            {
+                { a };
+                ()
+            },
+            (),
+        )
+    }
+}

tests/ui/match_single_binding.rs

@@ -343,3 +343,22 @@ fn issue15269(a: usize, b: usize, c: usize) -> bool {
             (a, b) => b < c,
         }
 }
+
+#[allow(clippy::blocks_in_conditions, clippy::unused_unit)]
+fn issue15537(a: i32, b: i32, nothing: ((), (), ()), x: bool) -> ((), (), ()) {
+    'scope: {
+        (
+            {
+                let _z = b;
+                if x {
+                    break 'scope nothing;
+                }
+            },
+            match { a } {
+                //~^ match_single_binding
+                _ => (),
+            },
+            (),
+        )
+    }
+}

tests/ui/match_single_binding.stderr

@@ -525,5 +525,22 @@ LL | |             (a, b) => b < c,
 LL | |         }
    | |_________^ help: consider using the match body instead: `b < c`
 
-error: aborting due to 37 previous errors
+error: this match could be replaced by its scrutinee and body
+  --> tests/ui/match_single_binding.rs:357:13
+   |
+LL | /             match { a } {
+LL | |
+LL | |                 _ => (),
+LL | |             },
+   | |_____________^
+   |
+help: consider using the scrutinee and body instead
+   |
+LL ~             {
+LL +                 { a };
+LL +                 ()
+LL ~             },
+   |
+
+error: aborting due to 38 previous errors