Merge branch 'macro-use' into HEAD

[rust.git] / clippy_lints / src / returns.rs

diff --git a/clippy_lints/src/returns.rs b/clippy_lints/src/returns.rs
index 98027885ccf1e162d99002ccb303339db91f0f4c..2bfc1e7d107121e0e1e2642d531fe3a3e185e34f 100644 (file)
--- a/clippy_lints/src/returns.rs
+++ b/clippy_lints/src/returns.rs
@@ -1,9 +1,11 @@
 use rustc::lint::*;
+use rustc::{declare_lint, lint_array};
+use if_chain::if_chain;
 use syntax::ast;
-use syntax::codemap::{Span, Spanned};
+use syntax::codemap::Span;
 use syntax::visit::FnKind;
 
-use utils::{in_external_macro, in_macro, match_path_ast, snippet_opt, span_lint_and_then, span_note_and_lint};
+use crate::utils::{in_external_macro, in_macro, match_path_ast, snippet_opt, span_lint_and_then, span_note_and_lint};
 
 /// **What it does:** Checks for return statements at the end of a block.
 ///
@@ -17,9 +19,9 @@
 /// ```rust
 /// fn foo(x: usize) { return x; }
 /// ```
-declare_lint! {
+declare_clippy_lint! {
     pub NEEDLESS_RETURN,
-    Warn,
+    style,
     "using a return statement like `return expr;` where an expression would suffice"
 }
 
@@ -35,9 +37,9 @@
 /// ```rust
 /// { let x = ..; x }
 /// ```
-declare_lint! {
+declare_clippy_lint! {
     pub LET_AND_RETURN,
-    Warn,
+    style,
     "creating a let-binding and then immediately returning it like `let x = expr; x` at \
      the end of a block"
 }
@@ -69,7 +71,7 @@ fn check_final_expr(&mut self, cx: &EarlyContext, expr: &ast::Expr, span: Option
                 }
             },
             // a whole block? check it!
-            ast::ExprKind::Block(ref block) => {
+            ast::ExprKind::Block(ref block, _) => {
                 self.check_block_return(cx, block);
             },
             // an if/if let expr, check both exprs
@@ -112,9 +114,9 @@ fn check_let_return(&mut self, cx: &EarlyContext, block: &ast::Block) {
             if local.ty.is_none();
             if !local.attrs.iter().any(attr_is_cfg);
             if let Some(ref initexpr) = local.init;
-            if let ast::PatKind::Ident(_, Spanned { node: id, .. }, _) = local.pat.node;
+            if let ast::PatKind::Ident(_, ident, _) = local.pat.node;
             if let ast::ExprKind::Path(_, ref path) = retexpr.node;
-            if match_path_ast(path, &[&id.name.as_str()]);
+            if match_path_ast(path, &[&ident.as_str()]);
             if !in_external_macro(cx, initexpr.span);
             then {
                     span_note_and_lint(cx,
@@ -149,5 +151,5 @@ fn check_block(&mut self, cx: &EarlyContext, block: &ast::Block) {
 }
 
 fn attr_is_cfg(attr: &ast::Attribute) -> bool {
-    attr.meta_item_list().is_some() && attr.name().map_or(false, |n| n == "cfg")
+    attr.meta_item_list().is_some() && attr.name() == "cfg"
 }