Merge pull request #1619 from Techcable/fix/mir_passes

Fix compilation on latest nightly
rust-lang · Mar 13, 2017 · d77dc1f · d77dc1f
2 parents b48243c + 2d145b2
commit d77dc1f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/clippy_lints/src/items_after_statements.rs b/clippy_lints/src/items_after_statements.rs
@@ -58,6 +58,10 @@ impl EarlyLintPass for ItemsAfterStatements {
                 if in_macro(cx, it.span) {
                     return;
                 }
+                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,

diff --git a/src/main.rs b/src/main.rs
@@ -89,7 +89,6 @@ impl<'a> CompilerCalls<'a> for ClippyCompilerCalls {
                                                            lint_groups,
                                                            llvm_passes,
                                                            attributes,
-                                                           mir_passes,
                                                            .. } = registry;
                     let sess = &state.session;
                     let mut ls = sess.lint_store.borrow_mut();
@@ -105,7 +104,6 @@ impl<'a> CompilerCalls<'a> for ClippyCompilerCalls {
                     }
 
                     sess.plugin_llvm_passes.borrow_mut().extend(llvm_passes);
-                    sess.mir_passes.borrow_mut().extend(mir_passes);
                     sess.plugin_attributes.borrow_mut().extend(attributes);
                 }
                 old(state);

diff --git a/tests/ui/item_after_statement.rs b/tests/ui/item_after_statement.rs
@@ -17,3 +17,14 @@ fn main() {
     fn foo() { println!("foo"); }
     foo();
 }
+
+fn mac() {
+    let mut a = 5;
+    println!("{}", a);
+    // do not lint this, because it needs to be after `a`
+    macro_rules! b {
+        () => {{ a = 6 }}
+    }
+    b!();
+    println!("{}", a);
+}