From 7140eac4843e0ed4e31f791f24377d04b229cd8d Mon Sep 17 00:00:00 2001
From: mcarton <cartonmartin+git@gmail.com>
Date: Fri, 18 Nov 2016 13:40:15 +0100
Subject: [PATCH] Cleanup

---
 clippy_lints/src/block_in_if_condition.rs   | 7 ++-----
 tests/compile-fail/block_in_if_condition.rs | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/clippy_lints/src/block_in_if_condition.rs b/clippy_lints/src/block_in_if_condition.rs
index 2212ac21babd..704729c4e36e 100644
--- a/clippy_lints/src/block_in_if_condition.rs
+++ b/clippy_lints/src/block_in_if_condition.rs
@@ -56,10 +56,7 @@ struct ExVisitor<'v> {
 impl<'v> Visitor<'v> for ExVisitor<'v> {
     fn visit_expr(&mut self, expr: &'v Expr) {
         if let ExprClosure(_, _, ref expr, _) = expr.node {
-            let complex = {
-                matches!(expr.node, ExprBlock(_))
-            };
-            if complex {
+            if matches!(expr.node, ExprBlock(_)) {
                 self.found_block = Some(expr);
                 return;
             }
@@ -111,7 +108,7 @@ impl LateLintPass for BlockInIfCondition {
                 let mut visitor = ExVisitor { found_block: None };
                 walk_expr(&mut visitor, check);
                 if let Some(block) = visitor.found_block {
-                    span_help_and_lint(cx, BLOCK_IN_IF_CONDITION_STMT, block.span, COMPLEX_BLOCK_MESSAGE, "");
+                    span_lint(cx, BLOCK_IN_IF_CONDITION_STMT, block.span, COMPLEX_BLOCK_MESSAGE);
                 }
             }
         }
diff --git a/tests/compile-fail/block_in_if_condition.rs b/tests/compile-fail/block_in_if_condition.rs
index 3d47fc74a113..43216754f753 100644
--- a/tests/compile-fail/block_in_if_condition.rs
+++ b/tests/compile-fail/block_in_if_condition.rs
@@ -27,7 +27,6 @@ fn macro_if() {
 }
 
 fn condition_has_block() -> i32 {
-
     if { //~ERROR in an 'if' condition, avoid complex blocks or closures with blocks; instead, move the block or closure higher and bind it with a 'let'
         let x = 3;
         x == 3