about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-01-29 11:21:58 +0000
committerbors <bors@rust-lang.org>2016-01-29 11:21:58 +0000
commitf030d1fba198e00d981de9e1cefe596e263aa880 (patch)
tree8b3cc1aef1af7992df8e681ca51b11a0fbd2919d /src/test
parent33b73e9643fdf7b5d3be47d92e996ab04d6212e9 (diff)
parentf05bc16a5d8bb1bfb0ee2b281fb3dc6fdefa258c (diff)
downloadrust-f030d1fba198e00d981de9e1cefe596e263aa880.tar.gz
rust-f030d1fba198e00d981de9e1cefe596e263aa880.zip
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.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail/blind-item-block-middle.rs1
-rw-r--r--src/test/run-pass/blind-item-local-shadow.rs (renamed from src/test/compile-fail/blind-item-local-shadow.rs)1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/test/compile-fail/blind-item-block-middle.rs b/src/test/compile-fail/blind-item-block-middle.rs
index fbb0730f014..24a1e4e24d8 100644
--- a/src/test/compile-fail/blind-item-block-middle.rs
+++ b/src/test/compile-fail/blind-item-block-middle.rs
@@ -14,5 +14,4 @@ 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
 }
diff --git a/src/test/compile-fail/blind-item-local-shadow.rs b/src/test/run-pass/blind-item-local-shadow.rs
index 5cc087cb66e..bb654b1a20b 100644
--- a/src/test/compile-fail/blind-item-local-shadow.rs
+++ b/src/test/run-pass/blind-item-local-shadow.rs
@@ -15,6 +15,5 @@ mod bar {
 fn main() {
     let foo = || false;
     use bar::foo;
-    //~^ ERROR imports are not allowed after non-item statements
     assert_eq!(foo(), false);
 }