Auto merge of #80539 - JohnTitor:ui-test-root-cleanup, r=petrochenkov

Reduce the entry on `src/test/ui` (UI test root)

CC #73494, similar to #79776.

r? `@petrochenkov`

143 files changed, 20 insertions, 28 deletions

diff --git a/src/test/ui/array-break-length.rs b/src/test/ui/array-slice-vec/array-break-length.rs
index 60589f7c264..60589f7c264 100644
--- a/src/test/ui/array-break-length.rs
+++ b/src/test/ui/array-slice-vec/array-break-length.rs
diff --git a/src/test/ui/array-break-length.stderr b/src/test/ui/array-slice-vec/array-break-length.stderr
index 93f1c238bcc..93f1c238bcc 100644
--- a/src/test/ui/array-break-length.stderr
+++ b/src/test/ui/array-slice-vec/array-break-length.stderr
diff --git a/src/test/ui/array-not-vector.rs b/src/test/ui/array-slice-vec/array-not-vector.rs
index 5e46f015baf..5e46f015baf 100644
--- a/src/test/ui/array-not-vector.rs
+++ b/src/test/ui/array-slice-vec/array-not-vector.rs
diff --git a/src/test/ui/array-not-vector.stderr b/src/test/ui/array-slice-vec/array-not-vector.stderr
index 0e187d9072a..0e187d9072a 100644
--- a/src/test/ui/array-not-vector.stderr
+++ b/src/test/ui/array-slice-vec/array-not-vector.stderr
diff --git a/src/test/ui/array_const_index-0.rs b/src/test/ui/array-slice-vec/array_const_index-0.rs
index 4021dfcc6eb..4021dfcc6eb 100644
--- a/src/test/ui/array_const_index-0.rs
+++ b/src/test/ui/array-slice-vec/array_const_index-0.rs
diff --git a/src/test/ui/array_const_index-0.stderr b/src/test/ui/array-slice-vec/array_const_index-0.stderr
index 7ccc3aa087e..7ccc3aa087e 100644
--- a/src/test/ui/array_const_index-0.stderr
+++ b/src/test/ui/array-slice-vec/array_const_index-0.stderr
diff --git a/src/test/ui/array-slice-vec/array_const_index-1.rs b/src/test/ui/array-slice-vec/array_const_index-1.rs
index 8ee225f5cdf..d0ee1796c0f 100644
--- a/src/test/ui/array-slice-vec/array_const_index-1.rs
+++ b/src/test/ui/array-slice-vec/array_const_index-1.rs
@@ -1,12 +1,8 @@
-// run-pass
-#![allow(dead_code)]
-#![allow(stable_features)]
-
-#![feature(const_indexing)]
+const A: [i32; 0] = [];
+const B: i32 = A[1];
+//~^ index out of bounds: the length is 0 but the index is 1
+//~| ERROR any use of this value will cause an error
 
 fn main() {
-    const ARR: [i32; 6] = [42, 43, 44, 45, 46, 47];
-    const IDX: usize = 3;
-    const VAL: i32 = ARR[IDX];
-    const BLUB: [i32; (ARR[0] - 41) as usize] = [5];
+    let _ = B;
 }
