Merge branch 'macro-use' into HEAD

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

diff --git a/clippy_lints/src/items_after_statements.rs b/clippy_lints/src/items_after_statements.rs
index 3b3cd423729b78f6cb916f3444b8bdbed93ddecb..1d0382748eeda4174aebf2a5ecf8bef89d21e80b 100644 (file)
--- a/clippy_lints/src/items_after_statements.rs
+++ b/clippy_lints/src/items_after_statements.rs
@@ -1,8 +1,10 @@
 //! lint when items are used after statements
 
+use matches::matches;
 use rustc::lint::*;
+use rustc::{declare_lint, lint_array};
 use syntax::ast::*;
-use utils::{in_macro, span_lint};
+use crate::utils::{in_macro, span_lint};
 
 /// **What it does:** Checks for items declared after some statement in a block.
 ///
@@ -26,9 +28,9 @@
 ///     foo(); // prints "foo"
 /// }
 /// ```
-declare_lint! {
+declare_clippy_lint! {
     pub ITEMS_AFTER_STATEMENTS,
-    Allow,
+    pedantic,
     "blocks where an item comes after a statement"
 }
 
@@ -42,7 +44,7 @@ fn get_lints(&self) -> LintArray {
 
 impl EarlyLintPass for ItemsAfterStatements {
     fn check_block(&mut self, cx: &EarlyContext, item: &Block) {
-        if in_macro(cx, item.span) {
+        if in_macro(item.span) {
             return;
         }
 
@@ -55,14 +57,20 @@ fn check_block(&mut self, cx: &EarlyContext, item: &Block) {
         // lint on all further items
         for stmt in stmts {
             if let StmtKind::Item(ref it) = *stmt {
-                if in_macro(cx, it.span) {
+                if in_macro(it.span) {
                     return;
                 }
-                span_lint(cx,
-                          ITEMS_AFTER_STATEMENTS,
-                          it.span,
-                          "adding items after statements is confusing, since items exist from the \
-                           start of the scope");
+                if let ItemKind::MacroDef(..) = it.node {
+                    // do not lint `macro_rules`, but continue processing further statements
+                    continue;
+                }
+                span_lint(
+                    cx,
+                    ITEMS_AFTER_STATEMENTS,
+                    it.span,
+                    "adding items after statements is confusing, since items exist from the \
+                     start of the scope",
+                );
             }
         }
     }