Linting

Author: ThibsG

clippy_lints/src/matches.rs

@@ -3,9 +3,9 @@ use crate::utils::paths;
 use crate::utils::sugg::Sugg;
 use crate::utils::usage::is_unused;
 use crate::utils::{
-    span_lint_and_help, span_lint_and_note, 
-    expr_block, in_macro, is_allowed, is_expn_of, is_wild, match_qpath, match_type, multispan_sugg, remove_blocks,
-    snippet, snippet_block, snippet_with_applicability,  span_lint_and_sugg, span_lint_and_then,
+    expr_block, get_arg_name, in_macro, is_allowed, is_expn_of, is_refutable, is_wild, match_qpath, match_type,
+    match_var, multispan_sugg, remove_blocks, snippet, snippet_block, snippet_with_applicability, span_lint_and_help,
+    span_lint_and_note, span_lint_and_sugg, span_lint_and_then, walk_ptrs_ty,
 };
 use if_chain::if_chain;
 use rustc::lint::in_external_macro;
@@ -828,15 +828,16 @@ fn check_match_single_binding(cx: &LateContext<'_, '_>, ex: &Expr<'_>, arms: &[A
     let matched_vars = ex.span;
     let bind_names = arms[0].pat.span;
     let match_body = remove_blocks(&arms[0].body);
-    let mut snippet_body = snippet_block(cx, match_body.span, "..").to_owned().to_string();
-    if match_body.span.from_expansion() {
-        snippet_body = Sugg::hir_with_macro_callsite(cx, match_body, "..").to_string();
-    }
-    // Do we need to add ';' to suggestion ?
+    let mut snippet_body = if match_body.span.from_expansion() {
+        Sugg::hir_with_macro_callsite(cx, match_body, "..").to_string()
+    } else {
+        snippet_block(cx, match_body.span, "..").to_owned().to_string()
+    };
     if let ExprKind::Block(block, _) = &arms[0].body.kind {
+        // Do we need to add ';' to suggestion ?
         if block.stmts.len() == 1 {
             if let StmtKind::Semi(_) = block.stmts.get(0).unwrap().kind {
-                if !snippet_body.starts_with("{") && !snippet_body.ends_with("}") {
+                if !snippet_body.starts_with('{') && !snippet_body.ends_with('}') {
                     snippet_body.push(';');
                 }
             }