diff --git a/src/test/ui/issues/issue-36617.rs b/src/test/ui/derives/issue-36617.rs
similarity index 100%
rename from src/test/ui/issues/issue-36617.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-36617.stderr
rename to 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 3ca04f934934c..0000000000000
--- 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 3e288b72ec63d..0000000000000
--- 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 2af113c05e012..0000000000000
--- 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 73f89b5856da5..0000000000000
--- 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 3170dd2fae108..0000000000000
--- 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 036d6bc07e281..0000000000000
--- 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 2c6ac9a00e109..0000000000000
--- 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 ba3b7fbf53559..0000000000000
--- 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
similarity index 100%
rename from src/test/ui/issues/auxiliary/issue-36881-aux.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/auxiliary/issue-52891.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/auxiliary/issue-59764.rs
rename to 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
similarity index 100%
rename from src/test/ui/double-import.rs
rename to src/test/ui/imports/double-import.rs
diff --git a/src/test/ui/double-import.stderr b/src/test/ui/imports/double-import.stderr
similarity index 100%
rename from src/test/ui/double-import.stderr
rename to 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
similarity index 100%
rename from src/test/ui/export-glob-imports-target.rs
rename to 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
similarity index 100%
rename from src/test/ui/glob-resolve1.rs
rename to src/test/ui/imports/glob-resolve1.rs
diff --git a/src/test/ui/glob-resolve1.stderr b/src/test/ui/imports/glob-resolve1.stderr
similarity index 100%
rename from src/test/ui/glob-resolve1.stderr
rename to 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 0000000000000..de8bf62611416
--- /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 de8bf62611416..3170dd2fae108 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
similarity index 100%
rename from src/test/ui/import.stderr
rename to 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 0000000000000..7b70f799ebf93
--- /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 7b70f799ebf93..036d6bc07e281 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
similarity index 100%
rename from src/test/ui/import2.stderr
rename to 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 0000000000000..17797aed3591d
--- /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 17797aed3591d..2c6ac9a00e109 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
similarity index 100%
rename from src/test/ui/import3.stderr
rename to 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 0000000000000..4fda5386112c0
--- /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 4fda5386112c0..ba3b7fbf53559 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
similarity index 100%
rename from src/test/ui/import4.stderr
rename to src/test/ui/imports/import4.stderr
diff --git a/src/test/ui/issues/issue-13404.rs b/src/test/ui/imports/issue-13404.rs
similarity index 100%
rename from src/test/ui/issues/issue-13404.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-13404.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-1697.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-1697.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-18083.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-19498.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-19498.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-24081.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-24081.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-25396.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-25396.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-26886.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-26886.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-28134.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-28134.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-28388-1.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-28388-1.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-28388-2.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-28388-2.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-2937.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-2937.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-30560.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-30560.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-31212.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-31212.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-32354-suggest-import-rename.fixed
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-32354-suggest-import-rename.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-32354-suggest-import-rename.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-32833.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-32833.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-33464.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-33464.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-36881.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-36881.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-37887.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-37887.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-38293.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-38293.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-4366-2.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-4366-2.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-4366.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-4366.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/auxiliary/issue-45829-a.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/auxiliary/issue-45829-b.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/import-self.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/import-self.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/import-twice.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/import-twice.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/issue-45829.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/issue-45829.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/rename-extern-vs-use.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/rename-extern-vs-use.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/rename-extern-with-tab.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/rename-extern-with-tab.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/rename-extern.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/rename-extern.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/rename-use-vs-extern.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/rename-use-vs-extern.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/rename-use-with-tabs.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/rename-use-with-tabs.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/rename-with-path.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/rename-with-path.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/rename.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-45829/rename.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-47623.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-47623.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-4865-1.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-4865-2.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-4865-3.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-52891.fixed
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-52891.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-52891.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-53565.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-53565.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-59764.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-59764.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-8208.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-8208.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-8640.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-8640.stderr
rename to 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
similarity index 100%
rename from src/test/ui/resolve_self_super_hint.rs
rename to 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
similarity index 100%
rename from src/test/ui/resolve_self_super_hint.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-56411-aux.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-56411.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-56411.stderr
rename to 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
similarity index 100%
rename from src/test/ui/auxiliary/extern-prelude-vec.rs
rename to 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
similarity index 100%
rename from src/test/ui/auxiliary/extern-prelude.rs
rename to 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
similarity index 100%
rename from src/test/ui/extern-prelude-fail.rs
rename to 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
similarity index 100%
rename from src/test/ui/extern-prelude-fail.stderr
rename to 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
similarity index 100%
rename from src/test/ui/extern-prelude.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-49074.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-49074.stderr
rename to 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
similarity index 100%
rename from src/test/ui/resolve-pseudo-shadowing.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/auxiliary/lint-stability.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-28075.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-28075.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-28388-3.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-28388-3.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-30730.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-30730.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-46576.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-46576.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-59896.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-59896.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-70041.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-70041.stderr
rename to src/test/ui/unused/issue-70041.stderr