forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
resolve: Simplify import resolution for mixed 2015/2018 edition mode
- Loading branch information
1 parent
8f4c226
commit 1d6f4d6
Showing
7 changed files
with
11 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 0 additions & 40 deletions
40
src/test/ui/editions/edition-imports-virtual-2015-ambiguity.stderr
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,11 @@ | ||
// edition:2018 | ||
// aux-build:edition-imports-2015.rs | ||
// error-pattern: imports can only refer to extern crate names passed with `--extern` | ||
|
||
#[macro_use] | ||
extern crate edition_imports_2015; | ||
|
||
mod check { | ||
gen_gated!(); | ||
gen_gated!(); //~ ERROR unresolved import `E` | ||
} | ||
|
||
fn main() {} |
17 changes: 4 additions & 13 deletions
17
src/test/ui/editions/edition-imports-virtual-2015-gated.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,11 @@ | ||
error: imports can only refer to extern crate names passed with `--extern` in macros originating from 2015 edition | ||
--> <::edition_imports_2015::gen_gated macros>:1:50 | ||
| | ||
LL | ( ) => { fn check_gated ( ) { enum E { A } use E :: * ; } } | ||
| ^ | ||
| | ||
::: $DIR/edition-imports-virtual-2015-gated.rs:9:5 | ||
error[E0432]: unresolved import `E` | ||
--> $DIR/edition-imports-virtual-2015-gated.rs:8:5 | ||
| | ||
LL | gen_gated!(); | ||
| ------------- not an extern crate passed with `--extern` | ||
| | ||
note: this import refers to the enum defined here | ||
--> $DIR/edition-imports-virtual-2015-gated.rs:9:5 | ||
| ^^^^^^^^^^^^^ could not find `E` in `{{root}}` | ||
| | ||
LL | gen_gated!(); | ||
| ^^^^^^^^^^^^^ | ||
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0432`. |