diff --git a/src/test/ui/array_const_index-1.stderr b/src/test/ui/array-slice-vec/array_const_index-1.stderr
index 37de61b9df0..37de61b9df0 100644
--- a/src/test/ui/array_const_index-1.stderr
+++ b/src/test/ui/array-slice-vec/array_const_index-1.stderr
diff --git a/src/test/ui/array-slice-vec/array_const_index-2.rs b/src/test/ui/array-slice-vec/array_const_index-2.rs
new file mode 100644
index 00000000000..8ee225f5cdf
--- /dev/null
+++ b/src/test/ui/array-slice-vec/array_const_index-2.rs
@@ -0,0 +1,12 @@
+// run-pass
+#![allow(dead_code)]
+#![allow(stable_features)]
+
+#![feature(const_indexing)]
+
+fn main() {
+    const ARR: [i32; 6] = [42, 43, 44, 45, 46, 47];
+    const IDX: usize = 3;
+    const VAL: i32 = ARR[IDX];
+    const BLUB: [i32; (ARR[0] - 41) as usize] = [5];
+}
diff --git a/src/test/ui/slice-2.rs b/src/test/ui/array-slice-vec/slice-2.rs
index 5423e295a87..5423e295a87 100644
--- a/src/test/ui/slice-2.rs
+++ b/src/test/ui/array-slice-vec/slice-2.rs
diff --git a/src/test/ui/slice-2.stderr b/src/test/ui/array-slice-vec/slice-2.stderr
index 561feb90f0a..561feb90f0a 100644
--- a/src/test/ui/slice-2.stderr
+++ b/src/test/ui/array-slice-vec/slice-2.stderr
diff --git a/src/test/ui/slice-mut-2.rs b/src/test/ui/array-slice-vec/slice-mut-2.rs
index 216edbb7808..216edbb7808 100644
--- a/src/test/ui/slice-mut-2.rs
+++ b/src/test/ui/array-slice-vec/slice-mut-2.rs
diff --git a/src/test/ui/slice-mut-2.stderr b/src/test/ui/array-slice-vec/slice-mut-2.stderr
index bad0268772b..bad0268772b 100644
--- a/src/test/ui/slice-mut-2.stderr
+++ b/src/test/ui/array-slice-vec/slice-mut-2.stderr
diff --git a/src/test/ui/slice-mut.rs b/src/test/ui/array-slice-vec/slice-mut.rs
index e9989f0f481..e9989f0f481 100644
--- a/src/test/ui/slice-mut.rs
+++ b/src/test/ui/array-slice-vec/slice-mut.rs
diff --git a/src/test/ui/slice-mut.stderr b/src/test/ui/array-slice-vec/slice-mut.stderr
index 7d34defc1d5..7d34defc1d5 100644
--- a/src/test/ui/slice-mut.stderr
+++ b/src/test/ui/array-slice-vec/slice-mut.stderr
diff --git a/src/test/ui/slice-to-vec-comparison.rs b/src/test/ui/array-slice-vec/slice-to-vec-comparison.rs
index 7026a49000c..7026a49000c 100644
--- a/src/test/ui/slice-to-vec-comparison.rs
+++ b/src/test/ui/array-slice-vec/slice-to-vec-comparison.rs
diff --git a/src/test/ui/slice-to-vec-comparison.stderr b/src/test/ui/array-slice-vec/slice-to-vec-comparison.stderr
index e3b3b040f66..e3b3b040f66 100644
--- a/src/test/ui/slice-to-vec-comparison.stderr
+++ b/src/test/ui/array-slice-vec/slice-to-vec-comparison.stderr
diff --git a/src/test/ui/vec/vec-macro-with-comma-only.rs b/src/test/ui/array-slice-vec/vec-macro-with-comma-only.rs
index 574a53c58fe..574a53c58fe 100644
--- a/src/test/ui/vec/vec-macro-with-comma-only.rs
+++ b/src/test/ui/array-slice-vec/vec-macro-with-comma-only.rs
diff --git a/src/test/ui/vec/vec-macro-with-comma-only.stderr b/src/test/ui/array-slice-vec/vec-macro-with-comma-only.stderr
index abbee347c00..abbee347c00 100644
--- a/src/test/ui/vec/vec-macro-with-comma-only.stderr
+++ b/src/test/ui/array-slice-vec/vec-macro-with-comma-only.stderr
diff --git a/src/test/ui/vec/vec-mut-iter-borrow.rs b/src/test/ui/array-slice-vec/vec-mut-iter-borrow.rs
index 4aa737446b5..4aa737446b5 100644
--- a/src/test/ui/vec/vec-mut-iter-borrow.rs
+++ b/src/test/ui/array-slice-vec/vec-mut-iter-borrow.rs
diff --git a/src/test/ui/vec/vec-mut-iter-borrow.stderr b/src/test/ui/array-slice-vec/vec-mut-iter-borrow.stderr
index 679fd899773..679fd899773 100644
--- a/src/test/ui/vec/vec-mut-iter-borrow.stderr
+++ b/src/test/ui/array-slice-vec/vec-mut-iter-borrow.stderr
diff --git a/src/test/ui/vec/vec-overrun.rs b/src/test/ui/array-slice-vec/vec-overrun.rs
index bdc7d507d53..bdc7d507d53 100644
--- a/src/test/ui/vec/vec-overrun.rs
+++ b/src/test/ui/array-slice-vec/vec-overrun.rs
diff --git a/src/test/ui/vec/vec-res-add.rs b/src/test/ui/array-slice-vec/vec-res-add.rs
index 57b552ee558..57b552ee558 100644
--- a/src/test/ui/vec/vec-res-add.rs
+++ b/src/test/ui/array-slice-vec/vec-res-add.rs
diff --git a/src/test/ui/vec/vec-res-add.stderr b/src/test/ui/array-slice-vec/vec-res-add.stderr
index 7511271361d..7511271361d 100644
--- a/src/test/ui/vec/vec-res-add.stderr
+++ b/src/test/ui/array-slice-vec/vec-res-add.stderr
diff --git a/src/test/ui/vector-cast-weirdness.rs b/src/test/ui/array-slice-vec/vector-cast-weirdness.rs
index 79b9243765b..79b9243765b 100644
--- a/src/test/ui/vector-cast-weirdness.rs
+++ b/src/test/ui/array-slice-vec/vector-cast-weirdness.rs
diff --git a/src/test/ui/vector-cast-weirdness.stderr b/src/test/ui/array-slice-vec/vector-cast-weirdness.stderr
index 37055bb75f5..37055bb75f5 100644
--- a/src/test/ui/vector-cast-weirdness.stderr
+++ b/src/test/ui/array-slice-vec/vector-cast-weirdness.stderr
diff --git a/src/test/ui/vector-no-ann.rs b/src/test/ui/array-slice-vec/vector-no-ann.rs
index 1f11d9c8dff..1f11d9c8dff 100644
--- a/src/test/ui/vector-no-ann.rs
+++ b/src/test/ui/array-slice-vec/vector-no-ann.rs
diff --git a/src/test/ui/vector-no-ann.stderr b/src/test/ui/array-slice-vec/vector-no-ann.stderr
index 8a7b8d22760..8a7b8d22760 100644
--- a/src/test/ui/vector-no-ann.stderr
+++ b/src/test/ui/array-slice-vec/vector-no-ann.stderr
diff --git a/src/test/ui/array_const_index-1.rs b/src/test/ui/array_const_index-1.rs
deleted file mode 100644
index d0ee1796c0f..00000000000
--- a/src/test/ui/array_const_index-1.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-const A: [i32; 0] = [];
-const B: i32 = A[1];
-//~^ index out of bounds: the length is 0 but the index is 1
-//~| ERROR any use of this value will cause an error
-
-fn main() {
-    let _ = B;
-}
diff --git a/src/test/ui/auxiliary/trait_superkinds_in_metadata.rs b/src/test/ui/auxiliary/trait_superkinds_in_metadata.rs
deleted file mode 100644
index acfd1e13e93..00000000000
--- a/src/test/ui/auxiliary/trait_superkinds_in_metadata.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Test library crate for cross-crate usages of traits inheriting
-// from the builtin kinds. Mostly tests metadata correctness.
-
-#![crate_type="lib"]
-
-pub trait RequiresShare : Sync { }
-pub trait RequiresRequiresShareAndSend : RequiresShare + Send { }
-pub trait RequiresCopy : Copy { }
diff --git a/src/test/ui/binary-minus-without-space.rs b/src/test/ui/binop/binary-minus-without-space.rs
index 2fbd5300dd1..2fbd5300dd1 100644
--- a/src/test/ui/binary-minus-without-space.rs
+++ b/src/test/ui/binop/binary-minus-without-space.rs
diff --git a/src/test/ui/binary-op-on-double-ref.fixed b/src/test/ui/binop/binary-op-on-double-ref.fixed
index de9dc19af29..de9dc19af29 100644
--- a/src/test/ui/binary-op-on-double-ref.fixed
+++ b/src/test/ui/binop/binary-op-on-double-ref.fixed
diff --git a/src/test/ui/binary-op-on-double-ref.rs b/src/test/ui/binop/binary-op-on-double-ref.rs
index 2616c560cbe..2616c560cbe 100644
--- a/src/test/ui/binary-op-on-double-ref.rs
+++ b/src/test/ui/binop/binary-op-on-double-ref.rs
diff --git a/src/test/ui/binary-op-on-double-ref.stderr b/src/test/ui/binop/binary-op-on-double-ref.stderr
index 02b0488488c..02b0488488c 100644
--- a/src/test/ui/binary-op-on-double-ref.stderr
+++ b/src/test/ui/binop/binary-op-on-double-ref.stderr
diff --git a/src/test/ui/binops-issue-22743.rs b/src/test/ui/binop/binops-issue-22743.rs
index 393ba0a56cb..393ba0a56cb 100644
--- a/src/test/ui/binops-issue-22743.rs
+++ b/src/test/ui/binop/binops-issue-22743.rs
diff --git a/src/test/ui/binops.rs b/src/test/ui/binop/binops.rs
index a7abf6087b3..a7abf6087b3 100644
--- a/src/test/ui/binops.rs
+++ b/src/test/ui/binop/binops.rs
diff --git a/src/test/ui/builtin-superkinds-capabilities-transitive.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-capabilities-transitive.rs
index 1f997d37122..1f997d37122 100644
--- a/src/test/ui/builtin-superkinds-capabilities-transitive.rs
+++ b/src/test/ui/builtin-superkinds/builtin-superkinds-capabilities-transitive.rs
diff --git a/src/test/ui/builtin-superkinds-capabilities-xc.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-capabilities-xc.rs
index 8416bb3a377..8416bb3a377 100644
--- a/src/test/ui/builtin-superkinds-capabilities-xc.rs
+++ b/src/test/ui/builtin-superkinds/builtin-superkinds-capabilities-xc.rs
diff --git a/src/test/ui/builtin-superkinds-capabilities.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-capabilities.rs
index e936f921a82..e936f921a82 100644
--- a/src/test/ui/builtin-superkinds-capabilities.rs
+++ b/src/test/ui/builtin-superkinds/builtin-superkinds-capabilities.rs
diff --git a/src/test/ui/builtin-superkinds-in-metadata.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata2.rs
index 117014b44ee..117014b44ee 100644
--- a/src/test/ui/builtin-superkinds-in-metadata.rs
+++ b/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata2.rs
diff --git a/src/test/ui/builtin-superkinds-phantom-typaram.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-phantom-typaram.rs
index 9b80664b04e..9b80664b04e 100644
--- a/src/test/ui/builtin-superkinds-phantom-typaram.rs
+++ b/src/test/ui/builtin-superkinds/builtin-superkinds-phantom-typaram.rs
diff --git a/src/test/ui/builtin-superkinds-simple.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-simple2.rs
index 8d247715784..8d247715784 100644
--- a/src/test/ui/builtin-superkinds-simple.rs
+++ b/src/test/ui/builtin-superkinds/builtin-superkinds-simple2.rs
diff --git a/src/test/ui/builtin-superkinds-typaram.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-typaram.rs
index f999dfff786..f999dfff786 100644
--- a/src/test/ui/builtin-superkinds-typaram.rs
+++ b/src/test/ui/builtin-superkinds/builtin-superkinds-typaram.rs
diff --git a/src/test/ui/cast-char.rs b/src/test/ui/cast/cast-char.rs
index 9634ed56f7b..9634ed56f7b 100644
--- a/src/test/ui/cast-char.rs
+++ b/src/test/ui/cast/cast-char.rs
diff --git a/src/test/ui/cast-char.stderr b/src/test/ui/cast/cast-char.stderr
index 211937c9d6f..211937c9d6f 100644
--- a/src/test/ui/cast-char.stderr
+++ b/src/test/ui/cast/cast-char.stderr
diff --git a/src/test/ui/cast-does-fallback.rs b/src/test/ui/cast/cast-does-fallback.rs
index 770f7a31c76..770f7a31c76 100644
--- a/src/test/ui/cast-does-fallback.rs
+++ b/src/test/ui/cast/cast-does-fallback.rs
diff --git a/src/test/ui/cast-region-to-uint.rs b/src/test/ui/cast/cast-region-to-uint.rs
index 33ec2d27610..33ec2d27610 100644
--- a/src/test/ui/cast-region-to-uint.rs
+++ b/src/test/ui/cast/cast-region-to-uint.rs
diff --git a/src/test/ui/cast-rfc0401-vtable-kinds.rs b/src/test/ui/cast/cast-rfc0401-vtable-kinds.rs
index 249481467e6..249481467e6 100644
--- a/src/test/ui/cast-rfc0401-vtable-kinds.rs
+++ b/src/test/ui/cast/cast-rfc0401-vtable-kinds.rs
diff --git a/src/test/ui/cast-rfc0401.rs b/src/test/ui/cast/cast-rfc0401.rs
index 996fa013fed..996fa013fed 100644
--- a/src/test/ui/cast-rfc0401.rs
+++ b/src/test/ui/cast/cast-rfc0401.rs
diff --git a/src/test/ui/cast-to-infer-ty.rs b/src/test/ui/cast/cast-to-infer-ty.rs
index 053ebb621a7..053ebb621a7 100644
--- a/src/test/ui/cast-to-infer-ty.rs
+++ b/src/test/ui/cast/cast-to-infer-ty.rs
diff --git a/src/test/ui/cast.rs b/src/test/ui/cast/cast.rs
index 218275c4d99..218275c4d99 100644
--- a/src/test/ui/cast.rs
+++ b/src/test/ui/cast/cast.rs
diff --git a/src/test/ui/casts-differing-anon.rs b/src/test/ui/cast/casts-differing-anon.rs
index d4a0f961305..d4a0f961305 100644
--- a/src/test/ui/casts-differing-anon.rs
+++ b/src/test/ui/cast/casts-differing-anon.rs
diff --git a/src/test/ui/casts-differing-anon.stderr b/src/test/ui/cast/casts-differing-anon.stderr
index a30e9b35f5c..a30e9b35f5c 100644
--- a/src/test/ui/casts-differing-anon.stderr
+++ b/src/test/ui/cast/casts-differing-anon.stderr
diff --git a/src/test/ui/casts-issue-46365.rs b/src/test/ui/cast/casts-issue-46365.rs
index 3d0fea245c0..3d0fea245c0 100644
--- a/src/test/ui/casts-issue-46365.rs
+++ b/src/test/ui/cast/casts-issue-46365.rs
diff --git a/src/test/ui/casts-issue-46365.stderr b/src/test/ui/cast/casts-issue-46365.stderr
index 84175473696..84175473696 100644
--- a/src/test/ui/casts-issue-46365.stderr
+++ b/src/test/ui/cast/casts-issue-46365.stderr
diff --git a/src/test/ui/block-arg-call-as.rs b/src/test/ui/closures/old-closure-arg-call-as.rs
index 87cf3a487bf..87cf3a487bf 100644
--- a/src/test/ui/block-arg-call-as.rs
+++ b/src/test/ui/closures/old-closure-arg-call-as.rs
diff --git a/src/test/ui/block-arg.rs b/src/test/ui/closures/old-closure-arg.rs
index bd1385e5c33..bd1385e5c33 100644
--- a/src/test/ui/block-arg.rs
+++ b/src/test/ui/closures/old-closure-arg.rs
diff --git a/src/test/ui/block-explicit-types.rs b/src/test/ui/closures/old-closure-explicit-types.rs
index 860fcc8df21..860fcc8df21 100644
--- a/src/test/ui/block-explicit-types.rs
+++ b/src/test/ui/closures/old-closure-explicit-types.rs
diff --git a/src/test/ui/block-expr-precedence.rs b/src/test/ui/closures/old-closure-expr-precedence.rs
index 13b2fe9c3d1..13b2fe9c3d1 100644
--- a/src/test/ui/block-expr-precedence.rs
+++ b/src/test/ui/closures/old-closure-expr-precedence.rs
diff --git a/src/test/ui/block-expr-precedence.stderr b/src/test/ui/closures/old-closure-expr-precedence.stderr
index c28980bf147..fabece1ad4a 100644
--- a/src/test/ui/block-expr-precedence.stderr
+++ b/src/test/ui/closures/old-closure-expr-precedence.stderr
@@ -1,5 +1,5 @@
 warning: unnecessary trailing semicolons
