Fixes #1735

diff --git a/clippy_lints/src/returns.rs b/clippy_lints/src/returns.rs
index 16f582c77c97fe7a880b546e327868513d067630..96b1e4e91857f9184bd13f75b5d955b35aa0657c 100644 (file)
--- a/clippy_lints/src/returns.rs
+++ b/clippy_lints/src/returns.rs
@@ -111,6 +111,8 @@ fn check_let_return(&mut self, cx: &EarlyContext, block: &ast::Block) {
             let ast::StmtKind::Expr(ref retexpr) = retexpr.node,
             let Some(stmt) = it.next_back(),
             let ast::StmtKind::Local(ref local) = stmt.node,
+            // don't lint in the presence of type inference
+            local.ty.is_none(),
             !local.attrs.iter().any(attr_is_cfg),
             let Some(ref initexpr) = local.init,
             let ast::PatKind::Ident(_, Spanned { node: id, .. }, _) = local.pat.node,

diff --git a/tests/ui/let_return.rs b/tests/ui/let_return.rs
index de0bb9b3cc1c400b680ebeb482cabd8b2f3dabbf..71cdf88c8875bde2a9f5d1229c0d990c3da7315f 100644 (file)
--- a/tests/ui/let_return.rs
+++ b/tests/ui/let_return.rs
@@ -36,5 +36,11 @@ fn test_nowarn_3() -> (i32, i32) {
     (x, y)
 }
 
+fn test_nowarn_4() -> i32 {
+    // this should technically warn, but not b/c of let_and_return, but b/c of useless type
+    let x: i32 = 5;
+    x
+}
+
 fn main() {
 }