Move some tests to more reasonable directories

132 files changed, 2 insertions, 188 deletions

diff --git a/src/test/ui/byte-literals.rs b/src/test/ui/array-slice-vec/byte-literals.rs
index 2649c2eac33..2649c2eac33 100644
--- a/src/test/ui/byte-literals.rs
+++ b/src/test/ui/array-slice-vec/byte-literals.rs
diff --git a/src/test/ui/suffixed-literal-meta.rs b/src/test/ui/attributes/suffixed-literal-meta.rs
index a6531490c01..a6531490c01 100644
--- a/src/test/ui/suffixed-literal-meta.rs
+++ b/src/test/ui/attributes/suffixed-literal-meta.rs
diff --git a/src/test/ui/suffixed-literal-meta.stderr b/src/test/ui/attributes/suffixed-literal-meta.stderr
index 5245ffead71..5245ffead71 100644
--- a/src/test/ui/suffixed-literal-meta.stderr
+++ b/src/test/ui/attributes/suffixed-literal-meta.stderr
diff --git a/src/test/ui/operator-multidispatch.rs b/src/test/ui/binop/operator-multidispatch.rs
index 0d1dcfd8bdd..0d1dcfd8bdd 100644
--- a/src/test/ui/operator-multidispatch.rs
+++ b/src/test/ui/binop/operator-multidispatch.rs
diff --git a/src/test/ui/operator-overloading.rs b/src/test/ui/binop/operator-overloading.rs
index 6b3abcbc76c..6b3abcbc76c 100644
--- a/src/test/ui/operator-overloading.rs
+++ b/src/test/ui/binop/operator-overloading.rs
diff --git a/src/test/ui/placement-syntax.rs b/src/test/ui/binop/placement-syntax.rs
index 4df96dedbd4..4df96dedbd4 100644
--- a/src/test/ui/placement-syntax.rs
+++ b/src/test/ui/binop/placement-syntax.rs
diff --git a/src/test/ui/placement-syntax.stderr b/src/test/ui/binop/placement-syntax.stderr
index 3fdaf4cd0f5..3fdaf4cd0f5 100644
--- a/src/test/ui/placement-syntax.stderr
+++ b/src/test/ui/binop/placement-syntax.stderr
diff --git a/src/test/ui/immut-function-arguments.rs b/src/test/ui/borrowck/immut-function-arguments.rs
index 242a33e8216..242a33e8216 100644
--- a/src/test/ui/immut-function-arguments.rs
+++ b/src/test/ui/borrowck/immut-function-arguments.rs
diff --git a/src/test/ui/immut-function-arguments.stderr b/src/test/ui/borrowck/immut-function-arguments.stderr
index 7238dd14433..7238dd14433 100644
--- a/src/test/ui/immut-function-arguments.stderr
+++ b/src/test/ui/borrowck/immut-function-arguments.stderr
diff --git a/src/test/ui/kindck-implicit-close-over-mut-var.rs b/src/test/ui/borrowck/kindck-implicit-close-over-mut-var.rs
index 5b5d86eec2c..5b5d86eec2c 100644
--- a/src/test/ui/kindck-implicit-close-over-mut-var.rs
+++ b/src/test/ui/borrowck/kindck-implicit-close-over-mut-var.rs
diff --git a/src/test/ui/crt-static-on-works.rs b/src/test/ui/cfg/crt-static-on-works.rs
index f89d1edd658..f89d1edd658 100644
--- a/src/test/ui/crt-static-on-works.rs
+++ b/src/test/ui/cfg/crt-static-on-works.rs
diff --git a/src/test/ui/once-move-out-on-heap.rs b/src/test/ui/closures/once-move-out-on-heap.rs
index 4e2e400cec0..4e2e400cec0 100644
--- a/src/test/ui/once-move-out-on-heap.rs
+++ b/src/test/ui/closures/once-move-out-on-heap.rs
diff --git a/src/test/ui/auxiliary/llvm_pr32379.rs b/src/test/ui/codegen/auxiliary/llvm_pr32379.rs
index 8e429767095..8e429767095 100644
--- a/src/test/ui/auxiliary/llvm_pr32379.rs
+++ b/src/test/ui/codegen/auxiliary/llvm_pr32379.rs
diff --git a/src/test/ui/init-large-type.rs b/src/test/ui/codegen/init-large-type.rs
index ce905572f2a..ce905572f2a 100644
--- a/src/test/ui/init-large-type.rs
+++ b/src/test/ui/codegen/init-large-type.rs
diff --git a/src/test/ui/llvm-pr32379.rs b/src/test/ui/codegen/llvm-pr32379.rs
index 8a1f03241b1..8a1f03241b1 100644
--- a/src/test/ui/llvm-pr32379.rs
+++ b/src/test/ui/codegen/llvm-pr32379.rs
diff --git a/src/test/ui/retslot-cast.rs b/src/test/ui/coercion/retslot-cast.rs
index ae500cb15df..ae500cb15df 100644
--- a/src/test/ui/retslot-cast.rs
+++ b/src/test/ui/coercion/retslot-cast.rs
diff --git a/src/test/ui/retslot-cast.stderr b/src/test/ui/coercion/retslot-cast.stderr
index 798ce1199a9..798ce1199a9 100644
--- a/src/test/ui/retslot-cast.stderr
+++ b/src/test/ui/coercion/retslot-cast.stderr
diff --git a/src/test/ui/cleanup-arm-conditional.rs b/src/test/ui/dropck/cleanup-arm-conditional.rs
index 38c717089c4..38c717089c4 100644
--- a/src/test/ui/cleanup-arm-conditional.rs
+++ b/src/test/ui/dropck/cleanup-arm-conditional.rs
diff --git a/src/test/ui/edition-keywords-2015-2018.rs b/src/test/ui/editions/edition-keywords-2015-2018.rs
index 8c3397c951d..8c3397c951d 100644
--- a/src/test/ui/edition-keywords-2015-2018.rs
+++ b/src/test/ui/editions/edition-keywords-2015-2018.rs
diff --git a/src/test/ui/edition-keywords-2018-2018.rs b/src/test/ui/editions/edition-keywords-2018-2018.rs
index 5043440aa16..5043440aa16 100644
--- a/src/test/ui/edition-keywords-2018-2018.rs
+++ b/src/test/ui/editions/edition-keywords-2018-2018.rs
diff --git a/src/test/ui/export.rs b/src/test/ui/export.rs
deleted file mode 100644
index 73ceec6803a..00000000000
--- a/src/test/ui/export.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-mod foo {
-    pub fn x(y: isize) { log(debug, y); }
-    //~^ ERROR cannot find function `log` in this scope
-    //~| ERROR cannot find value `debug` in this scope
-    fn z(y: isize) { log(debug, y); }
-    //~^ ERROR cannot find function `log` in this scope
-    //~| ERROR cannot find value `debug` in this scope
-}
-
-fn main() { foo::z(10); } //~ ERROR function `z` is private
diff --git a/src/test/ui/export.stderr b/src/test/ui/export.stderr
deleted file mode 100644
index 23c29b31c6a..00000000000
--- a/src/test/ui/export.stderr
+++ /dev/null
@@ -1,40 +0,0 @@
-error[E0425]: cannot find function `log` in this scope
-  --> $DIR/export.rs:2:26
-   |
-LL |     pub fn x(y: isize) { log(debug, y); }
-   |                          ^^^ not found in this scope
-
-error[E0425]: cannot find value `debug` in this scope
-  --> $DIR/export.rs:2:30
-   |
-LL |     pub fn x(y: isize) { log(debug, y); }
-   |                              ^^^^^ not found in this scope
-
-error[E0425]: cannot find function `log` in this scope
-  --> $DIR/export.rs:5:22
-   |
-LL |     fn z(y: isize) { log(debug, y); }
-   |                      ^^^ not found in this scope
-
-error[E0425]: cannot find value `debug` in this scope
-  --> $DIR/export.rs:5:26
-   |
-LL |     fn z(y: isize) { log(debug, y); }
-   |                          ^^^^^ not found in this scope
-
-error[E0603]: function `z` is private
-  --> $DIR/export.rs:10:18
-   |
-LL | fn main() { foo::z(10); }
-   |                  ^ private function
-   |
-note: the function `z` is defined here
-  --> $DIR/export.rs:5:5
-   |
-LL |     fn z(y: isize) { log(debug, y); }
-   |     ^^^^^^^^^^^^^^
-
-error: aborting due to 5 previous errors
-
-Some errors have detailed explanations: E0425, E0603.
-For more information about an error, try `rustc --explain E0425`.
diff --git a/src/test/ui/expr-block-slot.rs b/src/test/ui/expr-block-slot.rs
deleted file mode 100644
index 54bcbb328b0..00000000000
--- a/src/test/ui/expr-block-slot.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// run-pass
-// Regression test for issue #377
-
-
-struct A { a: isize }
-struct V { v: isize }
-
-pub fn main() {
-    let a = { let b = A {a: 3}; b };
-    assert_eq!(a.a, 3);
-    let c = { let d = V {v: 3}; d };
-    assert_eq!(c.v, 3);
-}
diff --git a/src/test/ui/auxiliary/no-mangle-associated-fn.rs b/src/test/ui/extern/auxiliary/no-mangle-associated-fn.rs
index 7fc73c76cc9..7fc73c76cc9 100644
--- a/src/test/ui/auxiliary/no-mangle-associated-fn.rs
+++ b/src/test/ui/extern/auxiliary/no-mangle-associated-fn.rs
diff --git a/src/test/ui/no-mangle-associated-fn.rs b/src/test/ui/extern/no-mangle-associated-fn.rs
index ecd44abbf26..ecd44abbf26 100644
--- a/src/test/ui/no-mangle-associated-fn.rs
+++ b/src/test/ui/extern/no-mangle-associated-fn.rs
diff --git a/src/test/ui/fun-call-variants.rs b/src/test/ui/fn/fun-call-variants.rs
index 5b83e2620d8..5b83e2620d8 100644
--- a/src/test/ui/fun-call-variants.rs
+++ b/src/test/ui/fn/fun-call-variants.rs
diff --git a/src/test/ui/break-outside-loop.rs b/src/test/ui/for-loop-while/break-outside-loop.rs
index 26769b30dd5..26769b30dd5 100644
--- a/src/test/ui/break-outside-loop.rs
+++ b/src/test/ui/for-loop-while/break-outside-loop.rs
diff --git a/src/test/ui/break-outside-loop.stderr b/src/test/ui/for-loop-while/break-outside-loop.stderr
index 287bf9af62e..287bf9af62e 100644
--- a/src/test/ui/break-outside-loop.stderr
+++ b/src/test/ui/for-loop-while/break-outside-loop.stderr
diff --git a/src/test/ui/break-while-condition.rs b/src/test/ui/for-loop-while/break-while-condition.rs
index 6064e6ab002..6064e6ab002 100644
--- a/src/test/ui/break-while-condition.rs
+++ b/src/test/ui/for-loop-while/break-while-condition.rs
diff --git a/src/test/ui/break-while-condition.stderr b/src/test/ui/for-loop-while/break-while-condition.stderr
index 6960c4fd867..6960c4fd867 100644
--- a/src/test/ui/break-while-condition.stderr
+++ b/src/test/ui/for-loop-while/break-while-condition.stderr
diff --git a/src/test/ui/thread-local-not-in-prelude.rs b/src/test/ui/hygiene/thread-local-not-in-prelude.rs
index e5ed09c600b..e5ed09c600b 100644
--- a/src/test/ui/thread-local-not-in-prelude.rs
+++ b/src/test/ui/hygiene/thread-local-not-in-prelude.rs
diff --git a/src/test/ui/absolute-paths-in-nested-use-groups.rs b/src/test/ui/imports/absolute-paths-in-nested-use-groups.rs
index 96b5131674c..96b5131674c 100644
--- a/src/test/ui/absolute-paths-in-nested-use-groups.rs
+++ b/src/test/ui/imports/absolute-paths-in-nested-use-groups.rs
diff --git a/src/test/ui/absolute-paths-in-nested-use-groups.stderr b/src/test/ui/imports/absolute-paths-in-nested-use-groups.stderr
index e41590ac45e..e41590ac45e 100644
--- a/src/test/ui/absolute-paths-in-nested-use-groups.stderr
+++ b/src/test/ui/imports/absolute-paths-in-nested-use-groups.stderr
diff --git a/src/test/ui/reexport-star.rs b/src/test/ui/imports/reexport-star.rs
index 639ab1a0f3a..639ab1a0f3a 100644
--- a/src/test/ui/reexport-star.rs
+++ b/src/test/ui/imports/reexport-star.rs
diff --git a/src/test/ui/newlambdas-ret-infer.rs b/src/test/ui/inference/newlambdas-ret-infer.rs
index 9b629838ffd..9b629838ffd 100644
--- a/src/test/ui/newlambdas-ret-infer.rs
+++ b/src/test/ui/inference/newlambdas-ret-infer.rs
diff --git a/src/test/ui/newlambdas-ret-infer2.rs b/src/test/ui/inference/newlambdas-ret-infer2.rs
index abe31a05f22..abe31a05f22 100644
--- a/src/test/ui/newlambdas-ret-infer2.rs
+++ b/src/test/ui/inference/newlambdas-ret-infer2.rs
diff --git a/src/test/ui/range-type-infer.rs b/src/test/ui/inference/range-type-infer.rs
index f07c041717f..f07c041717f 100644
--- a/src/test/ui/range-type-infer.rs
+++ b/src/test/ui/inference/range-type-infer.rs
diff --git a/src/test/ui/tutorial-suffix-inference-test.rs b/src/test/ui/inference/tutorial-suffix-inference-test.rs
index 849adfd5368..849adfd5368 100644
--- a/src/test/ui/tutorial-suffix-inference-test.rs
+++ b/src/test/ui/inference/tutorial-suffix-inference-test.rs
diff --git a/src/test/ui/tutorial-suffix-inference-test.stderr b/src/test/ui/inference/tutorial-suffix-inference-test.stderr
index fbfbffbd24e..fbfbffbd24e 100644
--- a/src/test/ui/tutorial-suffix-inference-test.stderr
+++ b/src/test/ui/inference/tutorial-suffix-inference-test.stderr
diff --git a/src/test/ui/type-infer-generalize-ty-var.rs b/src/test/ui/inference/type-infer-generalize-ty-var.rs
index a3d6916cbf7..a3d6916cbf7 100644
--- a/src/test/ui/type-infer-generalize-ty-var.rs
+++ b/src/test/ui/inference/type-infer-generalize-ty-var.rs
diff --git a/src/test/ui/leak-unique-as-tydesc.rs b/src/test/ui/leak-unique-as-tydesc.rs
deleted file mode 100644
index 322f726156d..00000000000
--- a/src/test/ui/leak-unique-as-tydesc.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// run-pass
-// pretty-expanded FIXME #23616
-
-fn leaky<T>(_t: T) { }
-
-pub fn main() {
-    let x = Box::new(10);
-    leaky::<Box<isize>>(x);
-}
diff --git a/src/test/ui/auxiliary/link-cfg-works-transitive-dylib.rs b/src/test/ui/linkage-attr/auxiliary/link-cfg-works-transitive-dylib.rs
index 0d927117d81..0d927117d81 100644
--- a/src/test/ui/auxiliary/link-cfg-works-transitive-dylib.rs
+++ b/src/test/ui/linkage-attr/auxiliary/link-cfg-works-transitive-dylib.rs
diff --git a/src/test/ui/auxiliary/link-cfg-works-transitive-rlib.rs b/src/test/ui/linkage-attr/auxiliary/link-cfg-works-transitive-rlib.rs
index 0a296f0b2ef..0a296f0b2ef 100644
--- a/src/test/ui/auxiliary/link-cfg-works-transitive-rlib.rs
+++ b/src/test/ui/linkage-attr/auxiliary/link-cfg-works-transitive-rlib.rs
diff --git a/src/test/ui/link-cfg-works.rs b/src/test/ui/linkage-attr/link-cfg-works.rs
index 254091ff250..254091ff250 100644
--- a/src/test/ui/link-cfg-works.rs
+++ b/src/test/ui/linkage-attr/link-cfg-works.rs
diff --git a/src/test/ui/lint-cap.rs b/src/test/ui/lint/lint-cap.rs
index 461b923ccd4..461b923ccd4 100644
--- a/src/test/ui/lint-cap.rs
+++ b/src/test/ui/lint/lint-cap.rs
diff --git a/src/test/ui/liveness-assign-imm-local-after-ret.rs b/src/test/ui/liveness/liveness-assign-imm-local-after-ret.rs
index b463f4368d1..b463f4368d1 100644
--- a/src/test/ui/liveness-assign-imm-local-after-ret.rs
+++ b/src/test/ui/liveness/liveness-assign-imm-local-after-ret.rs
diff --git a/src/test/ui/match-on-negative-integer-ranges.rs b/src/test/ui/match/match-on-negative-integer-ranges.rs
index 53e9ea9a577..53e9ea9a577 100644
--- a/src/test/ui/match-on-negative-integer-ranges.rs
+++ b/src/test/ui/match/match-on-negative-integer-ranges.rs
diff --git a/src/test/ui/issue-73914.rs b/src/test/ui/mir/issue-73914.rs
index 1e99faaded4..1e99faaded4 100644
--- a/src/test/ui/issue-73914.rs
+++ b/src/test/ui/mir/issue-73914.rs
diff --git a/src/test/ui/assignment-operator-unimplemented.rs b/src/test/ui/mismatched_types/assignment-operator-unimplemented.rs
index 21df464d5e4..21df464d5e4 100644
--- a/src/test/ui/assignment-operator-unimplemented.rs
+++ b/src/test/ui/mismatched_types/assignment-operator-unimplemented.rs
diff --git a/src/test/ui/assignment-operator-unimplemented.stderr b/src/test/ui/mismatched_types/assignment-operator-unimplemented.stderr
index 73c9f86e002..73c9f86e002 100644
--- a/src/test/ui/assignment-operator-unimplemented.stderr
+++ b/src/test/ui/mismatched_types/assignment-operator-unimplemented.stderr
diff --git a/src/test/ui/float-literal-inference-restrictions.rs b/src/test/ui/mismatched_types/float-literal-inference-restrictions.rs
index 34079b61e67..34079b61e67 100644
--- a/src/test/ui/float-literal-inference-restrictions.rs
+++ b/src/test/ui/mismatched_types/float-literal-inference-restrictions.rs
diff --git a/src/test/ui/float-literal-inference-restrictions.stderr b/src/test/ui/mismatched_types/float-literal-inference-restrictions.stderr
index 454373c322e..454373c322e 100644
--- a/src/test/ui/float-literal-inference-restrictions.stderr
+++ b/src/test/ui/mismatched_types/float-literal-inference-restrictions.stderr
diff --git a/src/test/ui/newtype-temporary.rs b/src/test/ui/newtype-temporary.rs
deleted file mode 100644
index 8ee75b2fef1..00000000000
--- a/src/test/ui/newtype-temporary.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// run-pass
-
-#[derive(PartialEq, Debug)]
-struct Foo(usize);
-
-fn foo() -> Foo {
-    Foo(42)
-}
-
-pub fn main() {
-    assert_eq!(foo(), Foo(42));
-}
diff --git a/src/test/ui/lub-if.nll.stderr b/src/test/ui/nll/lub-if.nll.stderr
index 832688f5162..832688f5162 100644
--- a/src/test/ui/lub-if.nll.stderr
+++ b/src/test/ui/nll/lub-if.nll.stderr
diff --git a/src/test/ui/lub-if.rs b/src/test/ui/nll/lub-if.rs
index 132b83810ea..132b83810ea 100644
--- a/src/test/ui/lub-if.rs
+++ b/src/test/ui/nll/lub-if.rs
diff --git a/src/test/ui/lub-if.stderr b/src/test/ui/nll/lub-if.stderr
index a12c48582c7..a12c48582c7 100644
--- a/src/test/ui/lub-if.stderr
+++ b/src/test/ui/nll/lub-if.stderr
diff --git a/src/test/ui/non-legacy-modes.rs b/src/test/ui/non-legacy-modes.rs
deleted file mode 100644
index 38c83e00a6a..00000000000
--- a/src/test/ui/non-legacy-modes.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// run-pass
-
-struct X {
-    repr: isize
-}
-
-fn apply<T, F>(x: T, f: F) where F: FnOnce(T) {
-    f(x);
-}
-
-fn check_int(x: isize) {
-    assert_eq!(x, 22);
-}
-
-fn check_struct(x: X) {
-    check_int(x.repr);
-}
-
-pub fn main() {
-    apply(22, check_int);
-    apply(X {repr: 22}, check_struct);
-}
diff --git a/src/test/ui/overloaded-calls-nontuple.rs b/src/test/ui/overloaded/overloaded-calls-nontuple.rs
index 07d44ff82b1..07d44ff82b1 100644
--- a/src/test/ui/overloaded-calls-nontuple.rs
+++ b/src/test/ui/overloaded/overloaded-calls-nontuple.rs
diff --git a/src/test/ui/overloaded-calls-nontuple.stderr b/src/test/ui/overloaded/overloaded-calls-nontuple.stderr
index 8f299bc9434..8f299bc9434 100644
--- a/src/test/ui/overloaded-calls-nontuple.stderr
+++ b/src/test/ui/overloaded/overloaded-calls-nontuple.stderr
diff --git a/src/test/ui/attribute-with-no-generics-in-parameter-list.rs b/src/test/ui/parser/attribute-with-no-generics-in-parameter-list.rs
index c2cc91d8f77..c2cc91d8f77 100644
--- a/src/test/ui/attribute-with-no-generics-in-parameter-list.rs
+++ b/src/test/ui/parser/attribute-with-no-generics-in-parameter-list.rs
diff --git a/src/test/ui/attribute-with-no-generics-in-parameter-list.stderr b/src/test/ui/parser/attribute-with-no-generics-in-parameter-list.stderr
index 4c5964715db..4c5964715db 100644
--- a/src/test/ui/attribute-with-no-generics-in-parameter-list.stderr
+++ b/src/test/ui/parser/attribute-with-no-generics-in-parameter-list.stderr
diff --git a/src/test/ui/dyn-trait-compatibility.rs b/src/test/ui/parser/dyn-trait-compatibility.rs
index d2b02cc2af5..d2b02cc2af5 100644
--- a/src/test/ui/dyn-trait-compatibility.rs
+++ b/src/test/ui/parser/dyn-trait-compatibility.rs
diff --git a/src/test/ui/dyn-trait-compatibility.stderr b/src/test/ui/parser/dyn-trait-compatibility.stderr
index 9218ae9d5da..9218ae9d5da 100644
--- a/src/test/ui/dyn-trait-compatibility.stderr
+++ b/src/test/ui/parser/dyn-trait-compatibility.stderr
diff --git a/src/test/ui/operator-associativity.rs b/src/test/ui/parser/operator-associativity.rs
index 4f40c80bc4c..4f40c80bc4c 100644
--- a/src/test/ui/operator-associativity.rs
+++ b/src/test/ui/parser/operator-associativity.rs
diff --git a/src/test/ui/ignore-all-the-things.rs b/src/test/ui/pattern/ignore-all-the-things.rs
index 5980e1a857f..5980e1a857f 100644
--- a/src/test/ui/ignore-all-the-things.rs
+++ b/src/test/ui/pattern/ignore-all-the-things.rs
diff --git a/src/test/ui/auxiliary/impl_privacy_xc_2.rs b/src/test/ui/privacy/auxiliary/impl_privacy_xc_2.rs
index 5f9c2268167..5f9c2268167 100644
--- a/src/test/ui/auxiliary/impl_privacy_xc_2.rs
+++ b/src/test/ui/privacy/auxiliary/impl_privacy_xc_2.rs
diff --git a/src/test/ui/auxiliary/reachable-unnameable-items.rs b/src/test/ui/privacy/auxiliary/reachable-unnameable-items.rs
index 20f110b1a8c..20f110b1a8c 100644
--- a/src/test/ui/auxiliary/reachable-unnameable-items.rs
+++ b/src/test/ui/privacy/auxiliary/reachable-unnameable-items.rs
diff --git a/src/test/ui/export-tag-variant.rs b/src/test/ui/privacy/export-tag-variant.rs
index 46c10067ce2..46c10067ce2 100644
--- a/src/test/ui/export-tag-variant.rs
+++ b/src/test/ui/privacy/export-tag-variant.rs
diff --git a/src/test/ui/export-tag-variant.stderr b/src/test/ui/privacy/export-tag-variant.stderr
index f73bd454d35..f73bd454d35 100644
--- a/src/test/ui/export-tag-variant.stderr
+++ b/src/test/ui/privacy/export-tag-variant.stderr
diff --git a/src/test/ui/impl-privacy-xc-2.rs b/src/test/ui/privacy/impl-privacy-xc-2.rs
index 390764588fc..390764588fc 100644
--- a/src/test/ui/impl-privacy-xc-2.rs
+++ b/src/test/ui/privacy/impl-privacy-xc-2.rs
diff --git a/src/test/ui/reachable-unnameable-items.rs b/src/test/ui/privacy/reachable-unnameable-items.rs
index f1e53a0d8b4..f1e53a0d8b4 100644
--- a/src/test/ui/reachable-unnameable-items.rs
+++ b/src/test/ui/privacy/reachable-unnameable-items.rs
diff --git a/src/test/ui/core-run-destroy.rs b/src/test/ui/process/core-run-destroy.rs
index 5fd418e6c86..5fd418e6c86 100644
--- a/src/test/ui/core-run-destroy.rs
+++ b/src/test/ui/process/core-run-destroy.rs
diff --git a/src/test/ui/multi-panic.rs b/src/test/ui/process/multi-panic.rs
index 37e8b99c2f6..37e8b99c2f6 100644
--- a/src/test/ui/multi-panic.rs
+++ b/src/test/ui/process/multi-panic.rs
diff --git a/src/test/ui/no-stdio.rs b/src/test/ui/process/no-stdio.rs
index 24985386a97..24985386a97 100644
--- a/src/test/ui/no-stdio.rs
+++ b/src/test/ui/process/no-stdio.rs
diff --git a/src/test/ui/try-wait.rs b/src/test/ui/process/try-wait.rs
index 692197210b1..692197210b1 100644
--- a/src/test/ui/try-wait.rs
+++ b/src/test/ui/process/try-wait.rs
diff --git a/src/test/ui/pure-sum.rs b/src/test/ui/pure-sum.rs
deleted file mode 100644
index 2f2ece75ebe..00000000000
--- a/src/test/ui/pure-sum.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-// run-pass
-
-#![allow(dead_code)]
-// Check that functions can modify local state.
-
-// pretty-expanded FIXME #23616
-
-fn sums_to(v: Vec<isize> , sum: isize) -> bool {
-    let mut i = 0;
-    let mut sum0 = 0;
-    while i < v.len() {
-        sum0 += v[i];
-        i += 1;
-    }
-    return sum0 == sum;
-}
-
-fn sums_to_using_uniq(v: Vec<isize> , sum: isize) -> bool {
-    let mut i = 0;
-    let mut sum0: Box<_> = 0.into();
-    while i < v.len() {
-        *sum0 += v[i];
-        i += 1;
-    }
-    return *sum0 == sum;
-}
-
-fn sums_to_using_rec(v: Vec<isize> , sum: isize) -> bool {
-    let mut i = 0;
-    let mut sum0 = F {f: 0};
-    while i < v.len() {
-        sum0.f += v[i];
-        i += 1;
-    }
-    return sum0.f == sum;
-}
-
-struct F<T> { f: T }
-
-fn sums_to_using_uniq_rec(v: Vec<isize> , sum: isize) -> bool {
-    let mut i = 0;
-    let mut sum0 = F::<Box<_>> {f: 0.into() };
-    while i < v.len() {
-        *sum0.f += v[i];
-        i += 1;
-    }
-    return *sum0.f == sum;
-}
-
-pub fn main() {
-}
diff --git a/src/test/ui/wf-bound-region-in-object-type.rs b/src/test/ui/regions/wf-bound-region-in-object-type.rs
index 7c4dd3ec84f..7c4dd3ec84f 100644
--- a/src/test/ui/wf-bound-region-in-object-type.rs
+++ b/src/test/ui/regions/wf-bound-region-in-object-type.rs
diff --git a/src/test/ui/auxiliary/blind-item-mixed-crate-use-item-foo.rs b/src/test/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo.rs
index cf769f31bf7..cf769f31bf7 100644
--- a/src/test/ui/auxiliary/blind-item-mixed-crate-use-item-foo.rs
+++ b/src/test/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo.rs
diff --git a/src/test/ui/auxiliary/blind-item-mixed-crate-use-item-foo2.rs b/src/test/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
index 81c16ede909..81c16ede909 100644
--- a/src/test/ui/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
+++ b/src/test/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
diff --git a/src/test/ui/blind-item-mixed-crate-use-item.rs b/src/test/ui/resolve/blind-item-mixed-crate-use-item.rs
index 36d8ab151e4..36d8ab151e4 100644
--- a/src/test/ui/blind-item-mixed-crate-use-item.rs
+++ b/src/test/ui/resolve/blind-item-mixed-crate-use-item.rs
diff --git a/src/test/ui/blind-item-mixed-use-item.rs b/src/test/ui/resolve/blind-item-mixed-use-item.rs
index 4a39054967b..4a39054967b 100644
--- a/src/test/ui/blind-item-mixed-use-item.rs
+++ b/src/test/ui/resolve/blind-item-mixed-use-item.rs
diff --git a/src/test/ui/export-fully-qualified.rs b/src/test/ui/resolve/export-fully-qualified.rs
index 4e73a2c5488..4e73a2c5488 100644
--- a/src/test/ui/export-fully-qualified.rs
+++ b/src/test/ui/resolve/export-fully-qualified.rs
diff --git a/src/test/ui/export-fully-qualified.stderr b/src/test/ui/resolve/export-fully-qualified.stderr
index 7ee352e1232..7ee352e1232 100644
--- a/src/test/ui/export-fully-qualified.stderr
+++ b/src/test/ui/resolve/export-fully-qualified.stderr
diff --git a/src/test/ui/no-std-1.rs b/src/test/ui/resolve/no-std-1.rs
index 5b59e9b4eb3..5b59e9b4eb3 100644
--- a/src/test/ui/no-std-1.rs
+++ b/src/test/ui/resolve/no-std-1.rs
diff --git a/src/test/ui/no-std-2.rs b/src/test/ui/resolve/no-std-2.rs
index 487d41649f4..487d41649f4 100644
--- a/src/test/ui/no-std-2.rs
+++ b/src/test/ui/resolve/no-std-2.rs
diff --git a/src/test/ui/no-std-3.rs b/src/test/ui/resolve/no-std-3.rs
index f6c4ed5794c..f6c4ed5794c 100644
--- a/src/test/ui/no-std-3.rs
+++ b/src/test/ui/resolve/no-std-3.rs
diff --git a/src/test/ui/pathless-extern-ok.rs b/src/test/ui/resolve/pathless-extern-ok.rs
index 0ffa5eb8940..0ffa5eb8940 100644
--- a/src/test/ui/pathless-extern-ok.rs
+++ b/src/test/ui/resolve/pathless-extern-ok.rs
diff --git a/src/test/ui/atomic-print.rs b/src/test/ui/runtime/atomic-print.rs
index fe57910530f..fe57910530f 100644
--- a/src/test/ui/atomic-print.rs
+++ b/src/test/ui/runtime/atomic-print.rs
diff --git a/src/test/ui/backtrace-debuginfo-aux.rs b/src/test/ui/runtime/backtrace-debuginfo-aux.rs
index 1411bcf89e8..1411bcf89e8 100644
--- a/src/test/ui/backtrace-debuginfo-aux.rs
+++ b/src/test/ui/runtime/backtrace-debuginfo-aux.rs
diff --git a/src/test/ui/backtrace-debuginfo.rs b/src/test/ui/runtime/backtrace-debuginfo.rs
index b976c3a13bd..b976c3a13bd 100644
--- a/src/test/ui/backtrace-debuginfo.rs
+++ b/src/test/ui/runtime/backtrace-debuginfo.rs
diff --git a/src/test/ui/native-print-no-runtime.rs b/src/test/ui/runtime/native-print-no-runtime.rs
index f17c9fa6ca9..f17c9fa6ca9 100644
--- a/src/test/ui/native-print-no-runtime.rs
+++ b/src/test/ui/runtime/native-print-no-runtime.rs
diff --git a/src/test/ui/stability-in-private-module.rs b/src/test/ui/stability-attribute/stability-in-private-module.rs
index f12e9198b0d..f12e9198b0d 100644
--- a/src/test/ui/stability-in-private-module.rs
+++ b/src/test/ui/stability-attribute/stability-in-private-module.rs
diff --git a/src/test/ui/stability-in-private-module.stderr b/src/test/ui/stability-attribute/stability-in-private-module.stderr
index e64f2acbd35..e64f2acbd35 100644
--- a/src/test/ui/stability-in-private-module.stderr
+++ b/src/test/ui/stability-attribute/stability-in-private-module.stderr
diff --git a/src/test/ui/auxiliary/extern-statics.rs b/src/test/ui/static/auxiliary/extern-statics.rs
index c090bc79fce..c090bc79fce 100644
--- a/src/test/ui/auxiliary/extern-statics.rs
+++ b/src/test/ui/static/auxiliary/extern-statics.rs
diff --git a/src/test/ui/safe-extern-statics-mut.mir.stderr b/src/test/ui/static/safe-extern-statics-mut.mir.stderr
index cec5f9d9c9f..cec5f9d9c9f 100644
--- a/src/test/ui/safe-extern-statics-mut.mir.stderr
+++ b/src/test/ui/static/safe-extern-statics-mut.mir.stderr
diff --git a/src/test/ui/safe-extern-statics-mut.rs b/src/test/ui/static/safe-extern-statics-mut.rs
index 389a4589a71..389a4589a71 100644
--- a/src/test/ui/safe-extern-statics-mut.rs
+++ b/src/test/ui/static/safe-extern-statics-mut.rs
diff --git a/src/test/ui/safe-extern-statics-mut.thir.stderr b/src/test/ui/static/safe-extern-statics-mut.thir.stderr
index 8e6d2805a0b..8e6d2805a0b 100644
--- a/src/test/ui/safe-extern-statics-mut.thir.stderr
+++ b/src/test/ui/static/safe-extern-statics-mut.thir.stderr
diff --git a/src/test/ui/safe-extern-statics.mir.stderr b/src/test/ui/static/safe-extern-statics.mir.stderr
index 102abd0816f..102abd0816f 100644
--- a/src/test/ui/safe-extern-statics.mir.stderr
+++ b/src/test/ui/static/safe-extern-statics.mir.stderr
diff --git a/src/test/ui/safe-extern-statics.rs b/src/test/ui/static/safe-extern-statics.rs
index 0aa90c442ea..0aa90c442ea 100644
--- a/src/test/ui/safe-extern-statics.rs
+++ b/src/test/ui/static/safe-extern-statics.rs
diff --git a/src/test/ui/safe-extern-statics.thir.stderr b/src/test/ui/static/safe-extern-statics.thir.stderr
index 7fd2182c4c6..7fd2182c4c6 100644
--- a/src/test/ui/safe-extern-statics.thir.stderr
+++ b/src/test/ui/static/safe-extern-statics.thir.stderr
diff --git a/src/test/ui/thread-local-in-ctfe.rs b/src/test/ui/static/thread-local-in-ctfe.rs
index 547e5445aa1..547e5445aa1 100644
--- a/src/test/ui/thread-local-in-ctfe.rs
+++ b/src/test/ui/static/thread-local-in-ctfe.rs
diff --git a/src/test/ui/thread-local-in-ctfe.stderr b/src/test/ui/static/thread-local-in-ctfe.stderr
index fd967604624..fd967604624 100644
--- a/src/test/ui/thread-local-in-ctfe.stderr
+++ b/src/test/ui/static/thread-local-in-ctfe.stderr
diff --git a/src/test/ui/matches2021.rs b/src/test/ui/stdlib-unit-tests/matches2021.rs
index 9143a8cdd59..9143a8cdd59 100644
--- a/src/test/ui/matches2021.rs
+++ b/src/test/ui/stdlib-unit-tests/matches2021.rs
diff --git a/src/test/ui/minmax-stability-issue-23687.rs b/src/test/ui/stdlib-unit-tests/minmax-stability-issue-23687.rs
index 9100bfbde95..9100bfbde95 100644
--- a/src/test/ui/minmax-stability-issue-23687.rs
+++ b/src/test/ui/stdlib-unit-tests/minmax-stability-issue-23687.rs
diff --git a/src/test/ui/not-sync.rs b/src/test/ui/stdlib-unit-tests/not-sync.rs
index f4648994fa9..f4648994fa9 100644
--- a/src/test/ui/not-sync.rs
+++ b/src/test/ui/stdlib-unit-tests/not-sync.rs
diff --git a/src/test/ui/not-sync.stderr b/src/test/ui/stdlib-unit-tests/not-sync.stderr
index 1ee358ba836..1ee358ba836 100644
--- a/src/test/ui/not-sync.stderr
+++ b/src/test/ui/stdlib-unit-tests/not-sync.stderr
diff --git a/src/test/ui/raw-fat-ptr.rs b/src/test/ui/stdlib-unit-tests/raw-fat-ptr.rs
index 9f50659ed60..9f50659ed60 100644
--- a/src/test/ui/raw-fat-ptr.rs
+++ b/src/test/ui/stdlib-unit-tests/raw-fat-ptr.rs
diff --git a/src/test/ui/volatile-fat-ptr.rs b/src/test/ui/stdlib-unit-tests/volatile-fat-ptr.rs
index f73e7e1c391..f73e7e1c391 100644
--- a/src/test/ui/volatile-fat-ptr.rs
+++ b/src/test/ui/stdlib-unit-tests/volatile-fat-ptr.rs
diff --git a/src/test/ui/syntax-trait-polarity-feature-gate.rs b/src/test/ui/syntax-trait-polarity-feature-gate.rs
deleted file mode 100644
index 4a3b24383ab..00000000000
--- a/src/test/ui/syntax-trait-polarity-feature-gate.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use std::marker::Send;
-
-struct TestType;
-
-trait TestTrait {}
-
-impl !Send for TestType {}
-//~^ ERROR negative trait bounds
-
-fn main() {}
diff --git a/src/test/ui/syntax-trait-polarity-feature-gate.stderr b/src/test/ui/syntax-trait-polarity-feature-gate.stderr
deleted file mode 100644
index 3562deecbd5..00000000000
--- a/src/test/ui/syntax-trait-polarity-feature-gate.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0658]: negative trait bounds are not yet fully implemented; use marker types for now
-  --> $DIR/syntax-trait-polarity-feature-gate.rs:7:6
-   |
-LL | impl !Send for TestType {}
-   |      ^^^^^
-   |
-   = note: see issue #68318 <https://github.com/rust-lang/rust/issues/68318> for more information
-   = help: add `#![feature(negative_impls)]` to the crate attributes to enable
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/tail-direct.rs b/src/test/ui/tail-direct.rs
deleted file mode 100644
index c67c5b7a555..00000000000
--- a/src/test/ui/tail-direct.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// run-pass
-
-pub fn main() { assert!((even(42))); assert!((odd(45))); }
-
-fn even(n: isize) -> bool { if n == 0 { return true; } else { return odd(n - 1); } }
-
-fn odd(n: isize) -> bool { if n == 0 { return false; } else { return even(n - 1); } }
diff --git a/src/test/ui/clone-with-exterior.rs b/src/test/ui/threads-sendsync/clone-with-exterior.rs
index 9fc661b1477..9fc661b1477 100644
--- a/src/test/ui/clone-with-exterior.rs
+++ b/src/test/ui/threads-sendsync/clone-with-exterior.rs
diff --git a/src/test/ui/tcp-stress.rs b/src/test/ui/threads-sendsync/tcp-stress.rs
index 17566364340..17566364340 100644
--- a/src/test/ui/tcp-stress.rs
+++ b/src/test/ui/threads-sendsync/tcp-stress.rs
diff --git a/src/test/ui/alignment-gep-tup-like-1.rs b/src/test/ui/traits/alignment-gep-tup-like-1.rs
index eb503dcf3b6..eb503dcf3b6 100644
--- a/src/test/ui/alignment-gep-tup-like-1.rs
+++ b/src/test/ui/traits/alignment-gep-tup-like-1.rs
diff --git a/src/test/ui/cycle-generic-bound.rs b/src/test/ui/traits/cycle-generic-bound.rs
index 9241f3789d7..9241f3789d7 100644
--- a/src/test/ui/cycle-generic-bound.rs
+++ b/src/test/ui/traits/cycle-generic-bound.rs
diff --git a/src/test/ui/early-vtbl-resolution.rs b/src/test/ui/traits/early-vtbl-resolution.rs
index f4b69c14095..f4b69c14095 100644
--- a/src/test/ui/early-vtbl-resolution.rs
+++ b/src/test/ui/traits/early-vtbl-resolution.rs
diff --git a/src/test/ui/map-types.rs b/src/test/ui/traits/map-types.rs
index dc33b961800..dc33b961800 100644
--- a/src/test/ui/map-types.rs
+++ b/src/test/ui/traits/map-types.rs
diff --git a/src/test/ui/map-types.stderr b/src/test/ui/traits/map-types.stderr
index 71006e1f4e2..71006e1f4e2 100644
--- a/src/test/ui/map-types.stderr
+++ b/src/test/ui/traits/map-types.stderr
diff --git a/src/test/ui/no_send-struct.rs b/src/test/ui/traits/no_send-struct.rs
index 75a363f9f76..75a363f9f76 100644
--- a/src/test/ui/no_send-struct.rs
+++ b/src/test/ui/traits/no_send-struct.rs
diff --git a/src/test/ui/no_send-struct.stderr b/src/test/ui/traits/no_send-struct.stderr
index ee7bdf282b7..ee7bdf282b7 100644
--- a/src/test/ui/no_send-struct.stderr
+++ b/src/test/ui/traits/no_send-struct.stderr
diff --git a/src/test/ui/try-is-identifier-edition2015.rs b/src/test/ui/try-block/try-is-identifier-edition2015.rs
index 90f56d5fa71..90f56d5fa71 100644
--- a/src/test/ui/try-is-identifier-edition2015.rs
+++ b/src/test/ui/try-block/try-is-identifier-edition2015.rs
diff --git a/src/test/ui/type-ascription.rs b/src/test/ui/type/type-ascription.rs
index 7adb074428c..7adb074428c 100644
--- a/src/test/ui/type-ascription.rs
+++ b/src/test/ui/type/type-ascription.rs
diff --git a/src/test/ui/no-type-for-node-ice.rs b/src/test/ui/typeck/no-type-for-node-ice.rs
index d0cfdbf504d..d0cfdbf504d 100644
--- a/src/test/ui/no-type-for-node-ice.rs
+++ b/src/test/ui/typeck/no-type-for-node-ice.rs
diff --git a/src/test/ui/no-type-for-node-ice.stderr b/src/test/ui/typeck/no-type-for-node-ice.stderr
index b50241fb1a0..b50241fb1a0 100644
--- a/src/test/ui/no-type-for-node-ice.stderr
+++ b/src/test/ui/typeck/no-type-for-node-ice.stderr
diff --git a/src/test/ui/project-cache-issue-37154.rs b/src/test/ui/typeck/project-cache-issue-37154.rs
index b10239c22d1..b10239c22d1 100644
--- a/src/test/ui/project-cache-issue-37154.rs
+++ b/src/test/ui/typeck/project-cache-issue-37154.rs
diff --git a/src/test/ui/ufcs-type-params.rs b/src/test/ui/typeck/ufcs-type-params.rs
index eee2b55b2a0..eee2b55b2a0 100644
--- a/src/test/ui/ufcs-type-params.rs
+++ b/src/test/ui/typeck/ufcs-type-params.rs
diff --git a/src/test/ui/unify-return-ty.rs b/src/test/ui/typeck/unify-return-ty.rs
index da1d82e896a..da1d82e896a 100644
--- a/src/test/ui/unify-return-ty.rs
+++ b/src/test/ui/typeck/unify-return-ty.rs
diff --git a/src/test/ui/maybe-bounds-where.rs b/src/test/ui/unsized/maybe-bounds-where.rs
index d7af0c42480..d7af0c42480 100644
--- a/src/test/ui/maybe-bounds-where.rs
+++ b/src/test/ui/unsized/maybe-bounds-where.rs
diff --git a/src/test/ui/maybe-bounds-where.stderr b/src/test/ui/unsized/maybe-bounds-where.stderr
index 39bc1b88e56..39bc1b88e56 100644
--- a/src/test/ui/maybe-bounds-where.stderr
+++ b/src/test/ui/unsized/maybe-bounds-where.stderr
diff --git a/src/test/ui/wasm-import-module.rs b/src/test/ui/wasm/wasm-import-module.rs
index 4152a1065ca..4152a1065ca 100644
--- a/src/test/ui/wasm-import-module.rs
+++ b/src/test/ui/wasm/wasm-import-module.rs
diff --git a/src/test/ui/wasm-import-module.stderr b/src/test/ui/wasm/wasm-import-module.stderr
index 47d6cb68997..47d6cb68997 100644
--- a/src/test/ui/wasm-import-module.stderr
+++ b/src/test/ui/wasm/wasm-import-module.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 681b2486d07..248d4f1583f 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -7,9 +7,9 @@ use std::path::Path;
 
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
-const ROOT_ENTRY_LIMIT: usize = 1102;
+const ROOT_ENTRY_LIMIT: usize = 983;
 const ISSUES_ENTRY_LIMIT: usize = 2310;
-const PARSER_LIMIT: usize = 1005;
+const PARSER_LIMIT: usize = 1010;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))