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 f14c70dc4ddc3ed0d7a1a1f079fa30429ce79557..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"
 }
 
@@ -47,9 +49,10 @@ fn check_block(&mut self, cx: &EarlyContext, item: &Block) {
         }
 
         // skip initial items
-        let stmts = item.stmts.iter().map(|stmt| &stmt.node).skip_while(|s| {
-            matches!(**s, StmtKind::Item(..))
-        });
+        let stmts = item.stmts
+            .iter()
+            .map(|stmt| &stmt.node)
+            .skip_while(|s| matches!(**s, StmtKind::Item(..)));
 
         // lint on all further items
         for stmt in stmts {
@@ -66,7 +69,7 @@ fn check_block(&mut self, cx: &EarlyContext, item: &Block) {
                     ITEMS_AFTER_STATEMENTS,
                     it.span,
                     "adding items after statements is confusing, since items exist from the \
-                           start of the scope",
+                     start of the scope",
                 );
             }
         }