Move some tests to subdirectories

139 files changed, 71 insertions, 105 deletions

diff --git a/src/test/ui/issues/issue-36617.rs b/src/test/ui/derives/issue-36617.rs
index 1102f3c4640..1102f3c4640 100644
--- a/src/test/ui/issues/issue-36617.rs
+++ b/src/test/ui/derives/issue-36617.rs
diff --git a/src/test/ui/issues/issue-36617.stderr b/src/test/ui/derives/issue-36617.stderr
index dc6ef169259..dc6ef169259 100644
--- a/src/test/ui/issues/issue-36617.stderr
+++ b/src/test/ui/derives/issue-36617.stderr
diff --git a/src/test/ui/hidden-rt-injection.rs b/src/test/ui/hidden-rt-injection.rs
deleted file mode 100644
index 3ca04f93493..00000000000
--- a/src/test/ui/hidden-rt-injection.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// This is testing that users can't access the runtime crate.
-
-mod m {
-    // The rt has been called both 'native' and 'rt'
-    use native; //~ ERROR unresolved import
-}
-
-fn main() { }
diff --git a/src/test/ui/hidden-rt-injection.stderr b/src/test/ui/hidden-rt-injection.stderr
deleted file mode 100644
index 3e288b72ec6..00000000000
--- a/src/test/ui/hidden-rt-injection.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0432]: unresolved import `native`
-  --> $DIR/hidden-rt-injection.rs:5:9
-   |
-LL |     use native;
-   |         ^^^^^^ no `native` in the root
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0432`.
diff --git a/src/test/ui/hidden-rt-injection2.rs b/src/test/ui/hidden-rt-injection2.rs
deleted file mode 100644
index 2af113c05e0..00000000000
--- a/src/test/ui/hidden-rt-injection2.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// This is testing that users can't access the runtime crate.
-
-mod m {
-    // The rt has been called both 'native' and 'rt'
-    use rt; //~ ERROR unresolved import
-}
-
-fn main() { }
diff --git a/src/test/ui/hidden-rt-injection2.stderr b/src/test/ui/hidden-rt-injection2.stderr
deleted file mode 100644
index 73f89b5856d..00000000000
--- a/src/test/ui/hidden-rt-injection2.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0432]: unresolved import `rt`
-  --> $DIR/hidden-rt-injection2.rs:5:9
-   |
-LL |     use rt;
-   |         ^^ no `rt` in the root
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0432`.
diff --git a/src/test/ui/import.rs b/src/test/ui/import.rs
deleted file mode 100644
index 3170dd2fae1..00000000000
--- a/src/test/ui/import.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use zed::bar;
-use zed::baz; //~ ERROR unresolved import `zed::baz` [E0432]
-              //~| no `baz` in `zed`
-              //~| HELP a similar name exists in the module
-              //~| SUGGESTION bar
-
-
-mod zed {
-    pub fn bar() { println!("bar"); }
-    use foo; //~ ERROR unresolved import `foo` [E0432]
-             //~^ no `foo` in the root
-}
-
-fn main() {
-    zed::foo(); //~ ERROR `foo` is private
-    bar();
-}
diff --git a/src/test/ui/import2.rs b/src/test/ui/import2.rs
deleted file mode 100644
index 036d6bc07e2..00000000000
--- a/src/test/ui/import2.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use baz::zed::bar; //~ ERROR unresolved import `baz::zed` [E0432]
-                   //~^ could not find `zed` in `baz`
-
-mod baz {}
-mod zed {
-    pub fn bar() { println!("bar3"); }
-}
-fn main() {
-    bar();
-}
diff --git a/src/test/ui/import3.rs b/src/test/ui/import3.rs
deleted file mode 100644
index 2c6ac9a00e1..00000000000
--- a/src/test/ui/import3.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-// error-pattern: unresolved
-use main::bar;
-
-fn main() { println!("foo"); }
diff --git a/src/test/ui/import4.rs b/src/test/ui/import4.rs
deleted file mode 100644
index ba3b7fbf535..00000000000
--- a/src/test/ui/import4.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// error-pattern: import
-
-
-mod a { pub use b::foo; }
-mod b { pub use a::foo; }
-
-fn main() { println!("loop"); }
diff --git a/src/test/ui/issues/auxiliary/issue-36881-aux.rs b/src/test/ui/imports/auxiliary/issue-36881-aux.rs
index e373b64384f..e373b64384f 100644
--- a/src/test/ui/issues/auxiliary/issue-36881-aux.rs
+++ b/src/test/ui/imports/auxiliary/issue-36881-aux.rs
diff --git a/src/test/ui/issues/auxiliary/issue-52891.rs b/src/test/ui/imports/auxiliary/issue-52891.rs
index 07598118322..07598118322 100644
--- a/src/test/ui/issues/auxiliary/issue-52891.rs
+++ b/src/test/ui/imports/auxiliary/issue-52891.rs
diff --git a/src/test/ui/issues/auxiliary/issue-59764.rs b/src/test/ui/imports/auxiliary/issue-59764.rs
index a92eed968d0..a92eed968d0 100644
--- a/src/test/ui/issues/auxiliary/issue-59764.rs
+++ b/src/test/ui/imports/auxiliary/issue-59764.rs
diff --git a/src/test/ui/double-import.rs b/src/test/ui/imports/double-import.rs
index e7325368b4d..e7325368b4d 100644
--- a/src/test/ui/double-import.rs
+++ b/src/test/ui/imports/double-import.rs
diff --git a/src/test/ui/double-import.stderr b/src/test/ui/imports/double-import.stderr
index 7a4e8e5d3b9..7a4e8e5d3b9 100644
--- a/src/test/ui/double-import.stderr
+++ b/src/test/ui/imports/double-import.stderr
diff --git a/src/test/ui/export-glob-imports-target.rs b/src/test/ui/imports/export-glob-imports-target.rs
index 4df807ea4c9..4df807ea4c9 100644
--- a/src/test/ui/export-glob-imports-target.rs
+++ b/src/test/ui/imports/export-glob-imports-target.rs
diff --git a/src/test/ui/glob-resolve1.rs b/src/test/ui/imports/glob-resolve1.rs
index 32660fdb418..32660fdb418 100644
--- a/src/test/ui/glob-resolve1.rs
+++ b/src/test/ui/imports/glob-resolve1.rs
diff --git a/src/test/ui/glob-resolve1.stderr b/src/test/ui/imports/glob-resolve1.stderr
index cd128c1ea0b..cd128c1ea0b 100644
--- a/src/test/ui/glob-resolve1.stderr
+++ b/src/test/ui/imports/glob-resolve1.stderr
diff --git a/src/test/ui/imports/import-rpass.rs b/src/test/ui/imports/import-rpass.rs
new file mode 100644
index 00000000000..de8bf626114
--- /dev/null
+++ b/src/test/ui/imports/import-rpass.rs
@@ -0,0 +1,12 @@
+// run-pass
+mod foo {
+    pub fn x(y: isize) { println!("{}", y); }
+}
+
+mod bar {
+    use foo::x;
+    use foo::x as z;
+    pub fn thing() { x(10); z(10); }
+}
+
+pub fn main() { bar::thing(); }
diff --git a/src/test/ui/imports/import.rs b/src/test/ui/imports/import.rs
index de8bf626114..3170dd2fae1 100644
--- a/src/test/ui/imports/import.rs
+++ b/src/test/ui/imports/import.rs
@@ -1,12 +1,17 @@
-// run-pass
-mod foo {
-    pub fn x(y: isize) { println!("{}", y); }
-}
+use zed::bar;
+use zed::baz; //~ ERROR unresolved import `zed::baz` [E0432]
+              //~| no `baz` in `zed`
+              //~| HELP a similar name exists in the module
+              //~| SUGGESTION bar
+
 
