diff --git a/src/test/ui/argument-passing.rs b/src/test/ui/argument-passing.rs
deleted file mode 100644
index 74759a4a6bdff..0000000000000
--- a/src/test/ui/argument-passing.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// run-pass
-
-struct X {
-    x: isize
-}
-
-fn f1(a: &mut X, b: &mut isize, c: isize) -> isize {
-    let r = a.x + *b + c;
-    a.x = 0;
-    *b = 10;
-    return r;
-}
-
-fn f2<F>(a: isize, f: F) -> isize where F: FnOnce(isize) { f(1); return a; }
-
-pub fn main() {
-    let mut a = X {x: 1};
-    let mut b = 2;
-    let c = 3;
-    assert_eq!(f1(&mut a, &mut b, c), 6);
-    assert_eq!(a.x, 0);
-    assert_eq!(b, 10);
-    assert_eq!(f2(a.x, |_| a.x = 50), 0);
-    assert_eq!(a.x, 50);
-}
diff --git a/src/test/ui/mut-vstore-expr.rs b/src/test/ui/array-slice-vec/mut-vstore-expr.rs
similarity index 100%
rename from src/test/ui/mut-vstore-expr.rs
rename to src/test/ui/array-slice-vec/mut-vstore-expr.rs
diff --git a/src/test/ui/issues/issue-22066.rs b/src/test/ui/associated-types/issue-22066.rs
similarity index 100%
rename from src/test/ui/issues/issue-22066.rs
rename to src/test/ui/associated-types/issue-22066.rs
diff --git a/src/test/ui/issues/issue-22828.rs b/src/test/ui/associated-types/issue-22828.rs
similarity index 100%
rename from src/test/ui/issues/issue-22828.rs
rename to src/test/ui/associated-types/issue-22828.rs
diff --git a/src/test/ui/issues/issue-28871.rs b/src/test/ui/associated-types/issue-28871.rs
similarity index 100%
rename from src/test/ui/issues/issue-28871.rs
rename to src/test/ui/associated-types/issue-28871.rs
diff --git a/src/test/ui/issues/issue-47139-1.rs b/src/test/ui/associated-types/issue-47139-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-47139-1.rs
rename to src/test/ui/associated-types/issue-47139-1.rs
diff --git a/src/test/ui/issues/issue-54467.rs b/src/test/ui/associated-types/issue-54467.rs
similarity index 100%
rename from src/test/ui/issues/issue-54467.rs
rename to src/test/ui/associated-types/issue-54467.rs
diff --git a/src/test/ui/issues/issue-73541-1.rs b/src/test/ui/async-await/issue-73541-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-73541-1.rs
rename to src/test/ui/async-await/issue-73541-1.rs
diff --git a/src/test/ui/issues/issue-73541-1.stderr b/src/test/ui/async-await/issue-73541-1.stderr
similarity index 100%
rename from src/test/ui/issues/issue-73541-1.stderr
rename to src/test/ui/async-await/issue-73541-1.stderr
diff --git a/src/test/ui/issues/issue-40962.rs b/src/test/ui/attributes/issue-40962.rs
similarity index 100%
rename from src/test/ui/issues/issue-40962.rs
rename to src/test/ui/attributes/issue-40962.rs
diff --git a/src/test/ui/unrestricted-attribute-tokens.rs b/src/test/ui/attributes/unrestricted-attribute-tokens.rs
similarity index 100%
rename from src/test/ui/unrestricted-attribute-tokens.rs
rename to src/test/ui/attributes/unrestricted-attribute-tokens.rs
diff --git a/src/test/ui/structured-compare.rs b/src/test/ui/binop/structured-compare.rs
similarity index 100%
rename from src/test/ui/structured-compare.rs
rename to src/test/ui/binop/structured-compare.rs
diff --git a/src/test/ui/issues/issue-46095.rs b/src/test/ui/borrowck/issue-46095.rs
similarity index 100%
rename from src/test/ui/issues/issue-46095.rs
rename to src/test/ui/borrowck/issue-46095.rs
diff --git a/src/test/ui/new-box.rs b/src/test/ui/box/new-box.rs
similarity index 100%
rename from src/test/ui/new-box.rs
rename to src/test/ui/box/new-box.rs
diff --git a/src/test/ui/issues/issue-32201.rs b/src/test/ui/c-variadic/issue-32201.rs
similarity index 100%
rename from src/test/ui/issues/issue-32201.rs
rename to src/test/ui/c-variadic/issue-32201.rs
diff --git a/src/test/ui/issues/issue-32201.stderr b/src/test/ui/c-variadic/issue-32201.stderr
similarity index 100%
rename from src/test/ui/issues/issue-32201.stderr
rename to src/test/ui/c-variadic/issue-32201.stderr
diff --git a/src/test/ui/supported-cast.rs b/src/test/ui/cast/supported-cast.rs
similarity index 100%
rename from src/test/ui/supported-cast.rs
rename to src/test/ui/cast/supported-cast.rs
diff --git a/src/test/ui/issues/issue-10398.rs b/src/test/ui/closures/issue-10398.rs
similarity index 100%
rename from src/test/ui/issues/issue-10398.rs
rename to src/test/ui/closures/issue-10398.rs
diff --git a/src/test/ui/issues/issue-10398.stderr b/src/test/ui/closures/issue-10398.stderr
similarity index 100%
rename from src/test/ui/issues/issue-10398.stderr
rename to src/test/ui/closures/issue-10398.stderr
diff --git a/src/test/ui/issues/issue-42463.rs b/src/test/ui/closures/issue-42463.rs
similarity index 100%
rename from src/test/ui/issues/issue-42463.rs
rename to src/test/ui/closures/issue-42463.rs
diff --git a/src/test/ui/issues/auxiliary/issue-39823.rs b/src/test/ui/coercion/auxiliary/issue-39823.rs
similarity index 100%
rename from src/test/ui/issues/auxiliary/issue-39823.rs
rename to src/test/ui/coercion/auxiliary/issue-39823.rs
diff --git a/src/test/ui/issues/issue-14589.rs b/src/test/ui/coercion/issue-14589.rs
similarity index 100%
rename from src/test/ui/issues/issue-14589.rs
rename to src/test/ui/coercion/issue-14589.rs
diff --git a/src/test/ui/issues/issue-39823.rs b/src/test/ui/coercion/issue-39823.rs
similarity index 100%
rename from src/test/ui/issues/issue-39823.rs
rename to src/test/ui/coercion/issue-39823.rs
diff --git a/src/test/ui/issues/issue-73886.rs b/src/test/ui/coercion/issue-73886.rs
similarity index 100%
rename from src/test/ui/issues/issue-73886.rs
rename to src/test/ui/coercion/issue-73886.rs
diff --git a/src/test/ui/issues/issue-73886.stderr b/src/test/ui/coercion/issue-73886.stderr
similarity index 100%
rename from src/test/ui/issues/issue-73886.stderr
rename to src/test/ui/coercion/issue-73886.stderr
diff --git a/src/test/ui/issues/issue-34028.rs b/src/test/ui/conditional-compilation/issue-34028.rs
similarity index 100%
rename from src/test/ui/issues/issue-34028.rs
rename to src/test/ui/conditional-compilation/issue-34028.rs
diff --git a/src/test/ui/auxiliary/legacy-const-generics.rs b/src/test/ui/const-generics/auxiliary/legacy-const-generics.rs
similarity index 100%
rename from src/test/ui/auxiliary/legacy-const-generics.rs
rename to src/test/ui/const-generics/auxiliary/legacy-const-generics.rs
diff --git a/src/test/ui/legacy-const-generics-bad.rs b/src/test/ui/const-generics/legacy-const-generics-bad.rs
similarity index 100%
rename from src/test/ui/legacy-const-generics-bad.rs
rename to src/test/ui/const-generics/legacy-const-generics-bad.rs
diff --git a/src/test/ui/legacy-const-generics-bad.stderr b/src/test/ui/const-generics/legacy-const-generics-bad.stderr
similarity index 100%
rename from src/test/ui/legacy-const-generics-bad.stderr
rename to src/test/ui/const-generics/legacy-const-generics-bad.stderr
diff --git a/src/test/ui/legacy-const-generics.rs b/src/test/ui/const-generics/legacy-const-generics.rs
similarity index 100%
rename from src/test/ui/legacy-const-generics.rs
rename to src/test/ui/const-generics/legacy-const-generics.rs
diff --git a/src/test/ui/issues/issue-13902.rs b/src/test/ui/consts/issue-13902.rs
similarity index 100%
rename from src/test/ui/issues/issue-13902.rs
rename to src/test/ui/consts/issue-13902.rs
diff --git a/src/test/ui/issues/issue-17074.rs b/src/test/ui/consts/issue-17074.rs
similarity index 100%
rename from src/test/ui/issues/issue-17074.rs
rename to src/test/ui/consts/issue-17074.rs
diff --git a/src/test/ui/issues/issue-18294.rs b/src/test/ui/consts/issue-18294.rs
similarity index 100%
rename from src/test/ui/issues/issue-18294.rs
rename to src/test/ui/consts/issue-18294.rs
diff --git a/src/test/ui/issues/issue-18294.stderr b/src/test/ui/consts/issue-18294.stderr
similarity index 100%
rename from src/test/ui/issues/issue-18294.stderr
rename to src/test/ui/consts/issue-18294.stderr
diff --git a/src/test/ui/issues/issue-23968-const-not-overflow.rs b/src/test/ui/consts/issue-23968-const-not-overflow.rs
similarity index 100%
rename from src/test/ui/issues/issue-23968-const-not-overflow.rs
rename to src/test/ui/consts/issue-23968-const-not-overflow.rs
diff --git a/src/test/ui/issues/issue-37550.rs b/src/test/ui/consts/issue-37550-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-37550.rs
rename to src/test/ui/consts/issue-37550-1.rs
diff --git a/src/test/ui/issues/issue-37550.stderr b/src/test/ui/consts/issue-37550-1.stderr
similarity index 92%
rename from src/test/ui/issues/issue-37550.stderr
rename to src/test/ui/consts/issue-37550-1.stderr
index 54b60df70fd26..f66d706787039 100644
--- a/src/test/ui/issues/issue-37550.stderr
+++ b/src/test/ui/consts/issue-37550-1.stderr
@@ -1,5 +1,5 @@
 error[E0658]: function pointers cannot appear in constant functions
