diff --git a/src/test/ui/array-break-length.rs b/src/test/ui/array-slice-vec/array-break-length.rs
similarity index 100%
rename from src/test/ui/array-break-length.rs
rename to 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
similarity index 100%
rename from src/test/ui/array-break-length.stderr
rename to 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
similarity index 100%
rename from src/test/ui/array-not-vector.rs
rename to 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
similarity index 100%
rename from src/test/ui/array-not-vector.stderr
rename to 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
similarity index 100%
rename from src/test/ui/array_const_index-0.rs
rename to 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
similarity index 100%
rename from src/test/ui/array_const_index-0.stderr
rename to 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 8ee225f5cdfeacd1af58ff30a98c4eda1f7c5a00..d0ee1796c0ffcdccb6f27c954f46651bcda654e1 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
similarity index 100%
rename from src/test/ui/array_const_index-1.stderr
rename to 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 0000000000000000000000000000000000000000..8ee225f5cdfeacd1af58ff30a98c4eda1f7c5a00
--- /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
similarity index 100%
rename from src/test/ui/slice-2.rs
rename to 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
similarity index 100%
rename from src/test/ui/slice-2.stderr
rename to 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
similarity index 100%
rename from src/test/ui/slice-mut-2.rs
rename to 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
similarity index 100%
rename from src/test/ui/slice-mut-2.stderr
rename to 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
similarity index 100%
rename from src/test/ui/slice-mut.rs
rename to 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
similarity index 100%
rename from src/test/ui/slice-mut.stderr
rename to 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
similarity index 100%
rename from src/test/ui/slice-to-vec-comparison.rs
rename to 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
similarity index 100%
rename from src/test/ui/slice-to-vec-comparison.stderr
rename to 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
similarity index 100%
rename from src/test/ui/vec/vec-macro-with-comma-only.rs
rename to 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
similarity index 100%
rename from src/test/ui/vec/vec-macro-with-comma-only.stderr
rename to 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
similarity index 100%
rename from src/test/ui/vec/vec-mut-iter-borrow.rs
rename to 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
similarity index 100%
rename from src/test/ui/vec/vec-mut-iter-borrow.stderr
rename to 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
similarity index 100%
rename from src/test/ui/vec/vec-overrun.rs
rename to 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
similarity index 100%
rename from src/test/ui/vec/vec-res-add.rs
rename to 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
similarity index 100%
rename from src/test/ui/vec/vec-res-add.stderr
rename to 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
similarity index 100%
rename from src/test/ui/vector-cast-weirdness.rs
rename to 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
similarity index 100%
rename from src/test/ui/vector-cast-weirdness.stderr
rename to 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
similarity index 100%
rename from src/test/ui/vector-no-ann.rs
rename to 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
similarity index 100%
rename from src/test/ui/vector-no-ann.stderr
rename to 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 d0ee1796c0ffcdccb6f27c954f46651bcda654e1..0000000000000000000000000000000000000000
--- 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 acfd1e13e93e3241e218bbc18875516dee8ce36b..0000000000000000000000000000000000000000
--- 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
similarity index 100%
rename from src/test/ui/binary-minus-without-space.rs
rename to 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
similarity index 100%
rename from src/test/ui/binary-op-on-double-ref.fixed
rename to 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
similarity index 100%
rename from src/test/ui/binary-op-on-double-ref.rs
rename to 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
similarity index 100%
rename from src/test/ui/binary-op-on-double-ref.stderr
rename to 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
similarity index 100%
rename from src/test/ui/binops-issue-22743.rs
rename to src/test/ui/binop/binops-issue-22743.rs
diff --git a/src/test/ui/binops.rs b/src/test/ui/binop/binops.rs
similarity index 100%
rename from src/test/ui/binops.rs
rename to 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
similarity index 100%
rename from src/test/ui/builtin-superkinds-capabilities-transitive.rs
rename to 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
similarity index 100%
rename from src/test/ui/builtin-superkinds-capabilities-xc.rs
rename to 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
similarity index 100%
rename from src/test/ui/builtin-superkinds-capabilities.rs
rename to 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
similarity index 100%
rename from src/test/ui/builtin-superkinds-in-metadata.rs
rename to 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
similarity index 100%
rename from src/test/ui/builtin-superkinds-phantom-typaram.rs
rename to 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
similarity index 100%
rename from src/test/ui/builtin-superkinds-simple.rs
rename to 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
similarity index 100%
rename from src/test/ui/builtin-superkinds-typaram.rs
rename to 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
similarity index 100%
rename from src/test/ui/cast-char.rs
rename to src/test/ui/cast/cast-char.rs
diff --git a/src/test/ui/cast-char.stderr b/src/test/ui/cast/cast-char.stderr
similarity index 100%
rename from src/test/ui/cast-char.stderr
rename to 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
similarity index 100%
rename from src/test/ui/cast-does-fallback.rs
rename to 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
similarity index 100%
rename from src/test/ui/cast-region-to-uint.rs
rename to 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
similarity index 100%
rename from src/test/ui/cast-rfc0401-vtable-kinds.rs
rename to 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
similarity index 100%
rename from src/test/ui/cast-rfc0401.rs
rename to 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
similarity index 100%
rename from src/test/ui/cast-to-infer-ty.rs
rename to src/test/ui/cast/cast-to-infer-ty.rs
diff --git a/src/test/ui/cast.rs b/src/test/ui/cast/cast.rs
similarity index 100%
rename from src/test/ui/cast.rs
rename to 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
similarity index 100%
rename from src/test/ui/casts-differing-anon.rs
rename to 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
similarity index 100%
rename from src/test/ui/casts-differing-anon.stderr
rename to 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
similarity index 100%
rename from src/test/ui/casts-issue-46365.rs
rename to 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
similarity index 100%
rename from src/test/ui/casts-issue-46365.stderr
rename to 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
similarity index 100%
rename from src/test/ui/block-arg-call-as.rs
rename to 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
similarity index 100%
rename from src/test/ui/block-arg.rs
rename to 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
similarity index 100%
rename from src/test/ui/block-explicit-types.rs
rename to 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
similarity index 100%
rename from src/test/ui/block-expr-precedence.rs
rename to 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
similarity index 82%
rename from src/test/ui/block-expr-precedence.stderr
rename to src/test/ui/closures/old-closure-expr-precedence.stderr
index c28980bf14786588ea49e2f5fabf747edcb0fd2c..fabece1ad4a118ac0c64299d45c196271b51c26d 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
similarity index 100%
rename from src/test/ui/block-expression-remove-semicolon.fixed
rename to 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
similarity index 100%
rename from src/test/ui/block-expression-remove-semicolon.rs
rename to 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
similarity index 85%
rename from src/test/ui/block-expression-remove-semicolon.stderr
rename to src/test/ui/closures/old-closure-expression-remove-semicolon.stderr
index 74dc4d595a9294d88a43c1cef0a980be24134b5b..ab7983dc9e487f0453640caf204d98401772f0bd 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
similarity index 100%
rename from src/test/ui/block-fn-coerce.rs
rename to 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
similarity index 100%
rename from src/test/ui/block-iter-1.rs
rename to 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
similarity index 100%
rename from src/test/ui/block-iter-2.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/allow-features-empty.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/allow-features-empty.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/allow-features.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/allow-features.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/duplicate-features.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/duplicate-features.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/feature-gate-c_variadic.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/feature-gate-c_variadic.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate-inline_const.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate-inline_const.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate-isa_attribute.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate-isa_attribute.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate-optimize_attribute.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate-optimize_attribute.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/feature-gate-static-nobundle-2.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gated-feature-in-macro-arg.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gated-feature-in-macro-arg.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-bench.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-bench.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs-error.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs-error.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-deprecated.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-derive-2.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-derive-2.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-derive.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-derive.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-macro_escape.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-macro_use.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-macro_use.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-proc_macro_derive.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-stable.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-test.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-test.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-unstable.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-49983-see-issue-0.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/issue-49983-see-issue-0.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/rustc-private.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/rustc-private.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/stability-attribute-consistency.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/stability-attribute-consistency.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/unknown-feature.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/unknown-feature.stderr
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/unstable-attribute-allow-issue-0.rs
rename to 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
similarity index 100%
rename from src/test/ui/feature-gate/unstable-attribute-allow-issue-0.stderr
rename to 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
similarity index 100%
rename from src/test/ui/parse-assoc-type-lt.rs
rename to 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
similarity index 100%
rename from src/test/ui/parse-error-correct.rs
rename to 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
similarity index 100%
rename from src/test/ui/parse-error-correct.stderr
rename to 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
similarity index 100%
rename from src/test/ui/parse-panic.rs
rename to 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
similarity index 100%
rename from src/test/ui/parser-recovery-1.rs
rename to 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
similarity index 100%
rename from src/test/ui/parser-recovery-1.stderr
rename to 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
similarity index 100%
rename from src/test/ui/parser-recovery-2.rs
rename to 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
similarity index 100%
rename from src/test/ui/parser-recovery-2.stderr
rename to 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
similarity index 100%
rename from src/test/ui/parser-unicode-whitespace.rs
rename to 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
similarity index 100%
rename from src/test/ui/auxiliary/rmeta-meta.rs
rename to 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
similarity index 100%
rename from src/test/ui/auxiliary/rmeta-rlib-rpass.rs
rename to 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
similarity index 100%
rename from src/test/ui/auxiliary/rmeta-rlib.rs
rename to 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
similarity index 100%
rename from src/test/ui/auxiliary/rmeta-rmeta.rs
rename to 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
similarity index 100%
rename from src/test/ui/rmeta-lib-pass.rs
rename to 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
similarity index 100%
rename from src/test/ui/rmeta-pass.rs
rename to 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
similarity index 100%
rename from src/test/ui/rmeta-priv-warn.rs
rename to 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
similarity index 100%
rename from src/test/ui/rmeta-rpass.rs
rename to src/test/ui/rmeta/rmeta-rpass.rs
diff --git a/src/test/ui/rmeta.rs b/src/test/ui/rmeta/rmeta.rs
similarity index 100%
rename from src/test/ui/rmeta.rs
rename to src/test/ui/rmeta/rmeta.rs
diff --git a/src/test/ui/rmeta.stderr b/src/test/ui/rmeta/rmeta.stderr
similarity index 100%
rename from src/test/ui/rmeta.stderr
rename to src/test/ui/rmeta/rmeta.stderr
diff --git a/src/test/ui/rmeta_lib.rs b/src/test/ui/rmeta/rmeta_lib.rs
similarity index 100%
rename from src/test/ui/rmeta_lib.rs
rename to src/test/ui/rmeta/rmeta_lib.rs
diff --git a/src/test/ui/rmeta_lib.stderr b/src/test/ui/rmeta/rmeta_lib.stderr
similarity index 100%
rename from src/test/ui/rmeta_lib.stderr
rename to 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
similarity index 100%
rename from src/test/ui/rmeta_meta_main.rs
rename to 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
similarity index 100%
rename from src/test/ui/rmeta_meta_main.stderr
rename to 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 d8d2b449fee8789f2bcdd9384d4b842268389ea7..bc5e43d8f0a1c765577ef0c4c13f0e79c0b32653 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -7,7 +7,7 @@
 
 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) {