---

yaml
---
r: 182572
b: refs/heads/beta
c: 2d17a33
h: refs/heads/master
v: v3

Author: eddyb

[refs]

@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 5e07f5a792329674f6849c1da688e36499983532
+refs/heads/beta: 2d17a33878f1af0aa500a4e1ff6aa5c8689ab249
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: eb836bf767aa1d8d4cba488a9091cde3c0ab4b2f

branches/beta/src/librustc/diagnostics.rs

@@ -52,6 +52,7 @@ register_diagnostics! {
     E0140,
     E0152,
     E0153,
+    E0154,
     E0157,
     E0158,
     E0161,

branches/beta/src/librustc_resolve/lib.rs

@@ -3509,6 +3509,26 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
             }
         }
 
+        // Check for imports appearing after non-item statements.
+        let mut found_non_item = false;
+        for statement in block.stmts.iter() {
+            if let ast::StmtDecl(ref declaration, _) = statement.node {
+                if let ast::DeclItem(ref i) = declaration.node {
+                    match i.node {
+                        ItemExternCrate(_) | ItemUse(_) if found_non_item => {
+                            span_err!(self.session, i.span, E0154,
+                                "imports are not allowed after non-item statements");
+                        }
+                        _ => {}
+                    }
+                } else {
+                    found_non_item = true
+                }
+            } else {
+                found_non_item = true;
+            }
+        }
+
         // Descend into the block.
         visit::walk_block(self, block);
 

branches/beta/src/test/compile-fail/blind-item-block-middle.rs

@@ -14,4 +14,5 @@ fn main() {
     let bar = 5;
     //~^ ERROR declaration of `bar` shadows an enum variant or unit-like struct in scope
     use foo::bar;
+    //~^ ERROR imports are not allowed after non-item statements
 }

branches/beta/src/test/run-pass/blind-item-local-shadow.rs renamed to branches/beta/src/test/compile-fail/blind-item-local-shadow.rs

@@ -9,11 +9,12 @@
 // except according to those terms.
 
 mod bar {
-    pub fn foo() -> uint { 42 }
+    pub fn foo() -> bool { true }
 }
 
 fn main() {
-    let foo = |&:| 5u;
+    let foo = |&:| false;
     use bar::foo;
-    assert_eq!(foo(), 5u);
+    //~^ ERROR imports are not allowed after non-item statements
+    assert_eq!(foo(), false);
 }