-  --> $DIR/issue-37550.rs:3:9
+  --> $DIR/issue-37550-1.rs:3:9
    |
 LL |     let x = || t;
    |         ^
diff --git a/src/test/ui/issues/issue-37991.rs b/src/test/ui/consts/issue-37991.rs
similarity index 100%
rename from src/test/ui/issues/issue-37991.rs
rename to src/test/ui/consts/issue-37991.rs
diff --git a/src/test/ui/try-macro-suggestion.rs b/src/test/ui/deprecation/try-macro-suggestion.rs
similarity index 100%
rename from src/test/ui/try-macro-suggestion.rs
rename to src/test/ui/deprecation/try-macro-suggestion.rs
diff --git a/src/test/ui/try-macro-suggestion.stderr b/src/test/ui/deprecation/try-macro-suggestion.stderr
similarity index 100%
rename from src/test/ui/try-macro-suggestion.stderr
rename to src/test/ui/deprecation/try-macro-suggestion.stderr
diff --git a/src/test/ui/issues/issue-19358.rs b/src/test/ui/deriving/issue-19358.rs
similarity index 100%
rename from src/test/ui/issues/issue-19358.rs
rename to src/test/ui/deriving/issue-19358.rs
diff --git a/src/test/ui/issues/issue-58319.rs b/src/test/ui/deriving/issue-58319.rs
similarity index 100%
rename from src/test/ui/issues/issue-58319.rs
rename to src/test/ui/deriving/issue-58319.rs
diff --git a/src/test/ui/issues/issue-35546.rs b/src/test/ui/drop/issue-35546.rs
similarity index 100%
rename from src/test/ui/issues/issue-35546.rs
rename to src/test/ui/drop/issue-35546.rs
diff --git a/src/test/ui/terminate-in-initializer.rs b/src/test/ui/drop/terminate-in-initializer.rs
similarity index 100%
rename from src/test/ui/terminate-in-initializer.rs
rename to src/test/ui/drop/terminate-in-initializer.rs
diff --git a/src/test/ui/issues/issue-28498-ugeh-with-passed-to-fn.rs b/src/test/ui/dropck/issue-28498-ugeh-with-passed-to-fn.rs
similarity index 100%
rename from src/test/ui/issues/issue-28498-ugeh-with-passed-to-fn.rs
rename to src/test/ui/dropck/issue-28498-ugeh-with-passed-to-fn.rs
diff --git a/src/test/ui/epoch-gate-feature.rs b/src/test/ui/editions/epoch-gate-feature.rs
similarity index 100%
rename from src/test/ui/epoch-gate-feature.rs
rename to src/test/ui/editions/epoch-gate-feature.rs
diff --git a/src/test/ui/issues/issue-51582.rs b/src/test/ui/enum-discriminant/issue-51582.rs
similarity index 100%
rename from src/test/ui/issues/issue-51582.rs
rename to src/test/ui/enum-discriminant/issue-51582.rs
diff --git a/src/test/ui/issues/issue-42747.rs b/src/test/ui/enum/issue-42747.rs
similarity index 100%
rename from src/test/ui/issues/issue-42747.rs
rename to src/test/ui/enum/issue-42747.rs
diff --git a/src/test/ui/issues/issue-28324.mir.stderr b/src/test/ui/extern/issue-28324.mir.stderr
similarity index 100%
rename from src/test/ui/issues/issue-28324.mir.stderr
rename to src/test/ui/extern/issue-28324.mir.stderr
diff --git a/src/test/ui/issues/issue-28324.rs b/src/test/ui/extern/issue-28324.rs
similarity index 100%
rename from src/test/ui/issues/issue-28324.rs
rename to src/test/ui/extern/issue-28324.rs
diff --git a/src/test/ui/issues/issue-28324.thir.stderr b/src/test/ui/extern/issue-28324.thir.stderr
similarity index 100%
rename from src/test/ui/issues/issue-28324.thir.stderr
rename to src/test/ui/extern/issue-28324.thir.stderr
diff --git a/src/test/ui/issues/issue-51345.rs b/src/test/ui/for-loop-while/issue-51345.rs
similarity index 100%
rename from src/test/ui/issues/issue-51345.rs
rename to src/test/ui/for-loop-while/issue-51345.rs
diff --git a/src/test/ui/long-while.rs b/src/test/ui/for-loop-while/long-while.rs
similarity index 100%
rename from src/test/ui/long-while.rs
rename to src/test/ui/for-loop-while/long-while.rs
diff --git a/src/test/ui/nil-decl-in-foreign.rs b/src/test/ui/foreign/nil-decl-in-foreign.rs
similarity index 100%
rename from src/test/ui/nil-decl-in-foreign.rs
rename to src/test/ui/foreign/nil-decl-in-foreign.rs
diff --git a/src/test/ui/issues/issue-1112.rs b/src/test/ui/generics/issue-1112.rs
similarity index 100%
rename from src/test/ui/issues/issue-1112.rs
rename to src/test/ui/generics/issue-1112.rs
diff --git a/src/test/ui/issues/issue-333.rs b/src/test/ui/generics/issue-333.rs
similarity index 100%
rename from src/test/ui/issues/issue-333.rs
rename to src/test/ui/generics/issue-333.rs
diff --git a/src/test/ui/issues/issue-59508-1.rs b/src/test/ui/generics/issue-59508-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-59508-1.rs
rename to src/test/ui/generics/issue-59508-1.rs
diff --git a/src/test/ui/issues/issue-59508-1.stderr b/src/test/ui/generics/issue-59508-1.stderr
similarity index 100%
rename from src/test/ui/issues/issue-59508-1.stderr
rename to src/test/ui/generics/issue-59508-1.stderr
diff --git a/src/test/ui/issues/issue-59508.fixed b/src/test/ui/generics/issue-59508.fixed
similarity index 100%
rename from src/test/ui/issues/issue-59508.fixed
rename to src/test/ui/generics/issue-59508.fixed
diff --git a/src/test/ui/issues/issue-59508.rs b/src/test/ui/generics/issue-59508.rs
similarity index 100%
rename from src/test/ui/issues/issue-59508.rs
rename to src/test/ui/generics/issue-59508.rs
diff --git a/src/test/ui/issues/issue-59508.stderr b/src/test/ui/generics/issue-59508.stderr
similarity index 100%
rename from src/test/ui/issues/issue-59508.stderr
rename to src/test/ui/generics/issue-59508.stderr
diff --git a/src/test/ui/issues/issue-60283.rs b/src/test/ui/higher-rank-trait-bounds/issue-60283.rs
similarity index 100%
rename from src/test/ui/issues/issue-60283.rs
rename to src/test/ui/higher-rank-trait-bounds/issue-60283.rs
diff --git a/src/test/ui/issues/issue-60283.stderr b/src/test/ui/higher-rank-trait-bounds/issue-60283.stderr
similarity index 100%
rename from src/test/ui/issues/issue-60283.stderr
rename to src/test/ui/higher-rank-trait-bounds/issue-60283.stderr
diff --git a/src/test/ui/lambda-var-hygiene.rs b/src/test/ui/hygiene/lambda-var-hygiene.rs
similarity index 100%
rename from src/test/ui/lambda-var-hygiene.rs
rename to src/test/ui/hygiene/lambda-var-hygiene.rs
diff --git a/src/test/ui/issues/issue-49579.rs b/src/test/ui/impl-trait/issue-49579.rs
similarity index 100%
rename from src/test/ui/issues/issue-49579.rs
rename to src/test/ui/impl-trait/issue-49579.rs
diff --git a/src/test/ui/issues/issue-49685.rs b/src/test/ui/impl-trait/issue-49685.rs
similarity index 100%
rename from src/test/ui/issues/issue-49685.rs
rename to src/test/ui/impl-trait/issue-49685.rs
diff --git a/src/test/ui/issues/issue-51185.rs b/src/test/ui/impl-trait/issue-51185.rs
similarity index 100%
rename from src/test/ui/issues/issue-51185.rs
rename to src/test/ui/impl-trait/issue-51185.rs
diff --git a/src/test/ui/in-band-lifetimes.rs b/src/test/ui/in-band-lifetimes/in-band-lifetimes.rs
similarity index 100%
rename from src/test/ui/in-band-lifetimes.rs
rename to src/test/ui/in-band-lifetimes/in-band-lifetimes.rs
diff --git a/src/test/ui/lub-glb-with-unbound-infer-var.rs b/src/test/ui/inference/lub-glb-with-unbound-infer-var.rs
similarity index 100%
rename from src/test/ui/lub-glb-with-unbound-infer-var.rs
rename to src/test/ui/inference/lub-glb-with-unbound-infer-var.rs
diff --git a/src/test/ui/issues/issue-2444.rs b/src/test/ui/issues/issue-2444.rs
deleted file mode 100644
index ac0d0506a342d..0000000000000
--- a/src/test/ui/issues/issue-2444.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// run-fail
-// error-pattern:explicit panic
-// ignore-emscripten no processes
-
-use std::sync::Arc;
-
-enum Err<T> {
-    Errr(Arc<T>),
-}
-
-fn foo() -> Err<isize> {
-    panic!();
-}
-
-fn main() {
-    let _f = foo();
-}
diff --git a/src/test/ui/issues/issue-2748-b.rs b/src/test/ui/issues/issue-2748-b.rs
deleted file mode 100644
index 8df735ac88ea6..0000000000000
--- a/src/test/ui/issues/issue-2748-b.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// run-pass
-
-fn thing<'r>(x: &'r [isize]) -> &'r [isize] { x }
-
-pub fn main() {
-    let x = &[1,2,3];
-    let y = x;
-    let z = thing(x);
-    assert_eq!(z[2], x[2]);
-    assert_eq!(z[1], y[1]);
-}
diff --git a/src/test/ui/issues/issue-3211.rs b/src/test/ui/issues/issue-3211.rs
deleted file mode 100644
index 49dd4fa736052..0000000000000
--- a/src/test/ui/issues/issue-3211.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// run-pass
-pub fn main() {
-    let mut x = 0;
-    for _ in 0..4096 { x += 1; }
-    assert_eq!(x, 4096);
-    println!("x = {}", x);
-}
diff --git a/src/test/ui/issues/issue-4401.rs b/src/test/ui/issues/issue-4401.rs
deleted file mode 100644
index fef73fbe1f504..0000000000000
--- a/src/test/ui/issues/issue-4401.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// run-pass
-pub fn main() {
-    let mut count = 0;
-    for _ in 0..999_999 { count += 1; }
-    assert_eq!(count, 999_999);
-    println!("{}", count);
-}
diff --git a/src/test/ui/issues/issue-50993.rs b/src/test/ui/issues/issue-50993.rs
deleted file mode 100644
index e6a9451a060cd..0000000000000
--- a/src/test/ui/issues/issue-50993.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// compile-flags: --crate-type dylib --target thumbv7em-none-eabihf
-// needs-llvm-components: arm
-// build-pass
-// error-pattern: dropping unsupported crate type `dylib` for target `thumbv7em-none-eabihf`
-
-#![feature(no_core)]
-
-#![no_std]
-#![no_core]
diff --git a/src/test/ui/issues/issue-50993.stderr b/src/test/ui/issues/issue-50993.stderr
deleted file mode 100644
index 45cbfef07097d..0000000000000
--- a/src/test/ui/issues/issue-50993.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-warning: dropping unsupported crate type `dylib` for target `thumbv7em-none-eabihf`
-
-warning: 1 warning emitted
-
diff --git a/src/test/ui/issues/issue-811.rs b/src/test/ui/issues/issue-811.rs
deleted file mode 100644
index f929d388819a9..0000000000000
--- a/src/test/ui/issues/issue-811.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// run-fail
-// error-pattern:quux
-// ignore-emscripten no processes
-
-use std::marker::PhantomData;
-
-fn test00_start(ch: Chan<isize>, message: isize) {
-    send(ch, message);
-}
-
-type TaskId = isize;
-type PortId = isize;
-
-struct Chan<T> {
-    task: TaskId,
-    port: PortId,
-    marker: PhantomData<*mut T>,
-}
-
-fn send<T: Send>(_ch: Chan<T>, _data: T) {
-    panic!();
-}
-
-fn main() {
-    panic!("quux");
-}
diff --git a/src/test/ui/issues/issue-19660.rs b/src/test/ui/lang-items/issue-19660.rs
similarity index 100%
rename from src/test/ui/issues/issue-19660.rs
rename to src/test/ui/lang-items/issue-19660.rs
diff --git a/src/test/ui/issues/issue-19660.stderr b/src/test/ui/lang-items/issue-19660.stderr
similarity index 100%
rename from src/test/ui/issues/issue-19660.stderr
rename to src/test/ui/lang-items/issue-19660.stderr
diff --git a/src/test/ui/issues/issue-31076.rs b/src/test/ui/lang-items/issue-31076.rs
similarity index 100%
rename from src/test/ui/issues/issue-31076.rs
rename to src/test/ui/lang-items/issue-31076.rs
diff --git a/src/test/ui/issues/issue-31076.stderr b/src/test/ui/lang-items/issue-31076.stderr
similarity index 100%
rename from src/test/ui/issues/issue-31076.stderr
rename to src/test/ui/lang-items/issue-31076.stderr
diff --git a/src/test/ui/required-lang-item.rs b/src/test/ui/lang-items/required-lang-item.rs
similarity index 100%
rename from src/test/ui/required-lang-item.rs
rename to src/test/ui/lang-items/required-lang-item.rs
diff --git a/src/test/ui/required-lang-item.stderr b/src/test/ui/lang-items/required-lang-item.stderr
similarity index 100%
rename from src/test/ui/required-lang-item.stderr
rename to src/test/ui/lang-items/required-lang-item.stderr
diff --git a/src/test/ui/issues/issue-26638.rs b/src/test/ui/lifetimes/issue-26638.rs
similarity index 100%
rename from src/test/ui/issues/issue-26638.rs
rename to src/test/ui/lifetimes/issue-26638.rs
diff --git a/src/test/ui/issues/issue-26638.stderr b/src/test/ui/lifetimes/issue-26638.stderr
similarity index 100%
rename from src/test/ui/issues/issue-26638.stderr
rename to src/test/ui/lifetimes/issue-26638.stderr
diff --git a/src/test/ui/issues/issue-14837.rs b/src/test/ui/lint/issue-14837.rs
similarity index 100%
rename from src/test/ui/issues/issue-14837.rs
rename to src/test/ui/lint/issue-14837.rs
diff --git a/src/test/ui/issues/issue-57410-1.rs b/src/test/ui/lint/issue-57410-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-57410-1.rs
rename to src/test/ui/lint/issue-57410-1.rs
diff --git a/src/test/ui/issues/issue-63364.rs b/src/test/ui/lint/issue-63364.rs
similarity index 100%
rename from src/test/ui/issues/issue-63364.rs
rename to src/test/ui/lint/issue-63364.rs
diff --git a/src/test/ui/issues/issue-63364.stderr b/src/test/ui/lint/issue-63364.stderr
similarity index 100%
rename from src/test/ui/issues/issue-63364.stderr
rename to src/test/ui/lint/issue-63364.stderr
diff --git a/src/test/ui/unnecessary-extern-crate.rs b/src/test/ui/lint/unnecessary-extern-crate.rs
similarity index 100%
rename from src/test/ui/unnecessary-extern-crate.rs
rename to src/test/ui/lint/unnecessary-extern-crate.rs
diff --git a/src/test/ui/unnecessary-extern-crate.stderr b/src/test/ui/lint/unnecessary-extern-crate.stderr
similarity index 100%
rename from src/test/ui/unnecessary-extern-crate.stderr
rename to src/test/ui/lint/unnecessary-extern-crate.stderr
diff --git a/src/test/ui/warn-ctypes-inhibit.rs b/src/test/ui/lint/warn-ctypes-inhibit.rs
similarity index 100%
rename from src/test/ui/warn-ctypes-inhibit.rs
rename to src/test/ui/lint/warn-ctypes-inhibit.rs
diff --git a/src/test/ui/issues/issue-23458.rs b/src/test/ui/llvm-asm/issue-23458.rs
similarity index 100%
rename from src/test/ui/issues/issue-23458.rs
rename to src/test/ui/llvm-asm/issue-23458.rs
diff --git a/src/test/ui/issues/issue-23458.stderr b/src/test/ui/llvm-asm/issue-23458.stderr
similarity index 100%
rename from src/test/ui/issues/issue-23458.stderr
rename to src/test/ui/llvm-asm/issue-23458.stderr
diff --git a/src/test/ui/issues/issue-37366.rs b/src/test/ui/llvm-asm/issue-37366.rs
similarity index 100%
rename from src/test/ui/issues/issue-37366.rs
rename to src/test/ui/llvm-asm/issue-37366.rs
diff --git a/src/test/ui/issues/issue-53787-inline-assembler-macro.rs b/src/test/ui/llvm-asm/issue-53787-inline-assembler-macro.rs
similarity index 100%
rename from src/test/ui/issues/issue-53787-inline-assembler-macro.rs
rename to src/test/ui/llvm-asm/issue-53787-inline-assembler-macro.rs
diff --git a/src/test/ui/issues/issue-53787-inline-assembler-macro.stderr b/src/test/ui/llvm-asm/issue-53787-inline-assembler-macro.stderr
similarity index 100%
rename from src/test/ui/issues/issue-53787-inline-assembler-macro.stderr
rename to src/test/ui/llvm-asm/issue-53787-inline-assembler-macro.stderr
diff --git a/src/test/ui/thinlto/all-crates.rs b/src/test/ui/lto/all-crates.rs
similarity index 100%
rename from src/test/ui/thinlto/all-crates.rs
rename to src/test/ui/lto/all-crates.rs
diff --git a/src/test/ui/thinlto/auxiliary/dylib.rs b/src/test/ui/lto/auxiliary/dylib.rs
similarity index 100%
rename from src/test/ui/thinlto/auxiliary/dylib.rs
rename to src/test/ui/lto/auxiliary/dylib.rs
diff --git a/src/test/ui/auxiliary/lto-duplicate-symbols1.rs b/src/test/ui/lto/auxiliary/lto-duplicate-symbols1.rs
similarity index 100%
rename from src/test/ui/auxiliary/lto-duplicate-symbols1.rs
rename to src/test/ui/lto/auxiliary/lto-duplicate-symbols1.rs
diff --git a/src/test/ui/auxiliary/lto-duplicate-symbols2.rs b/src/test/ui/lto/auxiliary/lto-duplicate-symbols2.rs
similarity index 100%
rename from src/test/ui/auxiliary/lto-duplicate-symbols2.rs
rename to src/test/ui/lto/auxiliary/lto-duplicate-symbols2.rs
diff --git a/src/test/ui/auxiliary/lto-rustc-loads-linker-plugin.rs b/src/test/ui/lto/auxiliary/lto-rustc-loads-linker-plugin.rs
similarity index 100%
rename from src/test/ui/auxiliary/lto-rustc-loads-linker-plugin.rs
rename to src/test/ui/lto/auxiliary/lto-rustc-loads-linker-plugin.rs
diff --git a/src/test/ui/thinlto/auxiliary/msvc-imp-present.rs b/src/test/ui/lto/auxiliary/msvc-imp-present.rs
similarity index 100%
rename from src/test/ui/thinlto/auxiliary/msvc-imp-present.rs
rename to src/test/ui/lto/auxiliary/msvc-imp-present.rs
diff --git a/src/test/ui/thinlto/auxiliary/thin-lto-inlines-aux.rs b/src/test/ui/lto/auxiliary/thin-lto-inlines-aux.rs
similarity index 100%
rename from src/test/ui/thinlto/auxiliary/thin-lto-inlines-aux.rs
rename to src/test/ui/lto/auxiliary/thin-lto-inlines-aux.rs
diff --git a/src/test/ui/thinlto/dylib-works.rs b/src/test/ui/lto/dylib-works.rs
similarity index 100%
rename from src/test/ui/thinlto/dylib-works.rs
rename to src/test/ui/lto/dylib-works.rs
diff --git a/src/test/ui/lto-and-no-bitcode-in-rlib.rs b/src/test/ui/lto/lto-and-no-bitcode-in-rlib.rs
similarity index 100%
rename from src/test/ui/lto-and-no-bitcode-in-rlib.rs
rename to src/test/ui/lto/lto-and-no-bitcode-in-rlib.rs
diff --git a/src/test/ui/lto-and-no-bitcode-in-rlib.stderr b/src/test/ui/lto/lto-and-no-bitcode-in-rlib.stderr
similarity index 100%
rename from src/test/ui/lto-and-no-bitcode-in-rlib.stderr
rename to src/test/ui/lto/lto-and-no-bitcode-in-rlib.stderr
diff --git a/src/test/ui/lto-duplicate-symbols.rs b/src/test/ui/lto/lto-duplicate-symbols.rs
similarity index 100%
rename from src/test/ui/lto-duplicate-symbols.rs
rename to src/test/ui/lto/lto-duplicate-symbols.rs
diff --git a/src/test/ui/lto-duplicate-symbols.stderr b/src/test/ui/lto/lto-duplicate-symbols.stderr
similarity index 100%
rename from src/test/ui/lto-duplicate-symbols.stderr
rename to src/test/ui/lto/lto-duplicate-symbols.stderr
diff --git a/src/test/ui/lto-many-codegen-units.rs b/src/test/ui/lto/lto-many-codegen-units.rs
similarity index 100%
rename from src/test/ui/lto-many-codegen-units.rs
rename to src/test/ui/lto/lto-many-codegen-units.rs
diff --git a/src/test/ui/lto-opt-level-s.rs b/src/test/ui/lto/lto-opt-level-s.rs
similarity index 100%
rename from src/test/ui/lto-opt-level-s.rs
rename to src/test/ui/lto/lto-opt-level-s.rs
diff --git a/src/test/ui/lto-opt-level-z.rs b/src/test/ui/lto/lto-opt-level-z.rs
similarity index 100%
rename from src/test/ui/lto-opt-level-z.rs
rename to src/test/ui/lto/lto-opt-level-z.rs
diff --git a/src/test/ui/lto-rustc-loads-linker-plugin.rs b/src/test/ui/lto/lto-rustc-loads-linker-plugin.rs
similarity index 100%
rename from src/test/ui/lto-rustc-loads-linker-plugin.rs
rename to src/test/ui/lto/lto-rustc-loads-linker-plugin.rs
diff --git a/src/test/ui/lto-still-runs-thread-dtors.rs b/src/test/ui/lto/lto-still-runs-thread-dtors.rs
similarity index 100%
rename from src/test/ui/lto-still-runs-thread-dtors.rs
rename to src/test/ui/lto/lto-still-runs-thread-dtors.rs
diff --git a/src/test/ui/lto-thin-rustc-loads-linker-plugin.rs b/src/test/ui/lto/lto-thin-rustc-loads-linker-plugin.rs
similarity index 100%
rename from src/test/ui/lto-thin-rustc-loads-linker-plugin.rs
rename to src/test/ui/lto/lto-thin-rustc-loads-linker-plugin.rs
diff --git a/src/test/ui/thinlto/msvc-imp-present.rs b/src/test/ui/lto/msvc-imp-present.rs
similarity index 100%
rename from src/test/ui/thinlto/msvc-imp-present.rs
rename to src/test/ui/lto/msvc-imp-present.rs
diff --git a/src/test/ui/thin-lto-global-allocator.rs b/src/test/ui/lto/thin-lto-global-allocator.rs
similarity index 100%
rename from src/test/ui/thin-lto-global-allocator.rs
rename to src/test/ui/lto/thin-lto-global-allocator.rs
diff --git a/src/test/ui/thinlto/thin-lto-inlines.rs b/src/test/ui/lto/thin-lto-inlines.rs
similarity index 100%
rename from src/test/ui/thinlto/thin-lto-inlines.rs
rename to src/test/ui/lto/thin-lto-inlines.rs
diff --git a/src/test/ui/thinlto/thin-lto-inlines2.rs b/src/test/ui/lto/thin-lto-inlines2.rs
similarity index 100%
rename from src/test/ui/thinlto/thin-lto-inlines2.rs
rename to src/test/ui/lto/thin-lto-inlines2.rs
diff --git a/src/test/ui/thinlto/weak-works.rs b/src/test/ui/lto/weak-works.rs
similarity index 100%
rename from src/test/ui/thinlto/weak-works.rs
rename to src/test/ui/lto/weak-works.rs
diff --git a/src/test/ui/issues/auxiliary/issue-19163.rs b/src/test/ui/macros/auxiliary/issue-19163.rs
similarity index 100%
rename from src/test/ui/issues/auxiliary/issue-19163.rs
rename to src/test/ui/macros/auxiliary/issue-19163.rs
diff --git a/src/test/ui/issues/issue-16098.rs b/src/test/ui/macros/issue-16098.rs
similarity index 100%
rename from src/test/ui/issues/issue-16098.rs
rename to src/test/ui/macros/issue-16098.rs
diff --git a/src/test/ui/issues/issue-16098.stderr b/src/test/ui/macros/issue-16098.stderr
similarity index 100%
rename from src/test/ui/issues/issue-16098.stderr
rename to src/test/ui/macros/issue-16098.stderr
diff --git a/src/test/ui/issues/issue-19163.rs b/src/test/ui/macros/issue-19163.rs
similarity index 100%
rename from src/test/ui/issues/issue-19163.rs
rename to src/test/ui/macros/issue-19163.rs
diff --git a/src/test/ui/issues/issue-19163.stderr b/src/test/ui/macros/issue-19163.stderr
similarity index 100%
rename from src/test/ui/issues/issue-19163.stderr
rename to src/test/ui/macros/issue-19163.stderr
diff --git a/src/test/ui/issues/issue-21356.rs b/src/test/ui/macros/issue-21356.rs
similarity index 100%
rename from src/test/ui/issues/issue-21356.rs
rename to src/test/ui/macros/issue-21356.rs
diff --git a/src/test/ui/issues/issue-21356.stderr b/src/test/ui/macros/issue-21356.stderr
similarity index 100%
rename from src/test/ui/issues/issue-21356.stderr
rename to src/test/ui/macros/issue-21356.stderr
diff --git a/src/test/ui/issues/issue-22463.rs b/src/test/ui/macros/issue-22463.rs
similarity index 100%
rename from src/test/ui/issues/issue-22463.rs
rename to src/test/ui/macros/issue-22463.rs
diff --git a/src/test/ui/issues/issue-29084.rs b/src/test/ui/macros/issue-29084.rs
similarity index 100%
rename from src/test/ui/issues/issue-29084.rs
rename to src/test/ui/macros/issue-29084.rs
diff --git a/src/test/ui/issues/issue-29084.stderr b/src/test/ui/macros/issue-29084.stderr
similarity index 100%
rename from src/test/ui/issues/issue-29084.stderr
rename to src/test/ui/macros/issue-29084.stderr
diff --git a/src/test/ui/issues/issue-34171.rs b/src/test/ui/macros/issue-34171.rs
similarity index 100%
rename from src/test/ui/issues/issue-34171.rs
rename to src/test/ui/macros/issue-34171.rs
diff --git a/src/test/ui/issues/issue-37175.rs b/src/test/ui/macros/issue-37175.rs
similarity index 100%
rename from src/test/ui/issues/issue-37175.rs
rename to src/test/ui/macros/issue-37175.rs
diff --git a/src/test/ui/issues/issue-39388.rs b/src/test/ui/macros/issue-39388.rs
similarity index 100%
rename from src/test/ui/issues/issue-39388.rs
rename to src/test/ui/macros/issue-39388.rs
diff --git a/src/test/ui/issues/issue-39388.stderr b/src/test/ui/macros/issue-39388.stderr
similarity index 100%
rename from src/test/ui/issues/issue-39388.stderr
rename to src/test/ui/macros/issue-39388.stderr
diff --git a/src/test/ui/issues/issue-40770.rs b/src/test/ui/macros/issue-40770.rs
similarity index 100%
rename from src/test/ui/issues/issue-40770.rs
rename to src/test/ui/macros/issue-40770.rs
diff --git a/src/test/ui/issues/issue-57597.rs b/src/test/ui/macros/issue-57597.rs
similarity index 100%
rename from src/test/ui/issues/issue-57597.rs
rename to src/test/ui/macros/issue-57597.rs
diff --git a/src/test/ui/issues/issue-57597.stderr b/src/test/ui/macros/issue-57597.stderr
similarity index 100%
rename from src/test/ui/issues/issue-57597.stderr
rename to src/test/ui/macros/issue-57597.stderr
diff --git a/src/test/ui/issues/issue-6596-1.rs b/src/test/ui/macros/issue-6596-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-6596-1.rs
rename to src/test/ui/macros/issue-6596-1.rs
diff --git a/src/test/ui/issues/issue-6596-1.stderr b/src/test/ui/macros/issue-6596-1.stderr
similarity index 100%
rename from src/test/ui/issues/issue-6596-1.stderr
rename to src/test/ui/macros/issue-6596-1.stderr
diff --git a/src/test/ui/issues/issue-86865.rs b/src/test/ui/macros/issue-86865.rs
similarity index 100%
rename from src/test/ui/issues/issue-86865.rs
rename to src/test/ui/macros/issue-86865.rs
diff --git a/src/test/ui/issues/issue-86865.stderr b/src/test/ui/macros/issue-86865.stderr
similarity index 100%
rename from src/test/ui/issues/issue-86865.stderr
rename to src/test/ui/macros/issue-86865.stderr
diff --git a/src/test/ui/trace_macros-format.rs b/src/test/ui/macros/trace_macros-format.rs
similarity index 100%
rename from src/test/ui/trace_macros-format.rs
rename to src/test/ui/macros/trace_macros-format.rs
diff --git a/src/test/ui/trace_macros-format.stderr b/src/test/ui/macros/trace_macros-format.stderr
similarity index 100%
rename from src/test/ui/trace_macros-format.stderr
rename to src/test/ui/macros/trace_macros-format.stderr
diff --git a/src/test/ui/overlap-doesnt-conflict-with-specialization.rs b/src/test/ui/marker_trait_attr/overlap-doesnt-conflict-with-specialization.rs
similarity index 100%
rename from src/test/ui/overlap-doesnt-conflict-with-specialization.rs
rename to src/test/ui/marker_trait_attr/overlap-doesnt-conflict-with-specialization.rs
diff --git a/src/test/ui/overlap-doesnt-conflict-with-specialization.stderr b/src/test/ui/marker_trait_attr/overlap-doesnt-conflict-with-specialization.stderr
similarity index 100%
rename from src/test/ui/overlap-doesnt-conflict-with-specialization.stderr
rename to src/test/ui/marker_trait_attr/overlap-doesnt-conflict-with-specialization.stderr
diff --git a/src/test/ui/overlap-permitted-for-annotated-marker-traits.rs b/src/test/ui/marker_trait_attr/overlap-permitted-for-annotated-marker-traits.rs
similarity index 100%
rename from src/test/ui/overlap-permitted-for-annotated-marker-traits.rs
rename to src/test/ui/marker_trait_attr/overlap-permitted-for-annotated-marker-traits.rs
diff --git a/src/test/ui/issues/issue-11940.rs b/src/test/ui/match/issue-11940.rs
similarity index 100%
rename from src/test/ui/issues/issue-11940.rs
rename to src/test/ui/match/issue-11940.rs
diff --git a/src/test/ui/issues/issue-18060.rs b/src/test/ui/match/issue-18060.rs
similarity index 100%
rename from src/test/ui/issues/issue-18060.rs
rename to src/test/ui/match/issue-18060.rs
diff --git a/src/test/ui/issues/issue-26251.rs b/src/test/ui/match/issue-26251.rs
similarity index 100%
rename from src/test/ui/issues/issue-26251.rs
rename to src/test/ui/match/issue-26251.rs
diff --git a/src/test/ui/issues/issue-26996.rs b/src/test/ui/match/issue-26996.rs
similarity index 100%
rename from src/test/ui/issues/issue-26996.rs
rename to src/test/ui/match/issue-26996.rs
diff --git a/src/test/ui/issues/issue-42679.rs b/src/test/ui/match/issue-42679.rs
similarity index 100%
rename from src/test/ui/issues/issue-42679.rs
rename to src/test/ui/match/issue-42679.rs
diff --git a/src/test/ui/issues/issue-74739.rs b/src/test/ui/mir/issue-74739.rs
similarity index 100%
rename from src/test/ui/issues/issue-74739.rs
rename to src/test/ui/mir/issue-74739.rs
diff --git a/src/test/ui/negative.rs b/src/test/ui/negative.rs
deleted file mode 100644
index 9601e9118aa50..0000000000000
--- a/src/test/ui/negative.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// run-pass
-
-pub fn main() {
-    match -5 {
-      -5 => {}
-      _ => { panic!() }
-    }
-}
diff --git a/src/test/ui/diverging-tuple-parts-39485.rs b/src/test/ui/never_type/diverging-tuple-parts-39485.rs
similarity index 100%
rename from src/test/ui/diverging-tuple-parts-39485.rs
rename to src/test/ui/never_type/diverging-tuple-parts-39485.rs
diff --git a/src/test/ui/diverging-tuple-parts-39485.stderr b/src/test/ui/never_type/diverging-tuple-parts-39485.stderr
similarity index 100%
rename from src/test/ui/diverging-tuple-parts-39485.stderr
rename to src/test/ui/never_type/diverging-tuple-parts-39485.stderr
diff --git a/src/test/ui/unary-minus-suffix-inference.rs b/src/test/ui/numbers-arithmetic/unary-minus-suffix-inference.rs
similarity index 100%
rename from src/test/ui/unary-minus-suffix-inference.rs
rename to src/test/ui/numbers-arithmetic/unary-minus-suffix-inference.rs
diff --git a/src/test/ui/issues/issue-45152.rs b/src/test/ui/packed/issue-46152.rs
similarity index 100%
rename from src/test/ui/issues/issue-45152.rs
rename to src/test/ui/packed/issue-46152.rs
diff --git a/src/test/ui/bastion-of-the-turbofish.rs b/src/test/ui/parser/bastion-of-the-turbofish.rs
similarity index 100%
rename from src/test/ui/bastion-of-the-turbofish.rs
rename to src/test/ui/parser/bastion-of-the-turbofish.rs
diff --git a/src/test/ui/issues/issue-13483.rs b/src/test/ui/parser/issue-13483.rs
similarity index 100%
rename from src/test/ui/issues/issue-13483.rs
rename to src/test/ui/parser/issue-13483.rs
diff --git a/src/test/ui/issues/issue-13483.stderr b/src/test/ui/parser/issue-13483.stderr
similarity index 100%
rename from src/test/ui/issues/issue-13483.stderr
rename to src/test/ui/parser/issue-13483.stderr
diff --git a/src/test/ui/issues/issue-20616-4.rs b/src/test/ui/parser/issue-20616-4.rs
similarity index 100%
rename from src/test/ui/issues/issue-20616-4.rs
rename to src/test/ui/parser/issue-20616-4.rs
diff --git a/src/test/ui/issues/issue-20616-4.stderr b/src/test/ui/parser/issue-20616-4.stderr
similarity index 100%
rename from src/test/ui/issues/issue-20616-4.stderr
rename to src/test/ui/parser/issue-20616-4.stderr
diff --git a/src/test/ui/issues/issue-20616-5.rs b/src/test/ui/parser/issue-20616-5.rs
similarity index 100%
rename from src/test/ui/issues/issue-20616-5.rs
rename to src/test/ui/parser/issue-20616-5.rs
diff --git a/src/test/ui/issues/issue-20616-5.stderr b/src/test/ui/parser/issue-20616-5.stderr
similarity index 100%
rename from src/test/ui/issues/issue-20616-5.stderr
rename to src/test/ui/parser/issue-20616-5.stderr
diff --git a/src/test/ui/issues/issue-20616-6.rs b/src/test/ui/parser/issue-20616-6.rs
similarity index 100%
rename from src/test/ui/issues/issue-20616-6.rs
rename to src/test/ui/parser/issue-20616-6.rs
diff --git a/src/test/ui/issues/issue-20616-6.stderr b/src/test/ui/parser/issue-20616-6.stderr
similarity index 100%
rename from src/test/ui/issues/issue-20616-6.stderr
rename to src/test/ui/parser/issue-20616-6.stderr
diff --git a/src/test/ui/issues/issue-20616-7.rs b/src/test/ui/parser/issue-20616-7.rs
similarity index 100%
rename from src/test/ui/issues/issue-20616-7.rs
rename to src/test/ui/parser/issue-20616-7.rs
diff --git a/src/test/ui/issues/issue-20616-7.stderr b/src/test/ui/parser/issue-20616-7.stderr
similarity index 100%
rename from src/test/ui/issues/issue-20616-7.stderr
rename to src/test/ui/parser/issue-20616-7.stderr
diff --git a/src/test/ui/issues/issue-21475.rs b/src/test/ui/parser/issue-21475.rs
similarity index 100%
rename from src/test/ui/issues/issue-21475.rs
rename to src/test/ui/parser/issue-21475.rs
diff --git a/src/test/ui/issues/issue-31804.rs b/src/test/ui/parser/issue-31804.rs
similarity index 100%
rename from src/test/ui/issues/issue-31804.rs
rename to src/test/ui/parser/issue-31804.rs
diff --git a/src/test/ui/issues/issue-31804.stderr b/src/test/ui/parser/issue-31804.stderr
similarity index 100%
rename from src/test/ui/issues/issue-31804.stderr
rename to src/test/ui/parser/issue-31804.stderr
diff --git a/src/test/ui/issues/issue-34255-1.rs b/src/test/ui/parser/issue-34255-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-34255-1.rs
rename to src/test/ui/parser/issue-34255-1.rs
diff --git a/src/test/ui/issues/issue-34255-1.stderr b/src/test/ui/parser/issue-34255-1.stderr
similarity index 100%
rename from src/test/ui/issues/issue-34255-1.stderr
rename to src/test/ui/parser/issue-34255-1.stderr
diff --git a/src/test/ui/issues/issue-49040.rs b/src/test/ui/parser/issue-49040.rs
similarity index 100%
rename from src/test/ui/issues/issue-49040.rs
rename to src/test/ui/parser/issue-49040.rs
diff --git a/src/test/ui/issues/issue-49040.stderr b/src/test/ui/parser/issue-49040.stderr
similarity index 100%
rename from src/test/ui/issues/issue-49040.stderr
rename to src/test/ui/parser/issue-49040.stderr
diff --git a/src/test/ui/issues/issue-56031.rs b/src/test/ui/parser/issue-56031.rs
similarity index 100%
rename from src/test/ui/issues/issue-56031.rs
rename to src/test/ui/parser/issue-56031.rs
diff --git a/src/test/ui/issues/issue-56031.stderr b/src/test/ui/parser/issue-56031.stderr
similarity index 100%
rename from src/test/ui/issues/issue-56031.stderr
rename to src/test/ui/parser/issue-56031.stderr
diff --git a/src/test/ui/issues/issue-11577.rs b/src/test/ui/pattern/issue-11577.rs
similarity index 100%
rename from src/test/ui/issues/issue-11577.rs
rename to src/test/ui/pattern/issue-11577.rs
diff --git a/src/test/ui/issues/issue-15080.rs b/src/test/ui/pattern/issue-15080.rs
similarity index 100%
rename from src/test/ui/issues/issue-15080.rs
rename to src/test/ui/pattern/issue-15080.rs
diff --git a/src/test/ui/issues/issue-72574-2.rs b/src/test/ui/pattern/issue-72574-2.rs
similarity index 100%
rename from src/test/ui/issues/issue-72574-2.rs
rename to src/test/ui/pattern/issue-72574-2.rs
diff --git a/src/test/ui/issues/issue-72574-2.stderr b/src/test/ui/pattern/issue-72574-2.stderr
similarity index 100%
rename from src/test/ui/issues/issue-72574-2.stderr
rename to src/test/ui/pattern/issue-72574-2.stderr
diff --git a/src/test/ui/issues/issue-8351-1.rs b/src/test/ui/pattern/issue-8351-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-8351-1.rs
rename to src/test/ui/pattern/issue-8351-1.rs
diff --git a/src/test/ui/issues/issue-8351-2.rs b/src/test/ui/pattern/issue-8351-2.rs
similarity index 100%
rename from src/test/ui/issues/issue-8351-2.rs
rename to src/test/ui/pattern/issue-8351-2.rs
diff --git a/src/test/ui/issues/issue-14456.rs b/src/test/ui/process/issue-14456.rs
similarity index 100%
rename from src/test/ui/issues/issue-14456.rs
rename to src/test/ui/process/issue-14456.rs
diff --git a/src/test/ui/issues/issue-16272.rs b/src/test/ui/process/issue-16272.rs
similarity index 100%
rename from src/test/ui/issues/issue-16272.rs
rename to src/test/ui/process/issue-16272.rs
diff --git a/src/test/ui/issues/issue-20091.rs b/src/test/ui/process/issue-20091.rs
similarity index 100%
rename from src/test/ui/issues/issue-20091.rs
rename to src/test/ui/process/issue-20091.rs
diff --git a/src/test/ui/signal-exit-status.rs b/src/test/ui/process/signal-exit-status.rs
similarity index 100%
rename from src/test/ui/signal-exit-status.rs
rename to src/test/ui/process/signal-exit-status.rs
diff --git a/src/test/ui/issues/issue-21520.rs b/src/test/ui/regions/issue-21520.rs
similarity index 100%
rename from src/test/ui/issues/issue-21520.rs
rename to src/test/ui/regions/issue-21520.rs
diff --git a/src/test/ui/issues/issue-26448-1.rs b/src/test/ui/regions/issue-26448-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-26448-1.rs
rename to src/test/ui/regions/issue-26448-1.rs
diff --git a/src/test/ui/issues/issue-26448-2.rs b/src/test/ui/regions/issue-26448-2.rs
similarity index 100%
rename from src/test/ui/issues/issue-26448-2.rs
rename to src/test/ui/regions/issue-26448-2.rs
diff --git a/src/test/ui/issues/issue-26448-3.rs b/src/test/ui/regions/issue-26448-3.rs
similarity index 100%
rename from src/test/ui/issues/issue-26448-3.rs
rename to src/test/ui/regions/issue-26448-3.rs
diff --git a/src/test/ui/editions-crate-root-2015.rs b/src/test/ui/resolve/editions-crate-root-2015.rs
similarity index 100%
rename from src/test/ui/editions-crate-root-2015.rs
rename to src/test/ui/resolve/editions-crate-root-2015.rs
diff --git a/src/test/ui/editions-crate-root-2015.stderr b/src/test/ui/resolve/editions-crate-root-2015.stderr
similarity index 100%
rename from src/test/ui/editions-crate-root-2015.stderr
rename to src/test/ui/resolve/editions-crate-root-2015.stderr
diff --git a/src/test/ui/issues/issue-12796.rs b/src/test/ui/resolve/issue-12796.rs
similarity index 100%
rename from src/test/ui/issues/issue-12796.rs
rename to src/test/ui/resolve/issue-12796.rs
diff --git a/src/test/ui/issues/issue-12796.stderr b/src/test/ui/resolve/issue-12796.stderr
similarity index 100%
rename from src/test/ui/issues/issue-12796.stderr
rename to src/test/ui/resolve/issue-12796.stderr
diff --git a/src/test/ui/issues/issue-23716.rs b/src/test/ui/resolve/issue-23716.rs
similarity index 100%
rename from src/test/ui/issues/issue-23716.rs
rename to src/test/ui/resolve/issue-23716.rs
diff --git a/src/test/ui/issues/issue-23716.stderr b/src/test/ui/resolve/issue-23716.stderr
similarity index 100%
rename from src/test/ui/issues/issue-23716.stderr
rename to src/test/ui/resolve/issue-23716.stderr
diff --git a/src/test/ui/issues/issue-3021-c.rs b/src/test/ui/resolve/issue-3021-c.rs
similarity index 100%
rename from src/test/ui/issues/issue-3021-c.rs
rename to src/test/ui/resolve/issue-3021-c.rs
diff --git a/src/test/ui/issues/issue-3021-c.stderr b/src/test/ui/resolve/issue-3021-c.stderr
similarity index 100%
rename from src/test/ui/issues/issue-3021-c.stderr
rename to src/test/ui/resolve/issue-3021-c.stderr
diff --git a/src/test/ui/issues/issue-3021.rs b/src/test/ui/resolve/issue-3021.rs
similarity index 100%
rename from src/test/ui/issues/issue-3021.rs
rename to src/test/ui/resolve/issue-3021.rs
diff --git a/src/test/ui/issues/issue-3021.stderr b/src/test/ui/resolve/issue-3021.stderr
similarity index 100%
rename from src/test/ui/issues/issue-3021.stderr
rename to src/test/ui/resolve/issue-3021.stderr
diff --git a/src/test/ui/issues/issue-31845.rs b/src/test/ui/resolve/issue-31845.rs
similarity index 100%
rename from src/test/ui/issues/issue-31845.rs
rename to src/test/ui/resolve/issue-31845.rs
diff --git a/src/test/ui/issues/issue-31845.stderr b/src/test/ui/resolve/issue-31845.stderr
similarity index 100%
rename from src/test/ui/issues/issue-31845.stderr
rename to src/test/ui/resolve/issue-31845.stderr
diff --git a/src/test/ui/issues/issue-5099.rs b/src/test/ui/resolve/issue-5099.rs
similarity index 100%
rename from src/test/ui/issues/issue-5099.rs
rename to src/test/ui/resolve/issue-5099.rs
diff --git a/src/test/ui/issues/issue-5099.stderr b/src/test/ui/resolve/issue-5099.stderr
similarity index 100%
rename from src/test/ui/issues/issue-5099.stderr
rename to src/test/ui/resolve/issue-5099.stderr
diff --git a/src/test/ui/issues/issue-6804.rs b/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-6804.rs
similarity index 100%
rename from src/test/ui/issues/issue-6804.rs
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-6804.rs
diff --git a/src/test/ui/issues/issue-6804.stderr b/src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-6804.stderr
similarity index 100%
rename from src/test/ui/issues/issue-6804.stderr
rename to src/test/ui/rfc-1445-restrict-constants-in-patterns/issue-6804.stderr
diff --git a/src/test/ui/issues/issue-61882-2.rs b/src/test/ui/self/issue-61882-2.rs
similarity index 100%
rename from src/test/ui/issues/issue-61882-2.rs
rename to src/test/ui/self/issue-61882-2.rs
diff --git a/src/test/ui/issues/issue-61882-2.stderr b/src/test/ui/self/issue-61882-2.stderr
similarity index 100%
rename from src/test/ui/issues/issue-61882-2.stderr
rename to src/test/ui/self/issue-61882-2.stderr
diff --git a/src/test/ui/issues/issue-61882.rs b/src/test/ui/self/issue-61882.rs
similarity index 100%
rename from src/test/ui/issues/issue-61882.rs
rename to src/test/ui/self/issue-61882.rs
diff --git a/src/test/ui/issues/issue-61882.stderr b/src/test/ui/self/issue-61882.stderr
similarity index 100%
rename from src/test/ui/issues/issue-61882.stderr
rename to src/test/ui/self/issue-61882.stderr
diff --git a/src/test/ui/transmute-specialization.rs b/src/test/ui/specialization/transmute-specialization.rs
similarity index 100%
rename from src/test/ui/transmute-specialization.rs
rename to src/test/ui/specialization/transmute-specialization.rs
diff --git a/src/test/ui/transmute-specialization.stderr b/src/test/ui/specialization/transmute-specialization.stderr
similarity index 100%
rename from src/test/ui/transmute-specialization.stderr
rename to src/test/ui/specialization/transmute-specialization.stderr
diff --git a/src/test/ui/auxiliary/nested_item.rs b/src/test/ui/static/auxiliary/nested_item.rs
similarity index 100%
rename from src/test/ui/auxiliary/nested_item.rs
rename to src/test/ui/static/auxiliary/nested_item.rs
diff --git a/src/test/ui/nested_item_main.rs b/src/test/ui/static/nested_item_main.rs
similarity index 100%
rename from src/test/ui/nested_item_main.rs
rename to src/test/ui/static/nested_item_main.rs
diff --git a/src/test/ui/issues/issue-14227.mir.stderr b/src/test/ui/statics/issue-14227.mir.stderr
similarity index 100%
rename from src/test/ui/issues/issue-14227.mir.stderr
rename to src/test/ui/statics/issue-14227.mir.stderr
diff --git a/src/test/ui/issues/issue-14227.rs b/src/test/ui/statics/issue-14227.rs
similarity index 100%
rename from src/test/ui/issues/issue-14227.rs
rename to src/test/ui/statics/issue-14227.rs
diff --git a/src/test/ui/issues/issue-14227.thir.stderr b/src/test/ui/statics/issue-14227.thir.stderr
similarity index 100%
rename from src/test/ui/issues/issue-14227.thir.stderr
rename to src/test/ui/statics/issue-14227.thir.stderr
diff --git a/src/test/ui/issues/issue-50731.rs b/src/test/ui/structs-enums/issue-50731.rs
similarity index 100%
rename from src/test/ui/issues/issue-50731.rs
rename to src/test/ui/structs-enums/issue-50731.rs
diff --git a/src/test/ui/auxiliary/changing-crates-a1.rs b/src/test/ui/svh/auxiliary/changing-crates-a1.rs
similarity index 100%
rename from src/test/ui/auxiliary/changing-crates-a1.rs
rename to src/test/ui/svh/auxiliary/changing-crates-a1.rs
diff --git a/src/test/ui/auxiliary/changing-crates-a2.rs b/src/test/ui/svh/auxiliary/changing-crates-a2.rs
similarity index 100%
rename from src/test/ui/auxiliary/changing-crates-a2.rs
rename to src/test/ui/svh/auxiliary/changing-crates-a2.rs
diff --git a/src/test/ui/auxiliary/changing-crates-b.rs b/src/test/ui/svh/auxiliary/changing-crates-b.rs
similarity index 100%
rename from src/test/ui/auxiliary/changing-crates-b.rs
rename to src/test/ui/svh/auxiliary/changing-crates-b.rs
diff --git a/src/test/ui/changing-crates.rs b/src/test/ui/svh/changing-crates.rs
similarity index 100%
rename from src/test/ui/changing-crates.rs
rename to src/test/ui/svh/changing-crates.rs
diff --git a/src/test/ui/changing-crates.stderr b/src/test/ui/svh/changing-crates.stderr
similarity index 100%
rename from src/test/ui/changing-crates.stderr
rename to src/test/ui/svh/changing-crates.stderr
diff --git a/src/test/ui/issues/issue-20823.rs b/src/test/ui/test-attrs/issue-20823.rs
similarity index 100%
rename from src/test/ui/issues/issue-20823.rs
rename to src/test/ui/test-attrs/issue-20823.rs
diff --git a/src/test/ui/issues/issue-24313.rs b/src/test/ui/threads-sendsync/issue-24313.rs
similarity index 100%
rename from src/test/ui/issues/issue-24313.rs
rename to src/test/ui/threads-sendsync/issue-24313.rs
diff --git a/src/test/ui/issues/issue-4448.rs b/src/test/ui/threads-sendsync/issue-4448.rs
similarity index 100%
rename from src/test/ui/issues/issue-4448.rs
rename to src/test/ui/threads-sendsync/issue-4448.rs
diff --git a/src/test/ui/issues/issue-8827.rs b/src/test/ui/threads-sendsync/issue-8827.rs
similarity index 100%
rename from src/test/ui/issues/issue-8827.rs
rename to src/test/ui/threads-sendsync/issue-8827.rs
diff --git a/src/test/ui/issues/issue-9396.rs b/src/test/ui/threads-sendsync/issue-9396.rs
similarity index 100%
rename from src/test/ui/issues/issue-9396.rs
rename to src/test/ui/threads-sendsync/issue-9396.rs
diff --git a/src/test/ui/trivial-message.rs b/src/test/ui/threads-sendsync/trivial-message.rs
similarity index 100%
rename from src/test/ui/trivial-message.rs
rename to src/test/ui/threads-sendsync/trivial-message.rs
diff --git a/src/test/ui/yield2.rs b/src/test/ui/threads-sendsync/yield2.rs
similarity index 100%
rename from src/test/ui/yield2.rs
rename to src/test/ui/threads-sendsync/yield2.rs
diff --git a/src/test/ui/issues/issue-24010.rs b/src/test/ui/traits/issue-24010.rs
similarity index 100%
rename from src/test/ui/issues/issue-24010.rs
rename to src/test/ui/traits/issue-24010.rs
diff --git a/src/test/ui/issues/issue-38604.rs b/src/test/ui/traits/issue-38604.rs
similarity index 100%
rename from src/test/ui/issues/issue-38604.rs
rename to src/test/ui/traits/issue-38604.rs
diff --git a/src/test/ui/issues/issue-38604.stderr b/src/test/ui/traits/issue-38604.stderr
similarity index 100%
rename from src/test/ui/issues/issue-38604.stderr
rename to src/test/ui/traits/issue-38604.stderr
diff --git a/src/test/ui/issues/issue-3973.rs b/src/test/ui/traits/issue-3973.rs
similarity index 100%
rename from src/test/ui/issues/issue-3973.rs
rename to src/test/ui/traits/issue-3973.rs
diff --git a/src/test/ui/issues/issue-3973.stderr b/src/test/ui/traits/issue-3973.stderr
similarity index 100%
rename from src/test/ui/issues/issue-3973.stderr
rename to src/test/ui/traits/issue-3973.stderr
diff --git a/src/test/ui/issues/issue-59029-1.rs b/src/test/ui/traits/issue-59029-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-59029-1.rs
rename to src/test/ui/traits/issue-59029-1.rs
diff --git a/src/test/ui/issues/issue-59029-1.stderr b/src/test/ui/traits/issue-59029-1.stderr
similarity index 100%
rename from src/test/ui/issues/issue-59029-1.stderr
rename to src/test/ui/traits/issue-59029-1.stderr
diff --git a/src/test/ui/issues/issue-72455.rs b/src/test/ui/traits/issue-72455.rs
similarity index 100%
rename from src/test/ui/issues/issue-72455.rs
rename to src/test/ui/traits/issue-72455.rs
diff --git a/src/test/ui/object-does-not-impl-trait.rs b/src/test/ui/traits/object-does-not-impl-trait.rs
similarity index 100%
rename from src/test/ui/object-does-not-impl-trait.rs
rename to src/test/ui/traits/object-does-not-impl-trait.rs
diff --git a/src/test/ui/object-does-not-impl-trait.stderr b/src/test/ui/traits/object-does-not-impl-trait.stderr
similarity index 100%
rename from src/test/ui/object-does-not-impl-trait.stderr
rename to src/test/ui/traits/object-does-not-impl-trait.stderr
diff --git a/src/test/ui/syntax-trait-polarity.rs b/src/test/ui/traits/syntax-trait-polarity.rs
similarity index 100%
rename from src/test/ui/syntax-trait-polarity.rs
rename to src/test/ui/traits/syntax-trait-polarity.rs
diff --git a/src/test/ui/syntax-trait-polarity.stderr b/src/test/ui/traits/syntax-trait-polarity.stderr
similarity index 100%
rename from src/test/ui/syntax-trait-polarity.stderr
rename to src/test/ui/traits/syntax-trait-polarity.stderr
diff --git a/src/test/ui/issues/issue-45124.rs b/src/test/ui/try-block/issue-45124.rs
similarity index 100%
rename from src/test/ui/issues/issue-45124.rs
rename to src/test/ui/try-block/issue-45124.rs
diff --git a/src/test/ui/issues/issue-60662.rs b/src/test/ui/type-alias-impl-trait/issue-60662.rs
similarity index 100%
rename from src/test/ui/issues/issue-60662.rs
rename to src/test/ui/type-alias-impl-trait/issue-60662.rs
diff --git a/src/test/ui/issues/issue-60662.stdout b/src/test/ui/type-alias-impl-trait/issue-60662.stdout
similarity index 100%
rename from src/test/ui/issues/issue-60662.stdout
rename to src/test/ui/type-alias-impl-trait/issue-60662.stdout
diff --git a/src/test/ui/issues/issue-30225.rs b/src/test/ui/type-inference/issue-30225.rs
similarity index 100%
rename from src/test/ui/issues/issue-30225.rs
rename to src/test/ui/type-inference/issue-30225.rs
diff --git a/src/test/ui/issues/issue-30225.stderr b/src/test/ui/type-inference/issue-30225.stderr
similarity index 100%
rename from src/test/ui/issues/issue-30225.stderr
rename to src/test/ui/type-inference/issue-30225.stderr
diff --git a/src/test/ui/issues/auxiliary/xcrate-issue-43189-a.rs b/src/test/ui/typeck/auxiliary/xcrate-issue-43189-a.rs
similarity index 100%
rename from src/test/ui/issues/auxiliary/xcrate-issue-43189-a.rs
rename to src/test/ui/typeck/auxiliary/xcrate-issue-43189-a.rs
diff --git a/src/test/ui/issues/auxiliary/xcrate-issue-43189-b.rs b/src/test/ui/typeck/auxiliary/xcrate-issue-43189-b.rs
similarity index 100%
rename from src/test/ui/issues/auxiliary/xcrate-issue-43189-b.rs
rename to src/test/ui/typeck/auxiliary/xcrate-issue-43189-b.rs
diff --git a/src/test/ui/issues/auxiliary/xcrate-issue-46112-rexport-core.rs b/src/test/ui/typeck/auxiliary/xcrate-issue-46112-rexport-core.rs
similarity index 100%
rename from src/test/ui/issues/auxiliary/xcrate-issue-46112-rexport-core.rs
rename to src/test/ui/typeck/auxiliary/xcrate-issue-46112-rexport-core.rs
diff --git a/src/test/ui/issues/auxiliary/xcrate-issue-61711-b.rs b/src/test/ui/typeck/auxiliary/xcrate-issue-61711-b.rs
similarity index 100%
rename from src/test/ui/issues/auxiliary/xcrate-issue-61711-b.rs
rename to src/test/ui/typeck/auxiliary/xcrate-issue-61711-b.rs
diff --git a/src/test/ui/issues/issue-43189.rs b/src/test/ui/typeck/issue-43189.rs
similarity index 100%
rename from src/test/ui/issues/issue-43189.rs
rename to src/test/ui/typeck/issue-43189.rs
diff --git a/src/test/ui/issues/issue-43189.stderr b/src/test/ui/typeck/issue-43189.stderr
similarity index 100%
rename from src/test/ui/issues/issue-43189.stderr
rename to src/test/ui/typeck/issue-43189.stderr
diff --git a/src/test/ui/issues/issue-46112.rs b/src/test/ui/typeck/issue-46112.rs
similarity index 100%
rename from src/test/ui/issues/issue-46112.rs
rename to src/test/ui/typeck/issue-46112.rs
diff --git a/src/test/ui/issues/issue-46112.stderr b/src/test/ui/typeck/issue-46112.stderr
similarity index 100%
rename from src/test/ui/issues/issue-46112.stderr
rename to src/test/ui/typeck/issue-46112.stderr
diff --git a/src/test/ui/issues/issue-61711-once-caused-rustc-inf-loop.rs b/src/test/ui/typeck/issue-61711-once-caused-rustc-inf-loop.rs
similarity index 100%
rename from src/test/ui/issues/issue-61711-once-caused-rustc-inf-loop.rs
rename to src/test/ui/typeck/issue-61711-once-caused-rustc-inf-loop.rs
diff --git a/src/test/ui/issues/issue-18652.rs b/src/test/ui/unboxed-closures/issue-18652.rs
similarity index 100%
rename from src/test/ui/issues/issue-18652.rs
rename to src/test/ui/unboxed-closures/issue-18652.rs
diff --git a/src/test/ui/issues/issue-30355.rs b/src/test/ui/unsized/issue-30355.rs
similarity index 100%
rename from src/test/ui/issues/issue-30355.rs
rename to src/test/ui/unsized/issue-30355.rs
diff --git a/src/test/ui/issues/issue-30355.stderr b/src/test/ui/unsized/issue-30355.stderr
similarity index 100%
rename from src/test/ui/issues/issue-30355.stderr
rename to src/test/ui/unsized/issue-30355.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 4afa36502aca1..88ede45655c94 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -7,8 +7,8 @@ use std::path::Path;
 
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
-const ROOT_ENTRY_LIMIT: usize = 1331;
-const ISSUES_ENTRY_LIMIT: usize = 2488;
+const ROOT_ENTRY_LIMIT: usize = 1275;
+const ISSUES_ENTRY_LIMIT: usize = 2310;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))