diff options
| -rw-r--r-- | tests/ui/imports/multiple-extern-by-macro-for-underscore.ed2015.stderr | 15 | ||||
| -rw-r--r-- | tests/ui/imports/multiple-extern-by-macro-for-underscore.ed2021.stderr (renamed from tests/ui/imports/multiple-extern-by-macro-for-underscore.stderr) | 2 | ||||
| -rw-r--r-- | tests/ui/imports/multiple-extern-by-macro-for-underscore.rs | 6 | ||||
| -rw-r--r-- | tests/ui/underscore-imports/issue-110164.ed2015.stderr (renamed from tests/ui/underscore-imports/issue-110164.stderr) | 20 | ||||
| -rw-r--r-- | tests/ui/underscore-imports/issue-110164.ed2021.stderr | 71 | ||||
| -rw-r--r-- | tests/ui/underscore-imports/issue-110164.rs | 3 |
6 files changed, 104 insertions, 13 deletions
diff --git a/tests/ui/imports/multiple-extern-by-macro-for-underscore.ed2015.stderr b/tests/ui/imports/multiple-extern-by-macro-for-underscore.ed2015.stderr new file mode 100644 index 00000000000..719d90d8c49 --- /dev/null +++ b/tests/ui/imports/multiple-extern-by-macro-for-underscore.ed2015.stderr @@ -0,0 +1,15 @@ +error: expected identifier, found reserved identifier `_` + --> $DIR/multiple-extern-by-macro-for-underscore.rs:18:11 + | +LL | use ::_; + | ^ expected identifier, found reserved identifier + +error[E0432]: unresolved import `_` + --> $DIR/multiple-extern-by-macro-for-underscore.rs:18:9 + | +LL | use ::_; + | ^^^ no `_` in the root + +error: aborting due to 2 previous errors + +For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/multiple-extern-by-macro-for-underscore.stderr b/tests/ui/imports/multiple-extern-by-macro-for-underscore.ed2021.stderr index 1da5aa87070..985cd654c39 100644 --- a/tests/ui/imports/multiple-extern-by-macro-for-underscore.stderr +++ b/tests/ui/imports/multiple-extern-by-macro-for-underscore.ed2021.stderr @@ -1,5 +1,5 @@ error: expected identifier, found reserved identifier `_` - --> $DIR/multiple-extern-by-macro-for-underscore.rs:16:11 + --> $DIR/multiple-extern-by-macro-for-underscore.rs:18:11 | LL | use ::_; | ^ expected identifier, found reserved identifier diff --git a/tests/ui/imports/multiple-extern-by-macro-for-underscore.rs b/tests/ui/imports/multiple-extern-by-macro-for-underscore.rs index ddf735d8947..2f9fc266ffd 100644 --- a/tests/ui/imports/multiple-extern-by-macro-for-underscore.rs +++ b/tests/ui/imports/multiple-extern-by-macro-for-underscore.rs @@ -1,4 +1,6 @@ -//@ edition: 2021 +//@ revisions: ed2015 ed2021 +//@[ed2015] edition: 2015 +//@[ed2021] edition: 2021 // issue#128813 @@ -13,6 +15,6 @@ macro_rules! m { m!(); fn main() { - use ::_; + use ::_; //[ed2015]~ ERROR: unresolved import `_` //~^ ERROR: expected identifier, found reserved identifier `_` } diff --git a/tests/ui/underscore-imports/issue-110164.stderr b/tests/ui/underscore-imports/issue-110164.ed2015.stderr index d8a4b6bbb75..fab6b19156a 100644 --- a/tests/ui/underscore-imports/issue-110164.stderr +++ b/tests/ui/underscore-imports/issue-110164.ed2015.stderr @@ -1,59 +1,59 @@ error: expected identifier, found reserved identifier `_` - --> $DIR/issue-110164.rs:5:5 + --> $DIR/issue-110164.rs:8:5 | LL | use _::a; | ^ expected identifier, found reserved identifier error: expected identifier, found reserved identifier `_` - --> $DIR/issue-110164.rs:8:5 + --> $DIR/issue-110164.rs:11:5 | LL | use _::*; | ^ expected identifier, found reserved identifier error: expected identifier, found reserved identifier `_` - --> $DIR/issue-110164.rs:13:9 + --> $DIR/issue-110164.rs:16:9 | LL | use _::a; | ^ expected identifier, found reserved identifier error: expected identifier, found reserved identifier `_` - --> $DIR/issue-110164.rs:16:9 + --> $DIR/issue-110164.rs:19:9 | LL | use _::*; | ^ expected identifier, found reserved identifier error[E0432]: unresolved import `self::*` - --> $DIR/issue-110164.rs:1:5 + --> $DIR/issue-110164.rs:4:5 | LL | use self::*; | ^^^^^^^ cannot glob-import a module into itself error[E0432]: unresolved import `crate::*` - --> $DIR/issue-110164.rs:3:5 + --> $DIR/issue-110164.rs:6:5 | LL | use crate::*; | ^^^^^^^^ cannot glob-import a module into itself error[E0432]: unresolved import `_` - --> $DIR/issue-110164.rs:8:5 + --> $DIR/issue-110164.rs:11:5 | LL | use _::*; | ^ `_` is not a valid crate or module name error[E0432]: unresolved import `_` - --> $DIR/issue-110164.rs:5:5 + --> $DIR/issue-110164.rs:8:5 | LL | use _::a; | ^ `_` is not a valid crate or module name error[E0432]: unresolved import `_` - --> $DIR/issue-110164.rs:13:9 + --> $DIR/issue-110164.rs:16:9 | LL | use _::a; | ^ `_` is not a valid crate or module name error[E0432]: unresolved import `_` - --> $DIR/issue-110164.rs:16:9 + --> $DIR/issue-110164.rs:19:9 | LL | use _::*; | ^ `_` is not a valid crate or module name diff --git a/tests/ui/underscore-imports/issue-110164.ed2021.stderr b/tests/ui/underscore-imports/issue-110164.ed2021.stderr new file mode 100644 index 00000000000..fab502760ad --- /dev/null +++ b/tests/ui/underscore-imports/issue-110164.ed2021.stderr @@ -0,0 +1,71 @@ +error: expected identifier, found reserved identifier `_` + --> $DIR/issue-110164.rs:8:5 + | +LL | use _::a; + | ^ expected identifier, found reserved identifier + +error: expected identifier, found reserved identifier `_` + --> $DIR/issue-110164.rs:11:5 + | +LL | use _::*; + | ^ expected identifier, found reserved identifier + +error: expected identifier, found reserved identifier `_` + --> $DIR/issue-110164.rs:16:9 + | +LL | use _::a; + | ^ expected identifier, found reserved identifier + +error: expected identifier, found reserved identifier `_` + --> $DIR/issue-110164.rs:19:9 + | +LL | use _::*; + | ^ expected identifier, found reserved identifier + +error[E0432]: unresolved import `self::*` + --> $DIR/issue-110164.rs:4:5 + | +LL | use self::*; + | ^^^^^^^ cannot glob-import a module into itself + +error[E0432]: unresolved import `crate::*` + --> $DIR/issue-110164.rs:6:5 + | +LL | use crate::*; + | ^^^^^^^^ cannot glob-import a module into itself + +error[E0432]: unresolved import `_` + --> $DIR/issue-110164.rs:11:5 + | +LL | use _::*; + | ^ use of unresolved module or unlinked crate `_` + | + = help: you might be missing a crate named `_` + +error[E0432]: unresolved import `_` + --> $DIR/issue-110164.rs:8:5 + | +LL | use _::a; + | ^ use of unresolved module or unlinked crate `_` + | + = help: you might be missing a crate named `_` + +error[E0432]: unresolved import `_` + --> $DIR/issue-110164.rs:16:9 + | +LL | use _::a; + | ^ use of unresolved module or unlinked crate `_` + | + = help: you might be missing a crate named `_` + +error[E0432]: unresolved import `_` + --> $DIR/issue-110164.rs:19:9 + | +LL | use _::*; + | ^ use of unresolved module or unlinked crate `_` + | + = help: you might be missing a crate named `_` + +error: aborting due to 10 previous errors + +For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/underscore-imports/issue-110164.rs b/tests/ui/underscore-imports/issue-110164.rs index 6fd13414500..59ab0e1d588 100644 --- a/tests/ui/underscore-imports/issue-110164.rs +++ b/tests/ui/underscore-imports/issue-110164.rs @@ -1,3 +1,6 @@ +//@ revisions: ed2015 ed2021 +//@[ed2015] edition: 2015 +//@[ed2021] edition: 2021 use self::*; //~^ ERROR unresolved import `self::*` use crate::*; |