---

yaml
---
r: 172886
b: refs/heads/try
c: 9574724
h: refs/heads/master
v: v3

Author: eddyb

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 170c4399e614fe599c3d41306b3429ca8b3b68c6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 5b3cd3900ceda838f5798c30ab96ceb41f962534
-refs/heads/try: 4bec1841e801e7602a67d16c77879e502c0166d2
+refs/heads/try: 957472483d3a2f43c0e4f7c2056280a1022af93c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/librustc/diagnostics.rs

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

branches/try/src/librustc_resolve/lib.rs

@@ -3503,6 +3503,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/try/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/try/src/test/run-pass/blind-item-local-shadow.rs renamed to branches/try/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);
 }