fix: match_single_binding misses curlies for const

Author: profetia

clippy_lints/src/matches/match_single_binding.rs

@@ -8,7 +8,7 @@ use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::Applicability;
 use rustc_hir::def::Res;
 use rustc_hir::intravisit::{Visitor, walk_block, walk_expr, walk_path, walk_stmt};
-use rustc_hir::{Arm, Block, Expr, ExprKind, HirId, Node, PatKind, Path, Stmt, StmtKind};
+use rustc_hir::{Arm, Block, Expr, ExprKind, HirId, Item, ItemKind, Node, PatKind, Path, Stmt, StmtKind};
 use rustc_lint::LateContext;
 use rustc_span::{Span, Symbol};
 
@@ -391,7 +391,12 @@ fn sugg_with_curlies<'a>(
                     add_curlies();
                 }
             },
-            Node::Expr(..) | Node::AnonConst(..) => add_curlies(),
+            Node::Expr(..)
+            | Node::AnonConst(..)
+            | Node::Item(Item {
+                kind: ItemKind::Const(..),
+                ..
+            }) => add_curlies(),
             Node::Arm(arm) if let ExprKind::Match(..) = arm.body.kind => add_curlies(),
             _ => {},
         }

tests/ui/match_single_binding.stderr

@@ -526,7 +526,7 @@ LL | |         }
    | |_________^ help: consider using the match body instead: `b < c`
 
 error: this match could be replaced by its scrutinee and body
-  --> tests/ui/match_single_binding.rs:358:9
+  --> tests/ui/match_single_binding.rs:357:9
    |
 LL | /         match { a } {
 LL | |
@@ -543,7 +543,7 @@ LL ~         },
    |
 
 error: this match could be replaced by its scrutinee and body
-  --> tests/ui/match_single_binding.rs:367:9
+  --> tests/ui/match_single_binding.rs:366:9
    |
 LL | /         match { a } {
 LL | |
@@ -560,7 +560,7 @@ LL ~         },
    |
 
 error: this match could be replaced by its scrutinee and body
-  --> tests/ui/match_single_binding.rs:377:9
+  --> tests/ui/match_single_binding.rs:376:9
    |
 LL | /         match { a } {
 LL | |
@@ -577,7 +577,7 @@ LL ~         },
    |
 
 error: this match could be replaced by its scrutinee and body
-  --> tests/ui/match_single_binding.rs:391:9
+  --> tests/ui/match_single_binding.rs:390:9
    |
 LL | /         match { a } {
 LL | |
@@ -594,7 +594,7 @@ LL ~         },
    |
 
 error: this match could be replaced by its scrutinee and body
-  --> tests/ui/match_single_binding.rs:398:6
+  --> tests/ui/match_single_binding.rs:397:6
    |
 LL |       -match { a } {
    |  ______^
@@ -612,7 +612,7 @@ LL ~     };
    |
 
 error: this match could be replaced by its scrutinee and body
-  --> tests/ui/match_single_binding.rs:403:9
+  --> tests/ui/match_single_binding.rs:402:9
    |
 LL |       _ = match { a } {
    |  _________^
@@ -628,7 +628,7 @@ LL ~     1;
    |
 
 error: this match could be replaced by its scrutinee and body
-  --> tests/ui/match_single_binding.rs:408:16
+  --> tests/ui/match_single_binding.rs:407:16
    |
 LL |       if let x = match { a } {
    |  ________________^
@@ -646,7 +646,7 @@ LL ~     } {}
    |
 
 error: this match could be replaced by its scrutinee and body
-  --> tests/ui/match_single_binding.rs:413:8
+  --> tests/ui/match_single_binding.rs:412:8
    |
 LL |       if match { a } {
    |  ________^
@@ -664,7 +664,7 @@ LL ~     } {
    |
 
 error: this match could be replaced by its scrutinee and body
-  --> tests/ui/match_single_binding.rs:420:15
+  --> tests/ui/match_single_binding.rs:419:15
    |
 LL |       [1, 2, 3][match { a } {
    |  _______________^