From 3ae39145fc763a798404dd9301e8d8f045fdbf4e Mon Sep 17 00:00:00 2001
From: mcarton <cartonmartin+git@gmail.com>
Date: Thu, 9 Jun 2016 00:24:44 +0200
Subject: [PATCH] Fix false-positive in `LET_AND_RETURN`

If the declaration has a type, it might be required for coercion to
happen.
---
 clippy_lints/src/returns.rs | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/clippy_lints/src/returns.rs b/clippy_lints/src/returns.rs
index d78938212634..7bb468166b86 100644
--- a/clippy_lints/src/returns.rs
+++ b/clippy_lints/src/returns.rs
@@ -3,7 +3,7 @@ use syntax::ast::*;
 use syntax::codemap::{Span, Spanned};
 use syntax::visit::FnKind;
 
-use utils::{span_lint, span_lint_and_then, snippet_opt, match_path_ast, in_external_macro};
+use utils::{span_note_and_lint, span_lint_and_then, snippet_opt, match_path_ast, in_external_macro};
 
 /// **What it does:** This lint checks for return statements at the end of a block.
 ///
@@ -95,29 +95,23 @@ impl ReturnPass {
                 let Some(ref retexpr) = block.expr,
                 let StmtKind::Decl(ref decl, _) = stmt.node,
                 let DeclKind::Local(ref local) = decl.node,
+                local.ty.is_none(),
                 let Some(ref initexpr) = local.init,
                 let PatKind::Ident(_, Spanned { node: id, .. }, _) = local.pat.node,
                 let ExprKind::Path(_, ref path) = retexpr.node,
-                match_path_ast(path, &[&id.name.as_str()])
+                match_path_ast(path, &[&id.name.as_str()]),
+                !in_external_macro(cx, initexpr.span),
             ], {
-                self.emit_let_lint(cx, retexpr.span, initexpr.span);
+                span_note_and_lint(cx,
+                                   LET_AND_RETURN,
+                                   retexpr.span,
+                                   "returning the result of a let binding from a block. \
+                                   Consider returning the expression directly.",
+                                   initexpr.span,
+                                   "this expression can be directly returned");
             }
         }
     }
-
-    fn emit_let_lint(&mut self, cx: &EarlyContext, lint_span: Span, note_span: Span) {
-        if in_external_macro(cx, note_span) {
-            return;
-        }
-        let mut db = span_lint(cx,
-                               LET_AND_RETURN,
-                               lint_span,
-                               "returning the result of a let binding from a block. Consider returning the \
-                                expression directly.");
-        if cx.current_level(LET_AND_RETURN) != Level::Allow {
-            db.span_note(note_span, "this expression can be directly returned");
-        }
-    }
 }
 
 impl LintPass for ReturnPass {