Auto merge of #31144 - jseyfried:remove_import_ordering_restriction, r=nrc

We no longer require `use` and `extern crate` items to precede other items in modules thanks to [RFC #385](https://github.com/rust-lang/rfcs/pull/385), but we still require `use` and `extern crate` items to precede statements in blocks (other items can appear anywhere in a block).

I think that this is a needless distinction between imports and other items that contradicts the intent of the RFC.
This commit is contained in:
bors 2016-01-29 11:21:58 +00:00
commit f030d1fba1
3 changed files with 0 additions and 25 deletions

View File

@ -2516,29 +2516,6 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
self.value_ribs.push(Rib::new(NormalRibKind)); self.value_ribs.push(Rib::new(NormalRibKind));
} }
// Check for imports appearing after non-item statements.
let mut found_non_item = false;
for statement in &block.stmts {
if let hir::StmtDecl(ref declaration, _) = statement.node {
if let hir::DeclItem(i) = declaration.node {
let i = self.ast_map.expect_item(i.id);
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. // Descend into the block.
intravisit::walk_block(self, block); intravisit::walk_block(self, block);

View File

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

View File

@ -15,6 +15,5 @@ mod bar {
fn main() { fn main() {
let foo = || false; let foo = || false;
use bar::foo; use bar::foo;
//~^ ERROR imports are not allowed after non-item statements
assert_eq!(foo(), false); assert_eq!(foo(), false);
} }