diff options
| author | bors <bors@rust-lang.org> | 2016-01-29 11:21:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-01-29 11:21:58 +0000 |
| commit | f030d1fba198e00d981de9e1cefe596e263aa880 (patch) | |
| tree | 8b3cc1aef1af7992df8e681ca51b11a0fbd2919d /src/test/compile-fail | |
| parent | 33b73e9643fdf7b5d3be47d92e996ab04d6212e9 (diff) | |
| parent | f05bc16a5d8bb1bfb0ee2b281fb3dc6fdefa258c (diff) | |
| download | rust-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/compile-fail')
| -rw-r--r-- | src/test/compile-fail/blind-item-block-middle.rs | 1 | ||||
| -rw-r--r-- | src/test/compile-fail/blind-item-local-shadow.rs | 20 |
2 files changed, 0 insertions, 21 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/compile-fail/blind-item-local-shadow.rs deleted file mode 100644 index 5cc087cb66e..00000000000 --- a/src/test/compile-fail/blind-item-local-shadow.rs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2015 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -mod bar { - pub fn foo() -> bool { true } -} - -fn main() { - let foo = || false; - use bar::foo; - //~^ ERROR imports are not allowed after non-item statements - assert_eq!(foo(), false); -} |
