Move some tests to more reasonable directories

260 files changed, 3 insertions, 117 deletions

diff --git a/src/test/ui/argument-passing.rs b/src/test/ui/argument-passing.rs
deleted file mode 100644
index 74759a4a6bd..00000000000
--- 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
index 75b309a4839..75b309a4839 100644
--- a/src/test/ui/mut-vstore-expr.rs
+++ b/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
index 8e8ba5dc46c..8e8ba5dc46c 100644
--- a/src/test/ui/issues/issue-22066.rs
+++ b/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
index adf4dd6ce75..adf4dd6ce75 100644
--- a/src/test/ui/issues/issue-22828.rs
+++ b/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
index 210c783de79..210c783de79 100644
--- a/src/test/ui/issues/issue-28871.rs
+++ b/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
index c55fc34346c..c55fc34346c 100644
--- a/src/test/ui/issues/issue-47139-1.rs
+++ b/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
index 734bf2768c2..734bf2768c2 100644
--- a/src/test/ui/issues/issue-54467.rs
+++ b/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
index 7fb0d6c39ff..7fb0d6c39ff 100644
--- a/src/test/ui/issues/issue-73541-1.rs
+++ b/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
index 80c1fdf002a..80c1fdf002a 100644
--- a/src/test/ui/issues/issue-73541-1.stderr
+++ b/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
index 7b91c06819f..7b91c06819f 100644
--- a/src/test/ui/issues/issue-40962.rs
+++ b/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
index e31bc91a00a..e31bc91a00a 100644
--- a/src/test/ui/unrestricted-attribute-tokens.rs
+++ b/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
index 63d30c4da89..63d30c4da89 100644
--- a/src/test/ui/structured-compare.rs
+++ b/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
index 59ddb60c9f2..59ddb60c9f2 100644
--- a/src/test/ui/issues/issue-46095.rs
+++ b/src/test/ui/borrowck/issue-46095.rs
diff --git a/src/test/ui/new-box.rs b/src/test/ui/box/new-box.rs
index 96a3b197f46..96a3b197f46 100644
--- a/src/test/ui/new-box.rs
+++ b/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
index f27bb1c2eb5..f27bb1c2eb5 100644
--- a/src/test/ui/issues/issue-32201.rs
+++ b/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
index cedb5878466..cedb5878466 100644
--- a/src/test/ui/issues/issue-32201.stderr
+++ b/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
index ff41ce6c79a..ff41ce6c79a 100644
--- a/src/test/ui/supported-cast.rs
+++ b/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
index 0405b2d01e2..0405b2d01e2 100644
--- a/src/test/ui/issues/issue-10398.rs
+++ b/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
index 8d9faf324e8..8d9faf324e8 100644
--- a/src/test/ui/issues/issue-10398.stderr
+++ b/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
index 51d6ea3f7a8..51d6ea3f7a8 100644
--- a/src/test/ui/issues/issue-42463.rs
+++ b/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
index 3af9c68f233..3af9c68f233 100644
--- a/src/test/ui/issues/auxiliary/issue-39823.rs
+++ b/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
index 5d8aab2ce74..5d8aab2ce74 100644
--- a/src/test/ui/issues/issue-14589.rs
+++ b/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
index 148cf527e7c..148cf527e7c 100644
--- a/src/test/ui/issues/issue-39823.rs
+++ b/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
index 9c0c87a5cf2..9c0c87a5cf2 100644
--- a/src/test/ui/issues/issue-73886.rs
+++ b/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
index a6f8ba65ab5..a6f8ba65ab5 100644
--- a/src/test/ui/issues/issue-73886.stderr
+++ b/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
index d761c0c823b..d761c0c823b 100644
--- a/src/test/ui/issues/issue-34028.rs
+++ b/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
index 67352a2fbbb..67352a2fbbb 100644
--- a/src/test/ui/auxiliary/legacy-const-generics.rs
+++ b/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
index 538eee337cc..538eee337cc 100644
--- a/src/test/ui/legacy-const-generics-bad.rs
+++ b/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
index 3c78dd6c780..3c78dd6c780 100644
--- a/src/test/ui/legacy-const-generics-bad.stderr
+++ b/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
index 9abc72d98e6..9abc72d98e6 100644
--- a/src/test/ui/legacy-const-generics.rs
+++ b/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
index 1afde0ebe85..1afde0ebe85 100644
--- a/src/test/ui/issues/issue-13902.rs
+++ b/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
index 0ed81132ec6..0ed81132ec6 100644
--- a/src/test/ui/issues/issue-17074.rs
+++ b/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
index 77355f0d7c9..77355f0d7c9 100644
--- a/src/test/ui/issues/issue-18294.rs
+++ b/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
index e0cbd2a216d..e0cbd2a216d 100644
--- a/src/test/ui/issues/issue-18294.stderr
+++ b/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
index b9593021235..b9593021235 100644
--- a/src/test/ui/issues/issue-23968-const-not-overflow.rs
+++ b/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
index 35b63bddca2..35b63bddca2 100644
--- a/src/test/ui/issues/issue-37550.rs
+++ b/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
index 54b60df70fd..f66d7067870 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
index a6ac4d5ca2e..a6ac4d5ca2e 100644
--- a/src/test/ui/issues/issue-37991.rs
+++ b/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
index 635ceac0b19..635ceac0b19 100644
--- a/src/test/ui/try-macro-suggestion.rs
+++ b/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
index c7dde7eeac3..c7dde7eeac3 100644
--- a/src/test/ui/try-macro-suggestion.stderr
+++ b/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
index 3970a4155e9..3970a4155e9 100644
--- a/src/test/ui/issues/issue-19358.rs
+++ b/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
index 757307d944f..757307d944f 100644
--- a/src/test/ui/issues/issue-58319.rs
+++ b/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
index 004679a6240..004679a6240 100644
--- a/src/test/ui/issues/issue-35546.rs
+++ b/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
index c9cb932e62a..c9cb932e62a 100644
--- a/src/test/ui/terminate-in-initializer.rs
+++ b/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
index 23fd86a093b..23fd86a093b 100644
--- 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
diff --git a/src/test/ui/epoch-gate-feature.rs b/src/test/ui/editions/epoch-gate-feature.rs
index 5f7feb5347b..5f7feb5347b 100644
--- a/src/test/ui/epoch-gate-feature.rs
+++ b/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
index 40a70c623a7..40a70c623a7 100644
--- a/src/test/ui/issues/issue-51582.rs
+++ b/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
index fec65878210..fec65878210 100644
--- a/src/test/ui/issues/issue-42747.rs
+++ b/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
index aff8bf7927d..aff8bf7927d 100644
--- a/src/test/ui/issues/issue-28324.mir.stderr
+++ b/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
index fbe83e325ed..fbe83e325ed 100644
--- a/src/test/ui/issues/issue-28324.rs
+++ b/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
index c696c359830..c696c359830 100644
--- a/src/test/ui/issues/issue-28324.thir.stderr
+++ b/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
index 15571e8bf5b..15571e8bf5b 100644
--- a/src/test/ui/issues/issue-51345.rs
+++ b/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
index 529cca7b731..529cca7b731 100644
--- a/src/test/ui/long-while.rs
+++ b/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
index f3be948781b..f3be948781b 100644
--- a/src/test/ui/nil-decl-in-foreign.rs
+++ b/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
index 3ba7bb21708..3ba7bb21708 100644
--- a/src/test/ui/issues/issue-1112.rs
+++ b/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
index 0753aaa0797..0753aaa0797 100644
--- a/src/test/ui/issues/issue-333.rs
+++ b/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
index 6376c429b28..6376c429b28 100644
--- a/src/test/ui/issues/issue-59508-1.rs
+++ b/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
index df244f02dce..df244f02dce 100644
--- a/src/test/ui/issues/issue-59508-1.stderr
+++ b/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
index b5c60a1626f..b5c60a1626f 100644
--- a/src/test/ui/issues/issue-59508.fixed
+++ b/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
index 0b39c5d8f2a..0b39c5d8f2a 100644
--- a/src/test/ui/issues/issue-59508.rs
+++ b/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
index 33e967cebff..33e967cebff 100644
--- a/src/test/ui/issues/issue-59508.stderr
+++ b/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
index c63b1544a53..c63b1544a53 100644
--- a/src/test/ui/issues/issue-60283.rs
+++ b/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
index 34893cd8f19..34893cd8f19 100644
--- a/src/test/ui/issues/issue-60283.stderr
+++ b/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
index bf06765e5dd..bf06765e5dd 100644
--- a/src/test/ui/lambda-var-hygiene.rs
+++ b/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
index 98de014e90b..98de014e90b 100644
--- a/src/test/ui/issues/issue-49579.rs
+++ b/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
index fb328d67b75..fb328d67b75 100644
--- a/src/test/ui/issues/issue-49685.rs
+++ b/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
index 52a2b25539d..52a2b25539d 100644
--- a/src/test/ui/issues/issue-51185.rs
+++ b/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
index 9b2e1fe83c1..9b2e1fe83c1 100644
--- a/src/test/ui/in-band-lifetimes.rs
+++ b/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
index c9e117089f5..c9e117089f5 100644
--- a/src/test/ui/lub-glb-with-unbound-infer-var.rs
+++ b/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 ac0d0506a34..00000000000
--- 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 8df735ac88e..00000000000
--- 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 49dd4fa7360..00000000000
--- 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 fef73fbe1f5..00000000000
--- 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 e6a9451a060..00000000000
--- 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 45cbfef0709..00000000000
--- 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 f929d388819..00000000000
--- 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
index 400ac310b96..400ac310b96 100644
--- a/src/test/ui/issues/issue-19660.rs
+++ b/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
index f5d903f38eb..f5d903f38eb 100644
--- a/src/test/ui/issues/issue-19660.stderr
+++ b/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
index cdb196d4ff2..cdb196d4ff2 100644
--- a/src/test/ui/issues/issue-31076.rs
+++ b/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
index ac0d9dc7528..ac0d9dc7528 100644
--- a/src/test/ui/issues/issue-31076.stderr
+++ b/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
index 3b17c5b7255..3b17c5b7255 100644
--- a/src/test/ui/required-lang-item.rs
+++ b/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
index 83764a91ac7..83764a91ac7 100644
--- a/src/test/ui/required-lang-item.stderr
+++ b/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
index 72fe4286a06..72fe4286a06 100644
--- a/src/test/ui/issues/issue-26638.rs
+++ b/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
index bb7cdcbb100..bb7cdcbb100 100644
--- a/src/test/ui/issues/issue-26638.stderr
+++ b/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
index a83bc415002..a83bc415002 100644
--- a/src/test/ui/issues/issue-14837.rs
+++ b/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
index d825cb18008..d825cb18008 100644
--- a/src/test/ui/issues/issue-57410-1.rs
+++ b/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
index 5223267a69a..5223267a69a 100644
--- a/src/test/ui/issues/issue-63364.rs
+++ b/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
index 0375359aeab..0375359aeab 100644
--- a/src/test/ui/issues/issue-63364.stderr
+++ b/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
index 67eaaf4b6c2..67eaaf4b6c2 100644
--- a/src/test/ui/unnecessary-extern-crate.rs
+++ b/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
index 14ba9d052f4..14ba9d052f4 100644
--- a/src/test/ui/unnecessary-extern-crate.stderr
+++ b/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
index 15d8b09d2ec..15d8b09d2ec 100644
--- a/src/test/ui/warn-ctypes-inhibit.rs
+++ b/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
index d640828c16d..d640828c16d 100644
--- a/src/test/ui/issues/issue-23458.rs
+++ b/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
index 69e458f7ca0..69e458f7ca0 100644
--- a/src/test/ui/issues/issue-23458.stderr
+++ b/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
index acc2f3e9f5f..acc2f3e9f5f 100644
--- a/src/test/ui/issues/issue-37366.rs
+++ b/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
index d9fe7cada27..d9fe7cada27 100644
--- a/src/test/ui/issues/issue-53787-inline-assembler-macro.rs
+++ b/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
index fd755e30d58..fd755e30d58 100644
--- a/src/test/ui/issues/issue-53787-inline-assembler-macro.stderr
+++ b/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
index e910b2a9f96..e910b2a9f96 100644
--- a/src/test/ui/thinlto/all-crates.rs
+++ b/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
index e8b7f8f9f47..e8b7f8f9f47 100644
--- a/src/test/ui/thinlto/auxiliary/dylib.rs
+++ b/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
index ec6d0560357..ec6d0560357 100644
--- a/src/test/ui/auxiliary/lto-duplicate-symbols1.rs
+++ b/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
index ec6d0560357..ec6d0560357 100644
--- a/src/test/ui/auxiliary/lto-duplicate-symbols2.rs
+++ b/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
index d24375b2d0a..d24375b2d0a 100644
--- a/src/test/ui/auxiliary/lto-rustc-loads-linker-plugin.rs
+++ b/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
index 933af050a6a..933af050a6a 100644
--- a/src/test/ui/thinlto/auxiliary/msvc-imp-present.rs
+++ b/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
index 5fd3f1996dd..5fd3f1996dd 100644
--- a/src/test/ui/thinlto/auxiliary/thin-lto-inlines-aux.rs
+++ b/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
index 9e0782b590e..9e0782b590e 100644
--- a/src/test/ui/thinlto/dylib-works.rs
+++ b/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
index f381240e70a..f381240e70a 100644
--- a/src/test/ui/lto-and-no-bitcode-in-rlib.rs
+++ b/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
index 11e370e914c..11e370e914c 100644
--- a/src/test/ui/lto-and-no-bitcode-in-rlib.stderr
+++ b/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
index 268cf261219..268cf261219 100644
--- a/src/test/ui/lto-duplicate-symbols.rs
+++ b/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
index e4de04ef3cc..e4de04ef3cc 100644
--- a/src/test/ui/lto-duplicate-symbols.stderr
+++ b/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
index f0f461ffec8..f0f461ffec8 100644
--- a/src/test/ui/lto-many-codegen-units.rs
+++ b/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
index a7d9d5024d3..a7d9d5024d3 100644
--- a/src/test/ui/lto-opt-level-s.rs
+++ b/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
index bf1f5e2b263..bf1f5e2b263 100644
--- a/src/test/ui/lto-opt-level-z.rs
+++ b/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
index 6ef1d4540b8..6ef1d4540b8 100644
--- a/src/test/ui/lto-rustc-loads-linker-plugin.rs
+++ b/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
index 1c7368b36e1..1c7368b36e1 100644
--- a/src/test/ui/lto-still-runs-thread-dtors.rs
+++ b/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
index 4d54ce32fb5..4d54ce32fb5 100644
--- a/src/test/ui/lto-thin-rustc-loads-linker-plugin.rs
+++ b/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
index 5498afb2937..5498afb2937 100644
--- a/src/test/ui/thinlto/msvc-imp-present.rs
+++ b/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
index e00c5caf97c..e00c5caf97c 100644
--- a/src/test/ui/thin-lto-global-allocator.rs
+++ b/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
index dca7918077e..dca7918077e 100644
--- a/src/test/ui/thinlto/thin-lto-inlines.rs
+++ b/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
index 1eb29657c70..1eb29657c70 100644
--- a/src/test/ui/thinlto/thin-lto-inlines2.rs
+++ b/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
index 163a3870248..163a3870248 100644
--- a/src/test/ui/thinlto/weak-works.rs
+++ b/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
index 0c0d9e43c1d..0c0d9e43c1d 100644
--- a/src/test/ui/issues/auxiliary/issue-19163.rs
+++ b/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
index 00acc20fc9e..00acc20fc9e 100644
--- a/src/test/ui/issues/issue-16098.rs
+++ b/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
index 64280219d75..64280219d75 100644
--- a/src/test/ui/issues/issue-16098.stderr
+++ b/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
index d98c5912af2..d98c5912af2 100644
--- a/src/test/ui/issues/issue-19163.rs
+++ b/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
index ae1ae14266f..ae1ae14266f 100644
--- a/src/test/ui/issues/issue-19163.stderr
+++ b/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
index ae623929d63..ae623929d63 100644
--- a/src/test/ui/issues/issue-21356.rs
+++ b/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
index 17014c6ceee..17014c6ceee 100644
--- a/src/test/ui/issues/issue-21356.stderr
+++ b/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
index fdf5a2fca72..fdf5a2fca72 100644
--- a/src/test/ui/issues/issue-22463.rs
+++ b/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
index d1625268669..d1625268669 100644
--- a/src/test/ui/issues/issue-29084.rs
+++ b/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
index a973e23e29e..a973e23e29e 100644
--- a/src/test/ui/issues/issue-29084.stderr
+++ b/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
index 157c58c459d..157c58c459d 100644
--- a/src/test/ui/issues/issue-34171.rs
+++ b/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
index 9ec9d48d18b..9ec9d48d18b 100644
--- a/src/test/ui/issues/issue-37175.rs
+++ b/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
index a8e31a648c9..a8e31a648c9 100644
--- a/src/test/ui/issues/issue-39388.rs
+++ b/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
index 62e7dff5476..62e7dff5476 100644
--- a/src/test/ui/issues/issue-39388.stderr
+++ b/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
index c9713c15798..c9713c15798 100644
--- a/src/test/ui/issues/issue-40770.rs
+++ b/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
index ebeb3fe07ad..ebeb3fe07ad 100644
--- a/src/test/ui/issues/issue-57597.rs
+++ b/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
index 0a02ac8c499..0a02ac8c499 100644
--- a/src/test/ui/issues/issue-57597.stderr
+++ b/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
index 25f1d650072..25f1d650072 100644
--- a/src/test/ui/issues/issue-6596-1.rs
+++ b/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
index 7ab3685c5cb..7ab3685c5cb 100644
--- a/src/test/ui/issues/issue-6596-1.stderr
+++ b/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
index 01e0a20a511..01e0a20a511 100644
--- a/src/test/ui/issues/issue-86865.rs
+++ b/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
index eed75536631..eed75536631 100644
--- a/src/test/ui/issues/issue-86865.stderr
+++ b/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
index afca45ca0f2..afca45ca0f2 100644
--- a/src/test/ui/trace_macros-format.rs
+++ b/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
index c32027086aa..c32027086aa 100644
--- a/src/test/ui/trace_macros-format.stderr
+++ b/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
index 1e413120a37..1e413120a37 100644
--- a/src/test/ui/overlap-doesnt-conflict-with-specialization.rs
+++ b/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
index fca98662708..fca98662708 100644
--- a/src/test/ui/overlap-doesnt-conflict-with-specialization.stderr
+++ b/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
index 38331390237..38331390237 100644
--- 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
diff --git a/src/test/ui/issues/issue-11940.rs b/src/test/ui/match/issue-11940.rs
index 6815c87edd8..6815c87edd8 100644
--- a/src/test/ui/issues/issue-11940.rs
+++ b/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
index b5f3d0f74bc..b5f3d0f74bc 100644
--- a/src/test/ui/issues/issue-18060.rs
+++ b/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
index a3e26a41232..a3e26a41232 100644
--- a/src/test/ui/issues/issue-26251.rs
+++ b/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
index 84037b72a27..84037b72a27 100644
--- a/src/test/ui/issues/issue-26996.rs
+++ b/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
index 596309f2568..596309f2568 100644
--- a/src/test/ui/issues/issue-42679.rs
+++ b/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
index 03622358ae1..03622358ae1 100644
--- a/src/test/ui/issues/issue-74739.rs
+++ b/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 9601e9118aa..00000000000
--- 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
index 0cde6119308..0cde6119308 100644
--- a/src/test/ui/diverging-tuple-parts-39485.rs
+++ b/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
index 32967b376ca..32967b376ca 100644
--- a/src/test/ui/diverging-tuple-parts-39485.stderr
+++ b/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
index a4d0a849484..a4d0a849484 100644
--- a/src/test/ui/unary-minus-suffix-inference.rs
+++ b/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
index fb1c9fb78f3..fb1c9fb78f3 100644
--- a/src/test/ui/issues/issue-45152.rs
+++ b/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
index e12857008a5..e12857008a5 100644
--- a/src/test/ui/bastion-of-the-turbofish.rs
+++ b/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
index a2fd9264b15..a2fd9264b15 100644
--- a/src/test/ui/issues/issue-13483.rs
+++ b/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
index 5fd05b18ce0..5fd05b18ce0 100644
--- a/src/test/ui/issues/issue-13483.stderr
+++ b/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
index a71f47ca4bf..a71f47ca4bf 100644
--- a/src/test/ui/issues/issue-20616-4.rs
+++ b/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
index 2b3b75f3119..2b3b75f3119 100644
--- a/src/test/ui/issues/issue-20616-4.stderr
+++ b/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
index b96d09d59ae..b96d09d59ae 100644
--- a/src/test/ui/issues/issue-20616-5.rs
+++ b/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
index 1ec1dbde695..1ec1dbde695 100644
--- a/src/test/ui/issues/issue-20616-5.stderr
+++ b/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
index a2c45ecec7a..a2c45ecec7a 100644
--- a/src/test/ui/issues/issue-20616-6.rs
+++ b/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
index 7401abdd091..7401abdd091 100644
--- a/src/test/ui/issues/issue-20616-6.stderr
+++ b/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
index 67209c02adf..67209c02adf 100644
--- a/src/test/ui/issues/issue-20616-7.rs
+++ b/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
index e2c3efe8447..e2c3efe8447 100644
--- a/src/test/ui/issues/issue-20616-7.stderr
+++ b/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
index b028fcae077..b028fcae077 100644
--- a/src/test/ui/issues/issue-21475.rs
+++ b/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
index d056b77cf09..d056b77cf09 100644
--- a/src/test/ui/issues/issue-31804.rs
+++ b/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
index 76e68b0b352..76e68b0b352 100644
--- a/src/test/ui/issues/issue-31804.stderr
+++ b/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
index c70cd8b5077..c70cd8b5077 100644
--- a/src/test/ui/issues/issue-34255-1.rs
+++ b/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
index fbff75e37d9..fbff75e37d9 100644
--- a/src/test/ui/issues/issue-34255-1.stderr
+++ b/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
index b7a541dd664..b7a541dd664 100644
--- a/src/test/ui/issues/issue-49040.rs
+++ b/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
index 56befe3a0a7..56befe3a0a7 100644
--- a/src/test/ui/issues/issue-49040.stderr
+++ b/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
index b68f5681467..b68f5681467 100644
--- a/src/test/ui/issues/issue-56031.rs
+++ b/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
index 7ee5bc6ec61..7ee5bc6ec61 100644
--- a/src/test/ui/issues/issue-56031.stderr
+++ b/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
index 70177c5ed0d..70177c5ed0d 100644
--- a/src/test/ui/issues/issue-11577.rs
+++ b/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
index 4dd6981d448..4dd6981d448 100644
--- a/src/test/ui/issues/issue-15080.rs
+++ b/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
index 0ad2db848b2..0ad2db848b2 100644
--- a/src/test/ui/issues/issue-72574-2.rs
+++ b/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
index 05650f05cbf..05650f05cbf 100644
--- a/src/test/ui/issues/issue-72574-2.stderr
+++ b/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
index 139f027cb90..139f027cb90 100644
--- a/src/test/ui/issues/issue-8351-1.rs
+++ b/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
index bc66cbb77c0..bc66cbb77c0 100644
--- a/src/test/ui/issues/issue-8351-2.rs
+++ b/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
index 52a56eb77f7..52a56eb77f7 100644
--- a/src/test/ui/issues/issue-14456.rs
+++ b/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
index 5cf3fd94928..5cf3fd94928 100644
--- a/src/test/ui/issues/issue-16272.rs
+++ b/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
index 86cc79d6b42..86cc79d6b42 100644
--- a/src/test/ui/issues/issue-20091.rs
+++ b/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
index 0963dcc80f6..0963dcc80f6 100644
--- a/src/test/ui/signal-exit-status.rs
+++ b/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
index ab4ac7237c7..ab4ac7237c7 100644
--- a/src/test/ui/issues/issue-21520.rs
+++ b/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
index 7d2d75bf2e8..7d2d75bf2e8 100644
--- a/src/test/ui/issues/issue-26448-1.rs
+++ b/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
index c60e06c3ceb..c60e06c3ceb 100644
--- a/src/test/ui/issues/issue-26448-2.rs
+++ b/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
index d48022c09fe..d48022c09fe 100644
--- a/src/test/ui/issues/issue-26448-3.rs
+++ b/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
index 4c890e3ae69..4c890e3ae69 100644
--- a/src/test/ui/editions-crate-root-2015.rs
+++ b/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
index f8d65fec3d1..f8d65fec3d1 100644
--- a/src/test/ui/editions-crate-root-2015.stderr
+++ b/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
index 942d6b9a568..942d6b9a568 100644
--- a/src/test/ui/issues/issue-12796.rs
+++ b/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
index a01fd2d6542..a01fd2d6542 100644
--- a/src/test/ui/issues/issue-12796.stderr
+++ b/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
index e9139c0aa14..e9139c0aa14 100644
--- a/src/test/ui/issues/issue-23716.rs
+++ b/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
index e7bebfbbcb5..e7bebfbbcb5 100644
--- a/src/test/ui/issues/issue-23716.stderr
+++ b/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
index 94ed1fdf781..94ed1fdf781 100644
--- a/src/test/ui/issues/issue-3021-c.rs
+++ b/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
index 8764ac8a856..8764ac8a856 100644
--- a/src/test/ui/issues/issue-3021-c.stderr
+++ b/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
index a672261f8d6..a672261f8d6 100644
--- a/src/test/ui/issues/issue-3021.rs
+++ b/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
index d5b015eec35..d5b015eec35 100644
--- a/src/test/ui/issues/issue-3021.stderr
+++ b/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
index f6dc11502ba..f6dc11502ba 100644
--- a/src/test/ui/issues/issue-31845.rs
+++ b/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
index 56281938559..56281938559 100644
--- a/src/test/ui/issues/issue-31845.stderr
+++ b/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
index b5abccb4b19..b5abccb4b19 100644
--- a/src/test/ui/issues/issue-5099.rs
+++ b/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
index e9b2a9c4d48..e9b2a9c4d48 100644
--- a/src/test/ui/issues/issue-5099.stderr
+++ b/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
index 0260caa82cb..0260caa82cb 100644
--- a/src/test/ui/issues/issue-6804.rs
+++ b/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
index 4e2961e5e23..4e2961e5e23 100644
--- a/src/test/ui/issues/issue-6804.stderr
+++ b/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
index 1209b54bc41..1209b54bc41 100644
--- a/src/test/ui/issues/issue-61882-2.rs
+++ b/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
index 0b8e134c966..0b8e134c966 100644
--- a/src/test/ui/issues/issue-61882-2.stderr
+++ b/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
index 013398b4598..013398b4598 100644
--- a/src/test/ui/issues/issue-61882.rs
+++ b/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
index 09ffe8e64b1..09ffe8e64b1 100644
--- a/src/test/ui/issues/issue-61882.stderr
+++ b/src/test/ui/self/issue-61882.stderr
diff --git a/src/test/ui/transmute-specialization.rs b/src/test/ui/specialization/transmute-specialization.rs
index 499334d983b..499334d983b 100644
--- a/src/test/ui/transmute-specialization.rs
+++ b/src/test/ui/specialization/transmute-specialization.rs
diff --git a/src/test/ui/transmute-specialization.stderr b/src/test/ui/specialization/transmute-specialization.stderr
index a0ea72415a1..a0ea72415a1 100644
--- a/src/test/ui/transmute-specialization.stderr
+++ b/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
index 9db9d19d6f6..9db9d19d6f6 100644
--- a/src/test/ui/auxiliary/nested_item.rs
+++ b/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
index 2fe00aede00..2fe00aede00 100644
--- a/src/test/ui/nested_item_main.rs
+++ b/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
index 8e7a2514dd6..8e7a2514dd6 100644
--- a/src/test/ui/issues/issue-14227.mir.stderr
+++ b/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
index 5f866ec9061..5f866ec9061 100644
--- a/src/test/ui/issues/issue-14227.rs
+++ b/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
index 8e7a2514dd6..8e7a2514dd6 100644
--- a/src/test/ui/issues/issue-14227.thir.stderr
+++ b/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
index 209c1e1279b..209c1e1279b 100644
--- a/src/test/ui/issues/issue-50731.rs
+++ b/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
index bc0559b8b80..bc0559b8b80 100644
--- a/src/test/ui/auxiliary/changing-crates-a1.rs
+++ b/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
index fafc6d5b169..fafc6d5b169 100644
--- a/src/test/ui/auxiliary/changing-crates-a2.rs
+++ b/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
index f9ce29e4c4c..f9ce29e4c4c 100644
--- a/src/test/ui/auxiliary/changing-crates-b.rs
+++ b/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
index 60c043bc43f..60c043bc43f 100644
--- a/src/test/ui/changing-crates.rs
+++ b/src/test/ui/svh/changing-crates.rs
diff --git a/src/test/ui/changing-crates.stderr b/src/test/ui/svh/changing-crates.stderr
index cc62a4d4d9d..cc62a4d4d9d 100644
--- a/src/test/ui/changing-crates.stderr
+++ b/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
index 9e209d5d33a..9e209d5d33a 100644
--- a/src/test/ui/issues/issue-20823.rs
+++ b/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
index c28b4ca9601..c28b4ca9601 100644
--- a/src/test/ui/issues/issue-24313.rs
+++ b/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
index 27d0326891b..27d0326891b 100644
--- a/src/test/ui/issues/issue-4448.rs
+++ b/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
index 95be7616a4f..95be7616a4f 100644
--- a/src/test/ui/issues/issue-8827.rs
+++ b/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
index 3e7e9a51cdd..3e7e9a51cdd 100644
--- a/src/test/ui/issues/issue-9396.rs
+++ b/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
index 5831e867be5..5831e867be5 100644
--- a/src/test/ui/trivial-message.rs
+++ b/src/test/ui/threads-sendsync/trivial-message.rs
diff --git a/src/test/ui/yield2.rs b/src/test/ui/threads-sendsync/yield2.rs
index 376faab0c48..376faab0c48 100644
--- a/src/test/ui/yield2.rs
+++ b/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
index f1818533487..f1818533487 100644
--- a/src/test/ui/issues/issue-24010.rs
+++ b/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
index 002a3c43fcb..002a3c43fcb 100644
--- a/src/test/ui/issues/issue-38604.rs
+++ b/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
index d41488c15f7..d41488c15f7 100644
--- a/src/test/ui/issues/issue-38604.stderr
+++ b/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
index a5ed5b87051..a5ed5b87051 100644
--- a/src/test/ui/issues/issue-3973.rs
+++ b/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
index 63282e8d86d..63282e8d86d 100644
--- a/src/test/ui/issues/issue-3973.stderr
+++ b/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
index 8ab47a4af1d..8ab47a4af1d 100644
--- a/src/test/ui/issues/issue-59029-1.rs
+++ b/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
index 53cdb8b1baf..53cdb8b1baf 100644
--- a/src/test/ui/issues/issue-59029-1.stderr
+++ b/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
index b6c3bb22287..b6c3bb22287 100644
--- a/src/test/ui/issues/issue-72455.rs
+++ b/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
index b3b679813c9..b3b679813c9 100644
--- a/src/test/ui/object-does-not-impl-trait.rs
+++ b/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
index f1dd508a467..f1dd508a467 100644
--- a/src/test/ui/object-does-not-impl-trait.stderr
+++ b/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
index ed2947493b0..ed2947493b0 100644
--- a/src/test/ui/syntax-trait-polarity.rs
+++ b/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
index 1fd40fb6657..1fd40fb6657 100644
--- a/src/test/ui/syntax-trait-polarity.stderr
+++ b/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
index 942014c9184..942014c9184 100644
--- a/src/test/ui/issues/issue-45124.rs
+++ b/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
index b9faa668b80..b9faa668b80 100644
--- a/src/test/ui/issues/issue-60662.rs
+++ b/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
index 14a49f20e6b..14a49f20e6b 100644
--- a/src/test/ui/issues/issue-60662.stdout
+++ b/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
index 42315332c20..42315332c20 100644
--- a/src/test/ui/issues/issue-30225.rs
+++ b/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
index ccd05fa6bfb..ccd05fa6bfb 100644
--- a/src/test/ui/issues/issue-30225.stderr
+++ b/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
index 9ab570fd170..9ab570fd170 100644
--- a/src/test/ui/issues/auxiliary/xcrate-issue-43189-a.rs
+++ b/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
index 31dfb050b27..31dfb050b27 100644
--- a/src/test/ui/issues/auxiliary/xcrate-issue-43189-b.rs
+++ b/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
index 2b517b5784a..2b517b5784a 100644
--- a/src/test/ui/issues/auxiliary/xcrate-issue-46112-rexport-core.rs
+++ b/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
index 88a040529e7..88a040529e7 100644
--- a/src/test/ui/issues/auxiliary/xcrate-issue-61711-b.rs
+++ b/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
index ce667a5006e..ce667a5006e 100644
--- a/src/test/ui/issues/issue-43189.rs
+++ b/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
index caf7530b85a..caf7530b85a 100644
--- a/src/test/ui/issues/issue-43189.stderr
+++ b/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
index 0cdd2c27ff7..0cdd2c27ff7 100644
--- a/src/test/ui/issues/issue-46112.rs
+++ b/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
index ec05fbe580e..ec05fbe580e 100644
--- a/src/test/ui/issues/issue-46112.stderr
+++ b/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
index de7d6a0d80c..de7d6a0d80c 100644
--- 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
diff --git a/src/test/ui/issues/issue-18652.rs b/src/test/ui/unboxed-closures/issue-18652.rs
index 59aa0156842..59aa0156842 100644
--- a/src/test/ui/issues/issue-18652.rs
+++ b/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
index 6ff5b37f6e5..6ff5b37f6e5 100644
--- a/src/test/ui/issues/issue-30355.rs
+++ b/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
index 71bbdf5dec7..71bbdf5dec7 100644
--- a/src/test/ui/issues/issue-30355.stderr
+++ b/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 4afa36502ac..88ede45655c 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"))