Make some use _ tests multi-edition

Author: estebank

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`.

tests/ui/imports/multiple-extern-by-macro-for-underscore.stderr renamed to 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

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 `_`
 }

tests/ui/underscore-imports/issue-110164.stderr renamed to 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

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`.

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::*;