-  --> $DIR/block-expr-precedence.rs:60:21
+  --> $DIR/old-closure-expr-precedence.rs:60:21
    |
 LL |   if (true) { 12; };;; -num;
    |                     ^^ help: remove these semicolons
diff --git a/src/test/ui/block-expression-remove-semicolon.fixed b/src/test/ui/closures/old-closure-expression-remove-semicolon.fixed
index 5629d4b6e6e..5629d4b6e6e 100644
--- a/src/test/ui/block-expression-remove-semicolon.fixed
+++ b/src/test/ui/closures/old-closure-expression-remove-semicolon.fixed
diff --git a/src/test/ui/block-expression-remove-semicolon.rs b/src/test/ui/closures/old-closure-expression-remove-semicolon.rs
index 33f11b50afc..33f11b50afc 100644
--- a/src/test/ui/block-expression-remove-semicolon.rs
+++ b/src/test/ui/closures/old-closure-expression-remove-semicolon.rs
diff --git a/src/test/ui/block-expression-remove-semicolon.stderr b/src/test/ui/closures/old-closure-expression-remove-semicolon.stderr
index 74dc4d595a9..ab7983dc9e4 100644
--- a/src/test/ui/block-expression-remove-semicolon.stderr
+++ b/src/test/ui/closures/old-closure-expression-remove-semicolon.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/block-expression-remove-semicolon.rs:8:19
+  --> $DIR/old-closure-expression-remove-semicolon.rs:8:19
    |
 LL |       let _x: i32 = {
    |  ___________________^
diff --git a/src/test/ui/block-fn-coerce.rs b/src/test/ui/closures/old-closure-fn-coerce.rs
index d993ad99459..d993ad99459 100644
--- a/src/test/ui/block-fn-coerce.rs
+++ b/src/test/ui/closures/old-closure-fn-coerce.rs
diff --git a/src/test/ui/block-iter-1.rs b/src/test/ui/closures/old-closure-iter-1.rs
index caf0266cff1..caf0266cff1 100644
--- a/src/test/ui/block-iter-1.rs
+++ b/src/test/ui/closures/old-closure-iter-1.rs
diff --git a/src/test/ui/block-iter-2.rs b/src/test/ui/closures/old-closure-iter-2.rs
index e90c1ee815a..e90c1ee815a 100644
--- a/src/test/ui/block-iter-2.rs
+++ b/src/test/ui/closures/old-closure-iter-2.rs
diff --git a/src/test/ui/feature-gate/allow-features-empty.rs b/src/test/ui/feature-gates/allow-features-empty.rs
index 88a60934927..88a60934927 100644
--- a/src/test/ui/feature-gate/allow-features-empty.rs
+++ b/src/test/ui/feature-gates/allow-features-empty.rs
diff --git a/src/test/ui/feature-gate/allow-features-empty.stderr b/src/test/ui/feature-gates/allow-features-empty.stderr
index f88b3ea0a60..f88b3ea0a60 100644
--- a/src/test/ui/feature-gate/allow-features-empty.stderr
+++ b/src/test/ui/feature-gates/allow-features-empty.stderr
diff --git a/src/test/ui/feature-gate/allow-features.rs b/src/test/ui/feature-gates/allow-features.rs
index 2ce4701a818..2ce4701a818 100644
--- a/src/test/ui/feature-gate/allow-features.rs
+++ b/src/test/ui/feature-gates/allow-features.rs
diff --git a/src/test/ui/feature-gate/allow-features.stderr b/src/test/ui/feature-gates/allow-features.stderr
index 9caf48dd138..9caf48dd138 100644
--- a/src/test/ui/feature-gate/allow-features.stderr
+++ b/src/test/ui/feature-gates/allow-features.stderr
diff --git a/src/test/ui/feature-gate/duplicate-features.rs b/src/test/ui/feature-gates/duplicate-features.rs
index d8f7818054a..d8f7818054a 100644
--- a/src/test/ui/feature-gate/duplicate-features.rs
+++ b/src/test/ui/feature-gates/duplicate-features.rs
diff --git a/src/test/ui/feature-gate/duplicate-features.stderr b/src/test/ui/feature-gates/duplicate-features.stderr
index dbde806f6cc..dbde806f6cc 100644
--- a/src/test/ui/feature-gate/duplicate-features.stderr
+++ b/src/test/ui/feature-gates/duplicate-features.stderr
diff --git a/src/test/ui/feature-gate/feature-gate-c_variadic.rs b/src/test/ui/feature-gates/feature-gate-c_variadic.rs
index 8b40c36c7db..8b40c36c7db 100644
--- a/src/test/ui/feature-gate/feature-gate-c_variadic.rs
+++ b/src/test/ui/feature-gates/feature-gate-c_variadic.rs
diff --git a/src/test/ui/feature-gate/feature-gate-c_variadic.stderr b/src/test/ui/feature-gates/feature-gate-c_variadic.stderr
index 7b3af8d994f..7b3af8d994f 100644
--- a/src/test/ui/feature-gate/feature-gate-c_variadic.stderr
+++ b/src/test/ui/feature-gates/feature-gate-c_variadic.stderr
diff --git a/src/test/ui/feature-gate-inline_const.rs b/src/test/ui/feature-gates/feature-gate-inline_const.rs
index 43ff90d234c..43ff90d234c 100644
--- a/src/test/ui/feature-gate-inline_const.rs
+++ b/src/test/ui/feature-gates/feature-gate-inline_const.rs
diff --git a/src/test/ui/feature-gate-inline_const.stderr b/src/test/ui/feature-gates/feature-gate-inline_const.stderr
index be2f567155c..be2f567155c 100644
--- a/src/test/ui/feature-gate-inline_const.stderr
+++ b/src/test/ui/feature-gates/feature-gate-inline_const.stderr
diff --git a/src/test/ui/feature-gate-isa_attribute.rs b/src/test/ui/feature-gates/feature-gate-isa_attribute.rs
index cb02a0955e9..cb02a0955e9 100644
--- a/src/test/ui/feature-gate-isa_attribute.rs
+++ b/src/test/ui/feature-gates/feature-gate-isa_attribute.rs
diff --git a/src/test/ui/feature-gate-isa_attribute.stderr b/src/test/ui/feature-gates/feature-gate-isa_attribute.stderr
index 2a95a80ca61..2a95a80ca61 100644
--- a/src/test/ui/feature-gate-isa_attribute.stderr
+++ b/src/test/ui/feature-gates/feature-gate-isa_attribute.stderr
diff --git a/src/test/ui/feature-gate-optimize_attribute.rs b/src/test/ui/feature-gates/feature-gate-optimize_attribute.rs
index 15aa3a6af4c..15aa3a6af4c 100644
--- a/src/test/ui/feature-gate-optimize_attribute.rs
+++ b/src/test/ui/feature-gates/feature-gate-optimize_attribute.rs
diff --git a/src/test/ui/feature-gate-optimize_attribute.stderr b/src/test/ui/feature-gates/feature-gate-optimize_attribute.stderr
index 50ce6427e8b..50ce6427e8b 100644
--- a/src/test/ui/feature-gate-optimize_attribute.stderr
+++ b/src/test/ui/feature-gates/feature-gate-optimize_attribute.stderr
diff --git a/src/test/ui/feature-gate/feature-gate-static-nobundle-2.rs b/src/test/ui/feature-gates/feature-gate-static-nobundle-2.rs
index b6c8648a7d0..b6c8648a7d0 100644
--- a/src/test/ui/feature-gate/feature-gate-static-nobundle-2.rs
+++ b/src/test/ui/feature-gates/feature-gate-static-nobundle-2.rs
diff --git a/src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr b/src/test/ui/feature-gates/feature-gate-static-nobundle-2.stderr
index d96a48cde9f..d96a48cde9f 100644
--- a/src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr
+++ b/src/test/ui/feature-gates/feature-gate-static-nobundle-2.stderr
diff --git a/src/test/ui/feature-gated-feature-in-macro-arg.rs b/src/test/ui/feature-gates/feature-gated-feature-in-macro-arg.rs
index 1285cca6b8b..1285cca6b8b 100644
--- a/src/test/ui/feature-gated-feature-in-macro-arg.rs
+++ b/src/test/ui/feature-gates/feature-gated-feature-in-macro-arg.rs
diff --git a/src/test/ui/feature-gated-feature-in-macro-arg.stderr b/src/test/ui/feature-gates/feature-gated-feature-in-macro-arg.stderr
index 218e0292776..218e0292776 100644
--- a/src/test/ui/feature-gated-feature-in-macro-arg.stderr
+++ b/src/test/ui/feature-gates/feature-gated-feature-in-macro-arg.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-bench.rs b/src/test/ui/feature-gates/issue-43106-gating-of-bench.rs
index 31eee88d1fa..31eee88d1fa 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-bench.rs
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-bench.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-bench.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-bench.stderr
index d0305c5160f..d0305c5160f 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-bench.stderr
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-bench.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs-error.rs b/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.rs
index 6404b2c3115..6404b2c3115 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs-error.rs
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs-error.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.stderr
index 3ca1bd2ea7e..3ca1bd2ea7e 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs-error.stderr
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs-error.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.rs b/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs.rs
index aba6c08f41d..aba6c08f41d 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.rs
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr
index ef9c9ef48a8..ef9c9ef48a8 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-deprecated.rs b/src/test/ui/feature-gates/issue-43106-gating-of-deprecated.rs
index 5e1d08dd919..5e1d08dd919 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-deprecated.rs
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-deprecated.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-derive-2.rs b/src/test/ui/feature-gates/issue-43106-gating-of-derive-2.rs
index 3276309f745..3276309f745 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-derive-2.rs
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-derive-2.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-derive-2.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-derive-2.stderr
index ab165917344..ab165917344 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-derive-2.stderr
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-derive-2.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-derive.rs b/src/test/ui/feature-gates/issue-43106-gating-of-derive.rs
index c5d9e0db4d3..c5d9e0db4d3 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-derive.rs
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-derive.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-derive.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-derive.stderr
index ffec76f409e..ffec76f409e 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-derive.stderr
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-derive.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.rs b/src/test/ui/feature-gates/issue-43106-gating-of-macro_escape.rs
index de00bc4cbac..de00bc4cbac 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.rs
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-macro_escape.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-macro_escape.stderr
index 0eaec5202c4..0eaec5202c4 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.stderr
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-macro_escape.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-macro_use.rs b/src/test/ui/feature-gates/issue-43106-gating-of-macro_use.rs
index 6a7ef793924..6a7ef793924 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-macro_use.rs
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-macro_use.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-macro_use.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-macro_use.stderr
index 52a682e4bfa..52a682e4bfa 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-macro_use.stderr
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-macro_use.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.rs b/src/test/ui/feature-gates/issue-43106-gating-of-proc_macro_derive.rs
index a94ffd602ef..a94ffd602ef 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.rs
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-proc_macro_derive.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-proc_macro_derive.stderr
index e202b472d9c..e202b472d9c 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.stderr
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-proc_macro_derive.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.rs b/src/test/ui/feature-gates/issue-43106-gating-of-rustc_deprecated.rs
index a01d85515a8..a01d85515a8 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.rs
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-rustc_deprecated.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-rustc_deprecated.stderr
index 3c4dcfec02b..3c4dcfec02b 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-rustc_deprecated.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-stable.rs b/src/test/ui/feature-gates/issue-43106-gating-of-stable.rs
index 73ff965307f..73ff965307f 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-stable.rs
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-stable.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-stable.stderr
index 2573db1d684..2573db1d684 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-stable.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-test.rs b/src/test/ui/feature-gates/issue-43106-gating-of-test.rs
index ee3fe712e36..ee3fe712e36 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-test.rs
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-test.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-test.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-test.stderr
index 335af5e7905..335af5e7905 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-test.stderr
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-test.stderr
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-unstable.rs b/src/test/ui/feature-gates/issue-43106-gating-of-unstable.rs
index d8339b00c12..d8339b00c12 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-unstable.rs
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-unstable.rs
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr b/src/test/ui/feature-gates/issue-43106-gating-of-unstable.stderr
index 500675e054c..500675e054c 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr
+++ b/src/test/ui/feature-gates/issue-43106-gating-of-unstable.stderr
diff --git a/src/test/ui/feature-gate/issue-49983-see-issue-0.rs b/src/test/ui/feature-gates/issue-49983-see-issue-0.rs
index eeb80d014b2..eeb80d014b2 100644
--- a/src/test/ui/feature-gate/issue-49983-see-issue-0.rs
+++ b/src/test/ui/feature-gates/issue-49983-see-issue-0.rs
diff --git a/src/test/ui/feature-gate/issue-49983-see-issue-0.stderr b/src/test/ui/feature-gates/issue-49983-see-issue-0.stderr
index 314238a34df..314238a34df 100644
--- a/src/test/ui/feature-gate/issue-49983-see-issue-0.stderr
+++ b/src/test/ui/feature-gates/issue-49983-see-issue-0.stderr
diff --git a/src/test/ui/feature-gate/rustc-private.rs b/src/test/ui/feature-gates/rustc-private.rs
index 7b8944bb0a0..7b8944bb0a0 100644
--- a/src/test/ui/feature-gate/rustc-private.rs
+++ b/src/test/ui/feature-gates/rustc-private.rs
diff --git a/src/test/ui/feature-gate/rustc-private.stderr b/src/test/ui/feature-gates/rustc-private.stderr
index 1a8536d37d6..1a8536d37d6 100644
--- a/src/test/ui/feature-gate/rustc-private.stderr
+++ b/src/test/ui/feature-gates/rustc-private.stderr
diff --git a/src/test/ui/feature-gate/stability-attribute-consistency.rs b/src/test/ui/feature-gates/stability-attribute-consistency.rs
index 6ee7003c31e..6ee7003c31e 100644
--- a/src/test/ui/feature-gate/stability-attribute-consistency.rs
+++ b/src/test/ui/feature-gates/stability-attribute-consistency.rs
diff --git a/src/test/ui/feature-gate/stability-attribute-consistency.stderr b/src/test/ui/feature-gates/stability-attribute-consistency.stderr
index d49b44c8a35..d49b44c8a35 100644
--- a/src/test/ui/feature-gate/stability-attribute-consistency.stderr
+++ b/src/test/ui/feature-gates/stability-attribute-consistency.stderr
diff --git a/src/test/ui/feature-gate/unknown-feature.rs b/src/test/ui/feature-gates/unknown-feature.rs
index 20fd932d4c2..20fd932d4c2 100644
--- a/src/test/ui/feature-gate/unknown-feature.rs
+++ b/src/test/ui/feature-gates/unknown-feature.rs
diff --git a/src/test/ui/feature-gate/unknown-feature.stderr b/src/test/ui/feature-gates/unknown-feature.stderr
index e5c05872dbf..e5c05872dbf 100644
--- a/src/test/ui/feature-gate/unknown-feature.stderr
+++ b/src/test/ui/feature-gates/unknown-feature.stderr
diff --git a/src/test/ui/feature-gate/unstable-attribute-allow-issue-0.rs b/src/test/ui/feature-gates/unstable-attribute-allow-issue-0.rs
index bffe43262e0..bffe43262e0 100644
--- a/src/test/ui/feature-gate/unstable-attribute-allow-issue-0.rs
+++ b/src/test/ui/feature-gates/unstable-attribute-allow-issue-0.rs
diff --git a/src/test/ui/feature-gate/unstable-attribute-allow-issue-0.stderr b/src/test/ui/feature-gates/unstable-attribute-allow-issue-0.stderr
index 7bbaf92fc68..7bbaf92fc68 100644
--- a/src/test/ui/feature-gate/unstable-attribute-allow-issue-0.stderr
+++ b/src/test/ui/feature-gates/unstable-attribute-allow-issue-0.stderr
diff --git a/src/test/ui/parse-assoc-type-lt.rs b/src/test/ui/parser/parse-assoc-type-lt.rs
index d3fe6079a5d..d3fe6079a5d 100644
--- a/src/test/ui/parse-assoc-type-lt.rs
+++ b/src/test/ui/parser/parse-assoc-type-lt.rs
diff --git a/src/test/ui/parse-error-correct.rs b/src/test/ui/parser/parse-error-correct.rs
index 13759a23519..13759a23519 100644
--- a/src/test/ui/parse-error-correct.rs
+++ b/src/test/ui/parser/parse-error-correct.rs
diff --git a/src/test/ui/parse-error-correct.stderr b/src/test/ui/parser/parse-error-correct.stderr
index c54baf00b27..c54baf00b27 100644
--- a/src/test/ui/parse-error-correct.stderr
+++ b/src/test/ui/parser/parse-error-correct.stderr
diff --git a/src/test/ui/parse-panic.rs b/src/test/ui/parser/parse-panic.rs
index aeb2ba4faa5..aeb2ba4faa5 100644
--- a/src/test/ui/parse-panic.rs
+++ b/src/test/ui/parser/parse-panic.rs
diff --git a/src/test/ui/parser-recovery-1.rs b/src/test/ui/parser/parser-recovery-1.rs
index 7e26b4f2b6a..7e26b4f2b6a 100644
--- a/src/test/ui/parser-recovery-1.rs
+++ b/src/test/ui/parser/parser-recovery-1.rs
diff --git a/src/test/ui/parser-recovery-1.stderr b/src/test/ui/parser/parser-recovery-1.stderr
index f56060c3e35..f56060c3e35 100644
--- a/src/test/ui/parser-recovery-1.stderr
+++ b/src/test/ui/parser/parser-recovery-1.stderr
diff --git a/src/test/ui/parser-recovery-2.rs b/src/test/ui/parser/parser-recovery-2.rs
index 48b22afffe7..48b22afffe7 100644
--- a/src/test/ui/parser-recovery-2.rs
+++ b/src/test/ui/parser/parser-recovery-2.rs
diff --git a/src/test/ui/parser-recovery-2.stderr b/src/test/ui/parser/parser-recovery-2.stderr
index cd3da4c71f0..cd3da4c71f0 100644
--- a/src/test/ui/parser-recovery-2.stderr
+++ b/src/test/ui/parser/parser-recovery-2.stderr
diff --git a/src/test/ui/parser-unicode-whitespace.rs b/src/test/ui/parser/parser-unicode-whitespace.rs
index 2d1fa7dc42e..2d1fa7dc42e 100644
--- a/src/test/ui/parser-unicode-whitespace.rs
+++ b/src/test/ui/parser/parser-unicode-whitespace.rs
diff --git a/src/test/ui/auxiliary/rmeta-meta.rs b/src/test/ui/rmeta/auxiliary/rmeta-meta.rs
index 6d8ed95bd38..6d8ed95bd38 100644
--- a/src/test/ui/auxiliary/rmeta-meta.rs
+++ b/src/test/ui/rmeta/auxiliary/rmeta-meta.rs
diff --git a/src/test/ui/auxiliary/rmeta-rlib-rpass.rs b/src/test/ui/rmeta/auxiliary/rmeta-rlib-rpass.rs
index f5e8c3d2a5c..f5e8c3d2a5c 100644
--- a/src/test/ui/auxiliary/rmeta-rlib-rpass.rs
+++ b/src/test/ui/rmeta/auxiliary/rmeta-rlib-rpass.rs
diff --git a/src/test/ui/auxiliary/rmeta-rlib.rs b/src/test/ui/rmeta/auxiliary/rmeta-rlib.rs
index 4a05710db66..4a05710db66 100644
--- a/src/test/ui/auxiliary/rmeta-rlib.rs
+++ b/src/test/ui/rmeta/auxiliary/rmeta-rlib.rs
diff --git a/src/test/ui/auxiliary/rmeta-rmeta.rs b/src/test/ui/rmeta/auxiliary/rmeta-rmeta.rs
index 4a6d055a81f..4a6d055a81f 100644
--- a/src/test/ui/auxiliary/rmeta-rmeta.rs
+++ b/src/test/ui/rmeta/auxiliary/rmeta-rmeta.rs
diff --git a/src/test/ui/rmeta-lib-pass.rs b/src/test/ui/rmeta/rmeta-lib-pass.rs
index fdd0516e4d6..fdd0516e4d6 100644
--- a/src/test/ui/rmeta-lib-pass.rs
+++ b/src/test/ui/rmeta/rmeta-lib-pass.rs
diff --git a/src/test/ui/rmeta-pass.rs b/src/test/ui/rmeta/rmeta-pass.rs
index 4f0db23f47d..4f0db23f47d 100644
--- a/src/test/ui/rmeta-pass.rs
+++ b/src/test/ui/rmeta/rmeta-pass.rs
diff --git a/src/test/ui/rmeta-priv-warn.rs b/src/test/ui/rmeta/rmeta-priv-warn.rs
index 430c1f06f43..430c1f06f43 100644
--- a/src/test/ui/rmeta-priv-warn.rs
+++ b/src/test/ui/rmeta/rmeta-priv-warn.rs
diff --git a/src/test/ui/rmeta-rpass.rs b/src/test/ui/rmeta/rmeta-rpass.rs
index 173a6a394eb..173a6a394eb 100644
--- a/src/test/ui/rmeta-rpass.rs
+++ b/src/test/ui/rmeta/rmeta-rpass.rs
diff --git a/src/test/ui/rmeta.rs b/src/test/ui/rmeta/rmeta.rs
index 63ed236505e..63ed236505e 100644
--- a/src/test/ui/rmeta.rs
+++ b/src/test/ui/rmeta/rmeta.rs
diff --git a/src/test/ui/rmeta.stderr b/src/test/ui/rmeta/rmeta.stderr
index d15caeb6698..d15caeb6698 100644
--- a/src/test/ui/rmeta.stderr
+++ b/src/test/ui/rmeta/rmeta.stderr
diff --git a/src/test/ui/rmeta_lib.rs b/src/test/ui/rmeta/rmeta_lib.rs
index fa6826450c9..fa6826450c9 100644
--- a/src/test/ui/rmeta_lib.rs
+++ b/src/test/ui/rmeta/rmeta_lib.rs
diff --git a/src/test/ui/rmeta_lib.stderr b/src/test/ui/rmeta/rmeta_lib.stderr
index 8a9179cca6b..8a9179cca6b 100644
--- a/src/test/ui/rmeta_lib.stderr
+++ b/src/test/ui/rmeta/rmeta_lib.stderr
diff --git a/src/test/ui/rmeta_meta_main.rs b/src/test/ui/rmeta/rmeta_meta_main.rs
index 839f350d741..839f350d741 100644
--- a/src/test/ui/rmeta_meta_main.rs
+++ b/src/test/ui/rmeta/rmeta_meta_main.rs
diff --git a/src/test/ui/rmeta_meta_main.stderr b/src/test/ui/rmeta/rmeta_meta_main.stderr
index 0c6ed9afd35..0c6ed9afd35 100644
--- a/src/test/ui/rmeta_meta_main.stderr
+++ b/src/test/ui/rmeta/rmeta_meta_main.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index d8d2b449fee..bc5e43d8f0a 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -7,7 +7,7 @@ use std::path::Path;
 
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
-const ROOT_ENTRY_LIMIT: usize = 1580;
+const ROOT_ENTRY_LIMIT: usize = 1500;
 const ISSUES_ENTRY_LIMIT: usize = 2830;
 
 fn check_entries(path: &Path, bad: &mut bool) {