Fix match_single_binding suggestion introduced an extra semicolon

Author: alex-semenyuk

clippy_lints/src/matches/match_single_binding.rs

@@ -38,12 +38,7 @@ pub(crate) fn check<'a>(cx: &LateContext<'a>, ex: &Expr<'a>, arms: &[Arm<'_>], e
                 snippet_body.push(';');
             }
         },
-        _ => {
-            // expr_ty(body) == ()
-            if cx.typeck_results().expr_ty(match_body).is_unit() {
-                snippet_body.push(';');
-            }
-        },
+        _ => {},
     }
 
     let mut applicability = Applicability::MaybeIncorrect;
@@ -76,7 +71,7 @@ pub(crate) fn check<'a>(cx: &LateContext<'a>, ex: &Expr<'a>, arms: &[Arm<'_>], e
                 Some(AssignmentExpr::Local { span, pat_span }) => (
                     span,
                     format!(
-                        "let {} = {};\n{}let {} = {snippet_body}",
+                        "let {} = {};\n{}let {} = {snippet_body};",
                         snippet_with_applicability(cx, bind_names, "..", &mut applicability),
                         snippet_with_applicability(cx, matched_vars, "..", &mut applicability),
                         " ".repeat(indent_of(cx, expr.span).unwrap_or(0)),

tests/ui/match_single_binding.fixed

@@ -133,3 +133,16 @@ fn issue_9575() {
         println!("Needs curlies");
     };
 }
+
+#[allow(dead_code)]
+fn issue_9725(r: Option<u32>) {
+    let x = r;
+    match x {
+        Some(_) => {
+            println!("Some");
+        },
+        None => {
+            println!("None");
+        },
+    };
+}

tests/ui/match_single_binding.rs

@@ -149,8 +149,9 @@ fn issue_9575() {
     };
 }
 
-fn _f(r: Option<u32>) {
-    let _t = match r {
+#[allow(dead_code)]
+fn issue_9725(r: Option<u32>) {
+    match r {
         x => match x {
             Some(_) => {
                 println!("Some");

tests/ui/match_single_binding.stderr

@@ -147,7 +147,7 @@ LL | |     };
 help: consider using a `let` statement
    |
 LL ~     let Point { x, y } = coords();
-LL +     let product = x * y
+LL +     let product = x * y;
    |
 
 error: this match could be written as a `let` statement
@@ -213,56 +213,30 @@ LL +         println!("Needs curlies");
 LL ~     };
    |
 
-error: this let-binding has unit value
-  --> $DIR/match_single_binding.rs:153:5
-   |
-LL | /     let _t = match r {
-LL | |         x => match x {
-LL | |             Some(_) => {
-LL | |                 println!("Some");
-...  |
-LL | |         },
-LL | |     };
-   | |______^
-   |
-   = note: `-D clippy::let-unit-value` implied by `-D warnings`
-help: omit the `let` binding
-   |
-LL ~     match r {
-LL +         x => match x {
-LL +             Some(_) => {
-LL +                 println!("Some");
-LL +             },
-LL +             None => {
-LL +                 println!("None");
-LL +             },
-LL +         },
-LL +     };
-   |
-
 error: this match could be written as a `let` statement
-  --> $DIR/match_single_binding.rs:153:5
+  --> $DIR/match_single_binding.rs:154:5
    |
-LL | /     let _t = match r {
+LL | /     match r {
 LL | |         x => match x {
 LL | |             Some(_) => {
 LL | |                 println!("Some");
 ...  |
 LL | |         },
 LL | |     };
-   | |______^
+   | |_____^
    |
 help: consider using a `let` statement
    |
 LL ~     let x = r;
-LL +     let _t = match x {
+LL +     match x {
 LL +         Some(_) => {
 LL +             println!("Some");
 LL +         },
 LL +         None => {
 LL +             println!("None");
 LL +         },
-LL +     };
+LL ~     };
    |
 
-error: aborting due to 16 previous errors
+error: aborting due to 15 previous errors
+