-mod bar {
-    use foo::x;
-    use foo::x as z;
-    pub fn thing() { x(10); z(10); }
+mod zed {
+    pub fn bar() { println!("bar"); }
+    use foo; //~ ERROR unresolved import `foo` [E0432]
+             //~^ no `foo` in the root
 }
 
-pub fn main() { bar::thing(); }
+fn main() {
+    zed::foo(); //~ ERROR `foo` is private
+    bar();
+}
diff --git a/src/test/ui/import.stderr b/src/test/ui/imports/import.stderr
index 797712e2db9..797712e2db9 100644
--- a/src/test/ui/import.stderr
+++ b/src/test/ui/imports/import.stderr
diff --git a/src/test/ui/imports/import2-rpass.rs b/src/test/ui/imports/import2-rpass.rs
new file mode 100644
index 00000000000..7b70f799ebf
--- /dev/null
+++ b/src/test/ui/imports/import2-rpass.rs
@@ -0,0 +1,9 @@
+// run-pass
+
+use zed::bar;
+
+mod zed {
+    pub fn bar() { println!("bar"); }
+}
+
+pub fn main() { bar(); }
diff --git a/src/test/ui/imports/import2.rs b/src/test/ui/imports/import2.rs
index 7b70f799ebf..036d6bc07e2 100644
--- a/src/test/ui/imports/import2.rs
+++ b/src/test/ui/imports/import2.rs
@@ -1,9 +1,10 @@
-// run-pass
-
-use zed::bar;
+use baz::zed::bar; //~ ERROR unresolved import `baz::zed` [E0432]
+                   //~^ could not find `zed` in `baz`
 
+mod baz {}
 mod zed {
-    pub fn bar() { println!("bar"); }
+    pub fn bar() { println!("bar3"); }
+}
+fn main() {
+    bar();
 }
-
-pub fn main() { bar(); }
diff --git a/src/test/ui/import2.stderr b/src/test/ui/imports/import2.stderr
index da888979c30..da888979c30 100644
--- a/src/test/ui/import2.stderr
+++ b/src/test/ui/imports/import2.stderr
diff --git a/src/test/ui/imports/import3-rpass.rs b/src/test/ui/imports/import3-rpass.rs
new file mode 100644
index 00000000000..17797aed359
--- /dev/null
+++ b/src/test/ui/imports/import3-rpass.rs
@@ -0,0 +1,13 @@
+// run-pass
+#![allow(unused_imports)]
+
+use baz::zed;
+use baz::zed::bar;
+
+mod baz {
+    pub mod zed {
+        pub fn bar() { println!("bar2"); }
+    }
+}
+
+pub fn main() { bar(); }
diff --git a/src/test/ui/imports/import3.rs b/src/test/ui/imports/import3.rs
index 17797aed359..2c6ac9a00e1 100644
--- a/src/test/ui/imports/import3.rs
+++ b/src/test/ui/imports/import3.rs
@@ -1,13 +1,4 @@
-// run-pass
-#![allow(unused_imports)]
+// error-pattern: unresolved
+use main::bar;
 
-use baz::zed;
-use baz::zed::bar;
-
-mod baz {
-    pub mod zed {
-        pub fn bar() { println!("bar2"); }
-    }
-}
-
-pub fn main() { bar(); }
+fn main() { println!("foo"); }
diff --git a/src/test/ui/import3.stderr b/src/test/ui/imports/import3.stderr
index 7bb413be59f..7bb413be59f 100644
--- a/src/test/ui/import3.stderr
+++ b/src/test/ui/imports/import3.stderr
diff --git a/src/test/ui/imports/import4-rpass.rs b/src/test/ui/imports/import4-rpass.rs
new file mode 100644
index 00000000000..4fda5386112
--- /dev/null
+++ b/src/test/ui/imports/import4-rpass.rs
@@ -0,0 +1,9 @@
+// run-pass
+
+use zed::bar;
+
+mod zed {
+    pub fn bar() { println!("bar"); }
+}
+
+pub fn main() { let _zed = 42; bar(); }
diff --git a/src/test/ui/imports/import4.rs b/src/test/ui/imports/import4.rs
index 4fda5386112..ba3b7fbf535 100644
--- a/src/test/ui/imports/import4.rs
+++ b/src/test/ui/imports/import4.rs
@@ -1,9 +1,7 @@
-// run-pass
+// error-pattern: import
 
-use zed::bar;
 
-mod zed {
-    pub fn bar() { println!("bar"); }
-}
+mod a { pub use b::foo; }
+mod b { pub use a::foo; }
 
-pub fn main() { let _zed = 42; bar(); }
+fn main() { println!("loop"); }
diff --git a/src/test/ui/import4.stderr b/src/test/ui/imports/import4.stderr
index e0b478f1aec..e0b478f1aec 100644
--- a/src/test/ui/import4.stderr
+++ b/src/test/ui/imports/import4.stderr
diff --git a/src/test/ui/issues/issue-13404.rs b/src/test/ui/imports/issue-13404.rs
index c5af827d50c..c5af827d50c 100644
--- a/src/test/ui/issues/issue-13404.rs
+++ b/src/test/ui/imports/issue-13404.rs
diff --git a/src/test/ui/issues/issue-13404.stderr b/src/test/ui/imports/issue-13404.stderr
index 1f50debb07b..1f50debb07b 100644
--- a/src/test/ui/issues/issue-13404.stderr
+++ b/src/test/ui/imports/issue-13404.stderr
diff --git a/src/test/ui/issues/issue-1697.rs b/src/test/ui/imports/issue-1697.rs
index 5cd76d21f91..5cd76d21f91 100644
--- a/src/test/ui/issues/issue-1697.rs
+++ b/src/test/ui/imports/issue-1697.rs
diff --git a/src/test/ui/issues/issue-1697.stderr b/src/test/ui/imports/issue-1697.stderr
index a76fd309914..a76fd309914 100644
--- a/src/test/ui/issues/issue-1697.stderr
+++ b/src/test/ui/imports/issue-1697.stderr
diff --git a/src/test/ui/issues/issue-18083.rs b/src/test/ui/imports/issue-18083.rs
index 36420ec142e..36420ec142e 100644
--- a/src/test/ui/issues/issue-18083.rs
+++ b/src/test/ui/imports/issue-18083.rs
diff --git a/src/test/ui/issues/issue-19498.rs b/src/test/ui/imports/issue-19498.rs
index 5fe6742f55e..5fe6742f55e 100644
--- a/src/test/ui/issues/issue-19498.rs
+++ b/src/test/ui/imports/issue-19498.rs
diff --git a/src/test/ui/issues/issue-19498.stderr b/src/test/ui/imports/issue-19498.stderr
index cc1d649d610..cc1d649d610 100644
--- a/src/test/ui/issues/issue-19498.stderr
+++ b/src/test/ui/imports/issue-19498.stderr
diff --git a/src/test/ui/issues/issue-24081.rs b/src/test/ui/imports/issue-24081.rs
index 10983ce11b5..10983ce11b5 100644
--- a/src/test/ui/issues/issue-24081.rs
+++ b/src/test/ui/imports/issue-24081.rs
diff --git a/src/test/ui/issues/issue-24081.stderr b/src/test/ui/imports/issue-24081.stderr
index 647048c7c20..647048c7c20 100644
--- a/src/test/ui/issues/issue-24081.stderr
+++ b/src/test/ui/imports/issue-24081.stderr
diff --git a/src/test/ui/issues/issue-25396.rs b/src/test/ui/imports/issue-25396.rs
index 301658d2344..301658d2344 100644
--- a/src/test/ui/issues/issue-25396.rs
+++ b/src/test/ui/imports/issue-25396.rs
diff --git a/src/test/ui/issues/issue-25396.stderr b/src/test/ui/imports/issue-25396.stderr
index 38dc9ef1035..38dc9ef1035 100644
--- a/src/test/ui/issues/issue-25396.stderr
+++ b/src/test/ui/imports/issue-25396.stderr
diff --git a/src/test/ui/issues/issue-26886.rs b/src/test/ui/imports/issue-26886.rs
index 6e6d406c656..6e6d406c656 100644
--- a/src/test/ui/issues/issue-26886.rs
+++ b/src/test/ui/imports/issue-26886.rs
diff --git a/src/test/ui/issues/issue-26886.stderr b/src/test/ui/imports/issue-26886.stderr
index e2b925ec5a7..e2b925ec5a7 100644
--- a/src/test/ui/issues/issue-26886.stderr
+++ b/src/test/ui/imports/issue-26886.stderr
diff --git a/src/test/ui/issues/issue-28134.rs b/src/test/ui/imports/issue-28134.rs
index 1ed2d330b51..1ed2d330b51 100644
--- a/src/test/ui/issues/issue-28134.rs
+++ b/src/test/ui/imports/issue-28134.rs
diff --git a/src/test/ui/issues/issue-28134.stderr b/src/test/ui/imports/issue-28134.stderr
index 8ed4d015f32..8ed4d015f32 100644
--- a/src/test/ui/issues/issue-28134.stderr
+++ b/src/test/ui/imports/issue-28134.stderr
diff --git a/src/test/ui/issues/issue-28388-1.rs b/src/test/ui/imports/issue-28388-1.rs
index 14de621405d..14de621405d 100644
--- a/src/test/ui/issues/issue-28388-1.rs
+++ b/src/test/ui/imports/issue-28388-1.rs
diff --git a/src/test/ui/issues/issue-28388-1.stderr b/src/test/ui/imports/issue-28388-1.stderr
index 7f5e47aa84f..7f5e47aa84f 100644
--- a/src/test/ui/issues/issue-28388-1.stderr
+++ b/src/test/ui/imports/issue-28388-1.stderr
diff --git a/src/test/ui/issues/issue-28388-2.rs b/src/test/ui/imports/issue-28388-2.rs
index 024b0388bc6..024b0388bc6 100644
--- a/src/test/ui/issues/issue-28388-2.rs
+++ b/src/test/ui/imports/issue-28388-2.rs
diff --git a/src/test/ui/issues/issue-28388-2.stderr b/src/test/ui/imports/issue-28388-2.stderr
index 1afaf622be7..1afaf622be7 100644
--- a/src/test/ui/issues/issue-28388-2.stderr
+++ b/src/test/ui/imports/issue-28388-2.stderr
diff --git a/src/test/ui/issues/issue-2937.rs b/src/test/ui/imports/issue-2937.rs
index 335df5c07e2..335df5c07e2 100644
--- a/src/test/ui/issues/issue-2937.rs
+++ b/src/test/ui/imports/issue-2937.rs
diff --git a/src/test/ui/issues/issue-2937.stderr b/src/test/ui/imports/issue-2937.stderr
index 428634828f9..428634828f9 100644
--- a/src/test/ui/issues/issue-2937.stderr
+++ b/src/test/ui/imports/issue-2937.stderr
diff --git a/src/test/ui/issues/issue-30560.rs b/src/test/ui/imports/issue-30560.rs
index d8d4ca608f1..d8d4ca608f1 100644
--- a/src/test/ui/issues/issue-30560.rs
+++ b/src/test/ui/imports/issue-30560.rs
diff --git a/src/test/ui/issues/issue-30560.stderr b/src/test/ui/imports/issue-30560.stderr
index b74134aaccc..b74134aaccc 100644
--- a/src/test/ui/issues/issue-30560.stderr
+++ b/src/test/ui/imports/issue-30560.stderr
diff --git a/src/test/ui/issues/issue-31212.rs b/src/test/ui/imports/issue-31212.rs
index 556f0d18f9f..556f0d18f9f 100644
--- a/src/test/ui/issues/issue-31212.rs
+++ b/src/test/ui/imports/issue-31212.rs
diff --git a/src/test/ui/issues/issue-31212.stderr b/src/test/ui/imports/issue-31212.stderr
index 0bb56b361cb..0bb56b361cb 100644
--- a/src/test/ui/issues/issue-31212.stderr
+++ b/src/test/ui/imports/issue-31212.stderr
diff --git a/src/test/ui/issues/issue-32354-suggest-import-rename.fixed b/src/test/ui/imports/issue-32354-suggest-import-rename.fixed
index 27f1b8964e2..27f1b8964e2 100644
--- a/src/test/ui/issues/issue-32354-suggest-import-rename.fixed
+++ b/src/test/ui/imports/issue-32354-suggest-import-rename.fixed
diff --git a/src/test/ui/issues/issue-32354-suggest-import-rename.rs b/src/test/ui/imports/issue-32354-suggest-import-rename.rs
index 5a7f234d5fa..5a7f234d5fa 100644
--- a/src/test/ui/issues/issue-32354-suggest-import-rename.rs
+++ b/src/test/ui/imports/issue-32354-suggest-import-rename.rs
diff --git a/src/test/ui/issues/issue-32354-suggest-import-rename.stderr b/src/test/ui/imports/issue-32354-suggest-import-rename.stderr
index 96684309a00..96684309a00 100644
--- a/src/test/ui/issues/issue-32354-suggest-import-rename.stderr
+++ b/src/test/ui/imports/issue-32354-suggest-import-rename.stderr
diff --git a/src/test/ui/issues/issue-32833.rs b/src/test/ui/imports/issue-32833.rs
index 379eedde726..379eedde726 100644
--- a/src/test/ui/issues/issue-32833.rs
+++ b/src/test/ui/imports/issue-32833.rs
diff --git a/src/test/ui/issues/issue-32833.stderr b/src/test/ui/imports/issue-32833.stderr
index 430cc0fda26..430cc0fda26 100644
--- a/src/test/ui/issues/issue-32833.stderr
+++ b/src/test/ui/imports/issue-32833.stderr
diff --git a/src/test/ui/issues/issue-33464.rs b/src/test/ui/imports/issue-33464.rs
index a0edb5fdb6f..a0edb5fdb6f 100644
--- a/src/test/ui/issues/issue-33464.rs
+++ b/src/test/ui/imports/issue-33464.rs
diff --git a/src/test/ui/issues/issue-33464.stderr b/src/test/ui/imports/issue-33464.stderr
index d3bf404c99a..d3bf404c99a 100644
--- a/src/test/ui/issues/issue-33464.stderr
+++ b/src/test/ui/imports/issue-33464.stderr
diff --git a/src/test/ui/issues/issue-36881.rs b/src/test/ui/imports/issue-36881.rs
index 04313872d27..04313872d27 100644
--- a/src/test/ui/issues/issue-36881.rs
+++ b/src/test/ui/imports/issue-36881.rs
diff --git a/src/test/ui/issues/issue-36881.stderr b/src/test/ui/imports/issue-36881.stderr
index caf9d5d6d62..caf9d5d6d62 100644
--- a/src/test/ui/issues/issue-36881.stderr
+++ b/src/test/ui/imports/issue-36881.stderr
diff --git a/src/test/ui/issues/issue-37887.rs b/src/test/ui/imports/issue-37887.rs
index 58f0c6b651a..58f0c6b651a 100644
--- a/src/test/ui/issues/issue-37887.rs
+++ b/src/test/ui/imports/issue-37887.rs
diff --git a/src/test/ui/issues/issue-37887.stderr b/src/test/ui/imports/issue-37887.stderr
index 944d544098a..944d544098a 100644
--- a/src/test/ui/issues/issue-37887.stderr
+++ b/src/test/ui/imports/issue-37887.stderr
diff --git a/src/test/ui/issues/issue-38293.rs b/src/test/ui/imports/issue-38293.rs
index 3b1393600ba..3b1393600ba 100644
--- a/src/test/ui/issues/issue-38293.rs
+++ b/src/test/ui/imports/issue-38293.rs
diff --git a/src/test/ui/issues/issue-38293.stderr b/src/test/ui/imports/issue-38293.stderr
index d2450ab1250..d2450ab1250 100644
--- a/src/test/ui/issues/issue-38293.stderr
+++ b/src/test/ui/imports/issue-38293.stderr
diff --git a/src/test/ui/issues/issue-4366-2.rs b/src/test/ui/imports/issue-4366-2.rs
index c777b750252..c777b750252 100644
--- a/src/test/ui/issues/issue-4366-2.rs
+++ b/src/test/ui/imports/issue-4366-2.rs
diff --git a/src/test/ui/issues/issue-4366-2.stderr b/src/test/ui/imports/issue-4366-2.stderr
index a86ec7fabea..a86ec7fabea 100644
--- a/src/test/ui/issues/issue-4366-2.stderr
+++ b/src/test/ui/imports/issue-4366-2.stderr
diff --git a/src/test/ui/issues/issue-4366.rs b/src/test/ui/imports/issue-4366.rs
index 9ec2e58ecad..9ec2e58ecad 100644
--- a/src/test/ui/issues/issue-4366.rs
+++ b/src/test/ui/imports/issue-4366.rs
diff --git a/src/test/ui/issues/issue-4366.stderr b/src/test/ui/imports/issue-4366.stderr
index 469ea93e904..469ea93e904 100644
--- a/src/test/ui/issues/issue-4366.stderr
+++ b/src/test/ui/imports/issue-4366.stderr
diff --git a/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed b/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed
index b463848ae94..b463848ae94 100644
--- a/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed
+++ b/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed
diff --git a/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs b/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs
index 1b491ac7efe..1b491ac7efe 100644
--- a/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs
+++ b/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs
diff --git a/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr b/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr
index 25aca4cb7ec..25aca4cb7ec 100644
--- a/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr
+++ b/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr
diff --git a/src/test/ui/issues/issue-45829/auxiliary/issue-45829-a.rs b/src/test/ui/imports/issue-45829/auxiliary/issue-45829-a.rs
index e9f7fefb6fb..e9f7fefb6fb 100644
--- a/src/test/ui/issues/issue-45829/auxiliary/issue-45829-a.rs
+++ b/src/test/ui/imports/issue-45829/auxiliary/issue-45829-a.rs
diff --git a/src/test/ui/issues/issue-45829/auxiliary/issue-45829-b.rs b/src/test/ui/imports/issue-45829/auxiliary/issue-45829-b.rs
index e9f7fefb6fb..e9f7fefb6fb 100644
--- a/src/test/ui/issues/issue-45829/auxiliary/issue-45829-b.rs
+++ b/src/test/ui/imports/issue-45829/auxiliary/issue-45829-b.rs
diff --git a/src/test/ui/issues/issue-45829/import-self.rs b/src/test/ui/imports/issue-45829/import-self.rs
index 2dc4331ced7..2dc4331ced7 100644
--- a/src/test/ui/issues/issue-45829/import-self.rs
+++ b/src/test/ui/imports/issue-45829/import-self.rs
diff --git a/src/test/ui/issues/issue-45829/import-self.stderr b/src/test/ui/imports/issue-45829/import-self.stderr
index 158e81cdd96..158e81cdd96 100644
--- a/src/test/ui/issues/issue-45829/import-self.stderr
+++ b/src/test/ui/imports/issue-45829/import-self.stderr
diff --git a/src/test/ui/issues/issue-45829/import-twice.rs b/src/test/ui/imports/issue-45829/import-twice.rs
index e5a8bb7adf6..e5a8bb7adf6 100644
--- a/src/test/ui/issues/issue-45829/import-twice.rs
+++ b/src/test/ui/imports/issue-45829/import-twice.rs
diff --git a/src/test/ui/issues/issue-45829/import-twice.stderr b/src/test/ui/imports/issue-45829/import-twice.stderr
index 656b011bc3b..656b011bc3b 100644
--- a/src/test/ui/issues/issue-45829/import-twice.stderr
+++ b/src/test/ui/imports/issue-45829/import-twice.stderr
diff --git a/src/test/ui/issues/issue-45829/issue-45829.rs b/src/test/ui/imports/issue-45829/issue-45829.rs
index 1e76e4b140e..1e76e4b140e 100644
--- a/src/test/ui/issues/issue-45829/issue-45829.rs
+++ b/src/test/ui/imports/issue-45829/issue-45829.rs
diff --git a/src/test/ui/issues/issue-45829/issue-45829.stderr b/src/test/ui/imports/issue-45829/issue-45829.stderr
index a7ebc7171bc..a7ebc7171bc 100644
--- a/src/test/ui/issues/issue-45829/issue-45829.stderr
+++ b/src/test/ui/imports/issue-45829/issue-45829.stderr
diff --git a/src/test/ui/issues/issue-45829/rename-extern-vs-use.rs b/src/test/ui/imports/issue-45829/rename-extern-vs-use.rs
index aef7aa35cf5..aef7aa35cf5 100644
--- a/src/test/ui/issues/issue-45829/rename-extern-vs-use.rs
+++ b/src/test/ui/imports/issue-45829/rename-extern-vs-use.rs
diff --git a/src/test/ui/issues/issue-45829/rename-extern-vs-use.stderr b/src/test/ui/imports/issue-45829/rename-extern-vs-use.stderr
index 98fd8a623fe..98fd8a623fe 100644
--- a/src/test/ui/issues/issue-45829/rename-extern-vs-use.stderr
+++ b/src/test/ui/imports/issue-45829/rename-extern-vs-use.stderr
diff --git a/src/test/ui/issues/issue-45829/rename-extern-with-tab.rs b/src/test/ui/imports/issue-45829/rename-extern-with-tab.rs
index 0da8b826c90..0da8b826c90 100644
--- a/src/test/ui/issues/issue-45829/rename-extern-with-tab.rs
+++ b/src/test/ui/imports/issue-45829/rename-extern-with-tab.rs
diff --git a/src/test/ui/issues/issue-45829/rename-extern-with-tab.stderr b/src/test/ui/imports/issue-45829/rename-extern-with-tab.stderr
index 2c4e8ce996b..2c4e8ce996b 100644
--- a/src/test/ui/issues/issue-45829/rename-extern-with-tab.stderr
+++ b/src/test/ui/imports/issue-45829/rename-extern-with-tab.stderr
diff --git a/src/test/ui/issues/issue-45829/rename-extern.rs b/src/test/ui/imports/issue-45829/rename-extern.rs
index 7dbda69322e..7dbda69322e 100644
--- a/src/test/ui/issues/issue-45829/rename-extern.rs
+++ b/src/test/ui/imports/issue-45829/rename-extern.rs
diff --git a/src/test/ui/issues/issue-45829/rename-extern.stderr b/src/test/ui/imports/issue-45829/rename-extern.stderr
index 209ae2201f9..209ae2201f9 100644
--- a/src/test/ui/issues/issue-45829/rename-extern.stderr
+++ b/src/test/ui/imports/issue-45829/rename-extern.stderr
diff --git a/src/test/ui/issues/issue-45829/rename-use-vs-extern.rs b/src/test/ui/imports/issue-45829/rename-use-vs-extern.rs
index 0cf3a77fd7c..0cf3a77fd7c 100644
--- a/src/test/ui/issues/issue-45829/rename-use-vs-extern.rs
+++ b/src/test/ui/imports/issue-45829/rename-use-vs-extern.rs
diff --git a/src/test/ui/issues/issue-45829/rename-use-vs-extern.stderr b/src/test/ui/imports/issue-45829/rename-use-vs-extern.stderr
index 6b917d55747..6b917d55747 100644
--- a/src/test/ui/issues/issue-45829/rename-use-vs-extern.stderr
+++ b/src/test/ui/imports/issue-45829/rename-use-vs-extern.stderr
diff --git a/src/test/ui/issues/issue-45829/rename-use-with-tabs.rs b/src/test/ui/imports/issue-45829/rename-use-with-tabs.rs
index 86c5fa00fdb..86c5fa00fdb 100644
--- a/src/test/ui/issues/issue-45829/rename-use-with-tabs.rs
+++ b/src/test/ui/imports/issue-45829/rename-use-with-tabs.rs
diff --git a/src/test/ui/issues/issue-45829/rename-use-with-tabs.stderr b/src/test/ui/imports/issue-45829/rename-use-with-tabs.stderr
index 3baad6cd72f..3baad6cd72f 100644
--- a/src/test/ui/issues/issue-45829/rename-use-with-tabs.stderr
+++ b/src/test/ui/imports/issue-45829/rename-use-with-tabs.stderr
diff --git a/src/test/ui/issues/issue-45829/rename-with-path.rs b/src/test/ui/imports/issue-45829/rename-with-path.rs
index e278a878937..e278a878937 100644
--- a/src/test/ui/issues/issue-45829/rename-with-path.rs
+++ b/src/test/ui/imports/issue-45829/rename-with-path.rs
diff --git a/src/test/ui/issues/issue-45829/rename-with-path.stderr b/src/test/ui/imports/issue-45829/rename-with-path.stderr
index ba83eeaa813..ba83eeaa813 100644
--- a/src/test/ui/issues/issue-45829/rename-with-path.stderr
+++ b/src/test/ui/imports/issue-45829/rename-with-path.stderr
diff --git a/src/test/ui/issues/issue-45829/rename.rs b/src/test/ui/imports/issue-45829/rename.rs
index 1c45956c66a..1c45956c66a 100644
--- a/src/test/ui/issues/issue-45829/rename.rs
+++ b/src/test/ui/imports/issue-45829/rename.rs
diff --git a/src/test/ui/issues/issue-45829/rename.stderr b/src/test/ui/imports/issue-45829/rename.stderr
index 8f12d92d6fb..8f12d92d6fb 100644
--- a/src/test/ui/issues/issue-45829/rename.stderr
+++ b/src/test/ui/imports/issue-45829/rename.stderr
diff --git a/src/test/ui/issues/issue-47623.rs b/src/test/ui/imports/issue-47623.rs
index ad8aa4c1a2b..ad8aa4c1a2b 100644
--- a/src/test/ui/issues/issue-47623.rs
+++ b/src/test/ui/imports/issue-47623.rs
diff --git a/src/test/ui/issues/issue-47623.stderr b/src/test/ui/imports/issue-47623.stderr
index 53968a2960c..53968a2960c 100644
--- a/src/test/ui/issues/issue-47623.stderr
+++ b/src/test/ui/imports/issue-47623.stderr
diff --git a/src/test/ui/issues/issue-4865-1.rs b/src/test/ui/imports/issue-4865-1.rs
index 68fbee37d01..68fbee37d01 100644
--- a/src/test/ui/issues/issue-4865-1.rs
+++ b/src/test/ui/imports/issue-4865-1.rs
diff --git a/src/test/ui/issues/issue-4865-2.rs b/src/test/ui/imports/issue-4865-2.rs
index cbe1d0d32c6..cbe1d0d32c6 100644
--- a/src/test/ui/issues/issue-4865-2.rs
+++ b/src/test/ui/imports/issue-4865-2.rs
diff --git a/src/test/ui/issues/issue-4865-3.rs b/src/test/ui/imports/issue-4865-3.rs
index 12f9bba18d8..12f9bba18d8 100644
--- a/src/test/ui/issues/issue-4865-3.rs
+++ b/src/test/ui/imports/issue-4865-3.rs
diff --git a/src/test/ui/issues/issue-52891.fixed b/src/test/ui/imports/issue-52891.fixed
index e694b5c9b15..e694b5c9b15 100644
--- a/src/test/ui/issues/issue-52891.fixed
+++ b/src/test/ui/imports/issue-52891.fixed
diff --git a/src/test/ui/issues/issue-52891.rs b/src/test/ui/imports/issue-52891.rs
index cd4b40629ab..cd4b40629ab 100644
--- a/src/test/ui/issues/issue-52891.rs
+++ b/src/test/ui/imports/issue-52891.rs
diff --git a/src/test/ui/issues/issue-52891.stderr b/src/test/ui/imports/issue-52891.stderr
index 6e6e42ddc2d..6e6e42ddc2d 100644
--- a/src/test/ui/issues/issue-52891.stderr
+++ b/src/test/ui/imports/issue-52891.stderr
diff --git a/src/test/ui/issues/issue-53565.rs b/src/test/ui/imports/issue-53565.rs
index 114a53a92ca..114a53a92ca 100644
--- a/src/test/ui/issues/issue-53565.rs
+++ b/src/test/ui/imports/issue-53565.rs
diff --git a/src/test/ui/issues/issue-53565.stderr b/src/test/ui/imports/issue-53565.stderr
index 71c3b2aaaf2..71c3b2aaaf2 100644
--- a/src/test/ui/issues/issue-53565.stderr
+++ b/src/test/ui/imports/issue-53565.stderr
diff --git a/src/test/ui/issues/issue-59764.rs b/src/test/ui/imports/issue-59764.rs
index 09dee8c2732..09dee8c2732 100644
--- a/src/test/ui/issues/issue-59764.rs
+++ b/src/test/ui/imports/issue-59764.rs
diff --git a/src/test/ui/issues/issue-59764.stderr b/src/test/ui/imports/issue-59764.stderr
index f266e908ecc..f266e908ecc 100644
--- a/src/test/ui/issues/issue-59764.stderr
+++ b/src/test/ui/imports/issue-59764.stderr
diff --git a/src/test/ui/issues/issue-8208.rs b/src/test/ui/imports/issue-8208.rs
index 1c566938f9d..1c566938f9d 100644
--- a/src/test/ui/issues/issue-8208.rs
+++ b/src/test/ui/imports/issue-8208.rs
diff --git a/src/test/ui/issues/issue-8208.stderr b/src/test/ui/imports/issue-8208.stderr
index e59aea12cda..e59aea12cda 100644
--- a/src/test/ui/issues/issue-8208.stderr
+++ b/src/test/ui/imports/issue-8208.stderr
diff --git a/src/test/ui/issues/issue-8640.rs b/src/test/ui/imports/issue-8640.rs
index 51a02a32ec8..51a02a32ec8 100644
--- a/src/test/ui/issues/issue-8640.rs
+++ b/src/test/ui/imports/issue-8640.rs
diff --git a/src/test/ui/issues/issue-8640.stderr b/src/test/ui/imports/issue-8640.stderr
index 4ce63945464..4ce63945464 100644
--- a/src/test/ui/issues/issue-8640.stderr
+++ b/src/test/ui/imports/issue-8640.stderr
diff --git a/src/test/ui/resolve_self_super_hint.rs b/src/test/ui/imports/resolve_self_super_hint.rs
index a14ec5b7290..a14ec5b7290 100644
--- a/src/test/ui/resolve_self_super_hint.rs
+++ b/src/test/ui/imports/resolve_self_super_hint.rs
diff --git a/src/test/ui/resolve_self_super_hint.stderr b/src/test/ui/imports/resolve_self_super_hint.stderr
index bc862553b5b..bc862553b5b 100644
--- a/src/test/ui/resolve_self_super_hint.stderr
+++ b/src/test/ui/imports/resolve_self_super_hint.stderr
diff --git a/src/test/ui/issues/issue-56411-aux.rs b/src/test/ui/modules/issue-56411-aux.rs
index c8e5a059810..c8e5a059810 100644
--- a/src/test/ui/issues/issue-56411-aux.rs
+++ b/src/test/ui/modules/issue-56411-aux.rs
diff --git a/src/test/ui/issues/issue-56411.rs b/src/test/ui/modules/issue-56411.rs
index 163651a7ef6..163651a7ef6 100644
--- a/src/test/ui/issues/issue-56411.rs
+++ b/src/test/ui/modules/issue-56411.rs
diff --git a/src/test/ui/issues/issue-56411.stderr b/src/test/ui/modules/issue-56411.stderr
index 3ac8dc548ae..3ac8dc548ae 100644
--- a/src/test/ui/issues/issue-56411.stderr
+++ b/src/test/ui/modules/issue-56411.stderr
diff --git a/src/test/ui/auxiliary/extern-prelude-vec.rs b/src/test/ui/resolve/auxiliary/extern-prelude-vec.rs
index a643c888910..a643c888910 100644
--- a/src/test/ui/auxiliary/extern-prelude-vec.rs
+++ b/src/test/ui/resolve/auxiliary/extern-prelude-vec.rs
diff --git a/src/test/ui/auxiliary/extern-prelude.rs b/src/test/ui/resolve/auxiliary/extern-prelude.rs
index 2fdfd85a1da..2fdfd85a1da 100644
--- a/src/test/ui/auxiliary/extern-prelude.rs
+++ b/src/test/ui/resolve/auxiliary/extern-prelude.rs
diff --git a/src/test/ui/extern-prelude-fail.rs b/src/test/ui/resolve/extern-prelude-fail.rs
index 7d387025ad4..7d387025ad4 100644
--- a/src/test/ui/extern-prelude-fail.rs
+++ b/src/test/ui/resolve/extern-prelude-fail.rs
diff --git a/src/test/ui/extern-prelude-fail.stderr b/src/test/ui/resolve/extern-prelude-fail.stderr
index a59f4c952bb..a59f4c952bb 100644
--- a/src/test/ui/extern-prelude-fail.stderr
+++ b/src/test/ui/resolve/extern-prelude-fail.stderr
diff --git a/src/test/ui/extern-prelude.rs b/src/test/ui/resolve/extern-prelude.rs
index 50fed6034aa..50fed6034aa 100644
--- a/src/test/ui/extern-prelude.rs
+++ b/src/test/ui/resolve/extern-prelude.rs
diff --git a/src/test/ui/issues/issue-49074.rs b/src/test/ui/resolve/issue-49074.rs
index 752bb345b70..752bb345b70 100644
--- a/src/test/ui/issues/issue-49074.rs
+++ b/src/test/ui/resolve/issue-49074.rs
diff --git a/src/test/ui/issues/issue-49074.stderr b/src/test/ui/resolve/issue-49074.stderr
index bbfeb4ea948..bbfeb4ea948 100644
--- a/src/test/ui/issues/issue-49074.stderr
+++ b/src/test/ui/resolve/issue-49074.stderr
diff --git a/src/test/ui/resolve-pseudo-shadowing.rs b/src/test/ui/resolve/resolve-pseudo-shadowing.rs
index 85c684ca032..85c684ca032 100644
--- a/src/test/ui/resolve-pseudo-shadowing.rs
+++ b/src/test/ui/resolve/resolve-pseudo-shadowing.rs
diff --git a/src/test/ui/issues/auxiliary/lint-stability.rs b/src/test/ui/stability-attribute/auxiliary/lint-stability.rs
index de4058887cf..de4058887cf 100644
--- a/src/test/ui/issues/auxiliary/lint-stability.rs
+++ b/src/test/ui/stability-attribute/auxiliary/lint-stability.rs
diff --git a/src/test/ui/issues/issue-28075.rs b/src/test/ui/stability-attribute/issue-28075.rs
index 6b4ea46f361..6b4ea46f361 100644
--- a/src/test/ui/issues/issue-28075.rs
+++ b/src/test/ui/stability-attribute/issue-28075.rs
diff --git a/src/test/ui/issues/issue-28075.stderr b/src/test/ui/stability-attribute/issue-28075.stderr
index 7e53bb54457..7e53bb54457 100644
--- a/src/test/ui/issues/issue-28075.stderr
+++ b/src/test/ui/stability-attribute/issue-28075.stderr
diff --git a/src/test/ui/issues/issue-28388-3.rs b/src/test/ui/stability-attribute/issue-28388-3.rs
index 7ba99350121..7ba99350121 100644
--- a/src/test/ui/issues/issue-28388-3.rs
+++ b/src/test/ui/stability-attribute/issue-28388-3.rs
diff --git a/src/test/ui/issues/issue-28388-3.stderr b/src/test/ui/stability-attribute/issue-28388-3.stderr
index d2e46683b90..d2e46683b90 100644
--- a/src/test/ui/issues/issue-28388-3.stderr
+++ b/src/test/ui/stability-attribute/issue-28388-3.stderr
diff --git a/src/test/ui/issues/issue-30730.rs b/src/test/ui/unused/issue-30730.rs
index d6be90c8148..d6be90c8148 100644
--- a/src/test/ui/issues/issue-30730.rs
+++ b/src/test/ui/unused/issue-30730.rs
diff --git a/src/test/ui/issues/issue-30730.stderr b/src/test/ui/unused/issue-30730.stderr
index b299e99a3a9..b299e99a3a9 100644
--- a/src/test/ui/issues/issue-30730.stderr
+++ b/src/test/ui/unused/issue-30730.stderr
diff --git a/src/test/ui/issues/issue-46576.rs b/src/test/ui/unused/issue-46576.rs
index 15f458f3844..15f458f3844 100644
--- a/src/test/ui/issues/issue-46576.rs
+++ b/src/test/ui/unused/issue-46576.rs
diff --git a/src/test/ui/issues/issue-46576.stderr b/src/test/ui/unused/issue-46576.stderr
index 6f4d97068b3..6f4d97068b3 100644
--- a/src/test/ui/issues/issue-46576.stderr
+++ b/src/test/ui/unused/issue-46576.stderr
diff --git a/src/test/ui/issues/issue-59896.rs b/src/test/ui/unused/issue-59896.rs
index ff9f19acf84..ff9f19acf84 100644
--- a/src/test/ui/issues/issue-59896.rs
+++ b/src/test/ui/unused/issue-59896.rs
diff --git a/src/test/ui/issues/issue-59896.stderr b/src/test/ui/unused/issue-59896.stderr
index 95b7938ae03..95b7938ae03 100644
--- a/src/test/ui/issues/issue-59896.stderr
+++ b/src/test/ui/unused/issue-59896.stderr
diff --git a/src/test/ui/issues/issue-70041.rs b/src/test/ui/unused/issue-70041.rs
index 22e42295eed..22e42295eed 100644
--- a/src/test/ui/issues/issue-70041.rs
+++ b/src/test/ui/unused/issue-70041.rs
diff --git a/src/test/ui/issues/issue-70041.stderr b/src/test/ui/unused/issue-70041.stderr
index ecd618eae8b..ecd618eae8b 100644
--- a/src/test/ui/issues/issue-70041.stderr
+++ b/src/test/ui/unused/issue-70041.stderr