Move some tests to more reasonable directories - 2

Address comments

Update limits

190 files changed, 3 insertions, 69 deletions

diff --git a/src/test/ui/issues/issue-28676.rs b/src/test/ui/abi/issue-28676.rs
index 347a840296d..347a840296d 100644
--- a/src/test/ui/issues/issue-28676.rs
+++ b/src/test/ui/abi/issue-28676.rs
diff --git a/src/test/ui/issues/issue-15730.rs b/src/test/ui/array-slice-vec/issue-15730.rs
index dacffd154fc..dacffd154fc 100644
--- a/src/test/ui/issues/issue-15730.rs
+++ b/src/test/ui/array-slice-vec/issue-15730.rs
diff --git a/src/test/ui/issues/issue-24338.rs b/src/test/ui/associated-types/issue-24338.rs
index 3a2c790f852..3a2c790f852 100644
--- a/src/test/ui/issues/issue-24338.rs
+++ b/src/test/ui/associated-types/issue-24338.rs
diff --git a/src/test/ui/issues/issue-48551.rs b/src/test/ui/associated-types/issue-48551.rs
index b95a4832bb2..b95a4832bb2 100644
--- a/src/test/ui/issues/issue-48551.rs
+++ b/src/test/ui/associated-types/issue-48551.rs
diff --git a/src/test/ui/issues/issue-50301.rs b/src/test/ui/associated-types/issue-50301.rs
index 4fcb41485d0..4fcb41485d0 100644
--- a/src/test/ui/issues/issue-50301.rs
+++ b/src/test/ui/associated-types/issue-50301.rs
diff --git a/src/test/ui/object-method-numbering.rs b/src/test/ui/associated-types/object-method-numbering.rs
index bf80a80f406..bf80a80f406 100644
--- a/src/test/ui/object-method-numbering.rs
+++ b/src/test/ui/associated-types/object-method-numbering.rs
diff --git a/src/test/ui/issues/issue-76547.nll.stderr b/src/test/ui/async-await/issue-76547.nll.stderr
index 2456d6a1474..2456d6a1474 100644
--- a/src/test/ui/issues/issue-76547.nll.stderr
+++ b/src/test/ui/async-await/issue-76547.nll.stderr
diff --git a/src/test/ui/issues/issue-76547.rs b/src/test/ui/async-await/issue-76547.rs
index 5b3ee5b95c4..5b3ee5b95c4 100644
--- a/src/test/ui/issues/issue-76547.rs
+++ b/src/test/ui/async-await/issue-76547.rs
diff --git a/src/test/ui/issues/issue-76547.stderr b/src/test/ui/async-await/issue-76547.stderr
index 9bfb0f28028..9bfb0f28028 100644
--- a/src/test/ui/issues/issue-76547.stderr
+++ b/src/test/ui/async-await/issue-76547.stderr
diff --git a/src/test/ui/issues/issue-38940.rs b/src/test/ui/autoref-autoderef/issue-38940.rs
index 3f10fc017a7..3f10fc017a7 100644
--- a/src/test/ui/issues/issue-38940.rs
+++ b/src/test/ui/autoref-autoderef/issue-38940.rs
diff --git a/src/test/ui/issues/issue-38940.stderr b/src/test/ui/autoref-autoderef/issue-38940.stderr
index 0671cede73b..0671cede73b 100644
--- a/src/test/ui/issues/issue-38940.stderr
+++ b/src/test/ui/autoref-autoderef/issue-38940.stderr
diff --git a/src/test/ui/issues/issue-25916.rs b/src/test/ui/binop/issue-25916.rs
index 0b415947965..0b415947965 100644
--- a/src/test/ui/issues/issue-25916.rs
+++ b/src/test/ui/binop/issue-25916.rs
diff --git a/src/test/ui/issues/issue-28837.rs b/src/test/ui/binop/issue-28837.rs
index 9719c3afa68..9719c3afa68 100644
--- a/src/test/ui/issues/issue-28837.rs
+++ b/src/test/ui/binop/issue-28837.rs
diff --git a/src/test/ui/issues/issue-28837.stderr b/src/test/ui/binop/issue-28837.stderr
index 07f67bc3de7..07f67bc3de7 100644
--- a/src/test/ui/issues/issue-28837.stderr
+++ b/src/test/ui/binop/issue-28837.stderr
diff --git a/src/test/ui/issues/issue-17263.rs b/src/test/ui/borrowck/issue-17263.rs
index 7e9ff685482..7e9ff685482 100644
--- a/src/test/ui/issues/issue-17263.rs
+++ b/src/test/ui/borrowck/issue-17263.rs
diff --git a/src/test/ui/issues/issue-17545.rs b/src/test/ui/borrowck/issue-17545.rs
index ced6fff315f..ced6fff315f 100644
--- a/src/test/ui/issues/issue-17545.rs
+++ b/src/test/ui/borrowck/issue-17545.rs
diff --git a/src/test/ui/issues/issue-17545.stderr b/src/test/ui/borrowck/issue-17545.stderr
index 79a1e09bd7c..79a1e09bd7c 100644
--- a/src/test/ui/issues/issue-17545.stderr
+++ b/src/test/ui/borrowck/issue-17545.stderr
diff --git a/src/test/ui/issues/issue-20801.rs b/src/test/ui/borrowck/issue-20801.rs
index c3f136f2876..c3f136f2876 100644
--- a/src/test/ui/issues/issue-20801.rs
+++ b/src/test/ui/borrowck/issue-20801.rs
diff --git a/src/test/ui/issues/issue-20801.stderr b/src/test/ui/borrowck/issue-20801.stderr
index d276231dc0c..d276231dc0c 100644
--- a/src/test/ui/issues/issue-20801.stderr
+++ b/src/test/ui/borrowck/issue-20801.stderr
diff --git a/src/test/ui/issues/issue-24267-flow-exit.rs b/src/test/ui/borrowck/issue-24267-flow-exit.rs
index d6809ee4143..d6809ee4143 100644
--- a/src/test/ui/issues/issue-24267-flow-exit.rs
+++ b/src/test/ui/borrowck/issue-24267-flow-exit.rs
diff --git a/src/test/ui/issues/issue-24267-flow-exit.stderr b/src/test/ui/borrowck/issue-24267-flow-exit.stderr
index 4eb41ca24dd..4eb41ca24dd 100644
--- a/src/test/ui/issues/issue-24267-flow-exit.stderr
+++ b/src/test/ui/borrowck/issue-24267-flow-exit.stderr
diff --git a/src/test/ui/issues/issue-25793.rs b/src/test/ui/borrowck/issue-25793.rs
index 6c8dacc2248..6c8dacc2248 100644
--- a/src/test/ui/issues/issue-25793.rs
+++ b/src/test/ui/borrowck/issue-25793.rs
diff --git a/src/test/ui/issues/issue-25793.stderr b/src/test/ui/borrowck/issue-25793.stderr
index 9d66ba3aae1..9d66ba3aae1 100644
--- a/src/test/ui/issues/issue-25793.stderr
+++ b/src/test/ui/borrowck/issue-25793.stderr
diff --git a/src/test/ui/issues/issue-27282-move-match-input-into-guard.rs b/src/test/ui/borrowck/issue-27282-move-match-input-into-guard.rs
index 71f1f15654b..71f1f15654b 100644
--- a/src/test/ui/issues/issue-27282-move-match-input-into-guard.rs
+++ b/src/test/ui/borrowck/issue-27282-move-match-input-into-guard.rs
diff --git a/src/test/ui/issues/issue-27282-move-match-input-into-guard.stderr b/src/test/ui/borrowck/issue-27282-move-match-input-into-guard.stderr
index 51f9b464d76..51f9b464d76 100644
--- a/src/test/ui/issues/issue-27282-move-match-input-into-guard.stderr
+++ b/src/test/ui/borrowck/issue-27282-move-match-input-into-guard.stderr
diff --git a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.rs b/src/test/ui/borrowck/issue-27282-mutate-before-diverging-arm-2.rs
index 9c3e7e9978e..9c3e7e9978e 100644
--- a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.rs
+++ b/src/test/ui/borrowck/issue-27282-mutate-before-diverging-arm-2.rs
diff --git a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.stderr b/src/test/ui/borrowck/issue-27282-mutate-before-diverging-arm-2.stderr
index f0a3151f4e1..f0a3151f4e1 100644
--- a/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.stderr
+++ b/src/test/ui/borrowck/issue-27282-mutate-before-diverging-arm-2.stderr
diff --git a/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.rs b/src/test/ui/borrowck/issue-27282-reborrow-ref-mut-in-guard.rs
index 82d8b9e9ed9..82d8b9e9ed9 100644
--- a/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.rs
+++ b/src/test/ui/borrowck/issue-27282-reborrow-ref-mut-in-guard.rs
diff --git a/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.stderr b/src/test/ui/borrowck/issue-27282-reborrow-ref-mut-in-guard.stderr
index f0264b56ea5..f0264b56ea5 100644
--- a/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.stderr
+++ b/src/test/ui/borrowck/issue-27282-reborrow-ref-mut-in-guard.stderr
diff --git a/src/test/ui/issues/issue-45199.rs b/src/test/ui/borrowck/issue-45199.rs
index cbd45cbb619..cbd45cbb619 100644
--- a/src/test/ui/issues/issue-45199.rs
+++ b/src/test/ui/borrowck/issue-45199.rs
diff --git a/src/test/ui/issues/issue-45199.stderr b/src/test/ui/borrowck/issue-45199.stderr
index 83b634051bb..83b634051bb 100644
--- a/src/test/ui/issues/issue-45199.stderr
+++ b/src/test/ui/borrowck/issue-45199.stderr
diff --git a/src/test/ui/issues/issue-46471.rs b/src/test/ui/borrowck/issue-46471.rs
index 8922005d2f8..8922005d2f8 100644
--- a/src/test/ui/issues/issue-46471.rs
+++ b/src/test/ui/borrowck/issue-46471.rs
diff --git a/src/test/ui/issues/issue-46471.stderr b/src/test/ui/borrowck/issue-46471.stderr
index 935414c1f3f..935414c1f3f 100644
--- a/src/test/ui/issues/issue-46471.stderr
+++ b/src/test/ui/borrowck/issue-46471.stderr
diff --git a/src/test/ui/issues/issue-73899.rs b/src/test/ui/const-generics/issue-73899.rs
index 2a3a5ab2a3b..2a3a5ab2a3b 100644
--- a/src/test/ui/issues/issue-73899.rs
+++ b/src/test/ui/const-generics/issue-73899.rs
diff --git a/src/test/ui/issues/issue-75763.rs b/src/test/ui/const-generics/issue-75763.rs
index c311de05a1c..c311de05a1c 100644
--- a/src/test/ui/issues/issue-75763.rs
+++ b/src/test/ui/const-generics/issue-75763.rs
diff --git a/src/test/ui/check_const-feature-gated.rs b/src/test/ui/consts/check_const-feature-gated.rs
index f4faab1abc2..f4faab1abc2 100644
--- a/src/test/ui/check_const-feature-gated.rs
+++ b/src/test/ui/consts/check_const-feature-gated.rs
diff --git a/src/test/ui/const-suggest-feature.rs b/src/test/ui/consts/const-suggest-feature.rs
index d11b91edb88..d11b91edb88 100644
--- a/src/test/ui/const-suggest-feature.rs
+++ b/src/test/ui/consts/const-suggest-feature.rs
diff --git a/src/test/ui/const-suggest-feature.stderr b/src/test/ui/consts/const-suggest-feature.stderr
index 1ccc3d754ff..1ccc3d754ff 100644
--- a/src/test/ui/const-suggest-feature.stderr
+++ b/src/test/ui/consts/const-suggest-feature.stderr
diff --git a/src/test/ui/issues/issue-17718-borrow-interior.rs b/src/test/ui/consts/issue-17718-borrow-interior.rs
index 5861f218689..5861f218689 100644
--- a/src/test/ui/issues/issue-17718-borrow-interior.rs
+++ b/src/test/ui/consts/issue-17718-borrow-interior.rs
diff --git a/src/test/ui/issues/issue-17718-const-bad-values.rs b/src/test/ui/consts/issue-17718-const-bad-values.rs
index 49023f18ddb..49023f18ddb 100644
--- a/src/test/ui/issues/issue-17718-const-bad-values.rs
+++ b/src/test/ui/consts/issue-17718-const-bad-values.rs
diff --git a/src/test/ui/issues/issue-17718-const-bad-values.stderr b/src/test/ui/consts/issue-17718-const-bad-values.stderr
index 7c50978d4eb..7c50978d4eb 100644
--- a/src/test/ui/issues/issue-17718-const-bad-values.stderr
+++ b/src/test/ui/consts/issue-17718-const-bad-values.stderr
diff --git a/src/test/ui/issues/issue-17718-const-borrow.rs b/src/test/ui/consts/issue-17718-const-borrow.rs
index 89316dbd5c4..89316dbd5c4 100644
--- a/src/test/ui/issues/issue-17718-const-borrow.rs
+++ b/src/test/ui/consts/issue-17718-const-borrow.rs
diff --git a/src/test/ui/issues/issue-17718-const-borrow.stderr b/src/test/ui/consts/issue-17718-const-borrow.stderr
index e3ff6c923ad..e3ff6c923ad 100644
--- a/src/test/ui/issues/issue-17718-const-borrow.stderr
+++ b/src/test/ui/consts/issue-17718-const-borrow.stderr
diff --git a/src/test/ui/issues/issue-21562.rs b/src/test/ui/consts/issue-21562.rs
index a47d739c6be..a47d739c6be 100644
--- a/src/test/ui/issues/issue-21562.rs
+++ b/src/test/ui/consts/issue-21562.rs
diff --git a/src/test/ui/issues/issue-21721.rs b/src/test/ui/consts/issue-21721.rs
index 4c1411e1ecf..4c1411e1ecf 100644
--- a/src/test/ui/issues/issue-21721.rs
+++ b/src/test/ui/consts/issue-21721.rs
diff --git a/src/test/ui/issues/issue-27890.rs b/src/test/ui/consts/issue-27890.rs
index 9f85473380f..9f85473380f 100644
--- a/src/test/ui/issues/issue-27890.rs
+++ b/src/test/ui/consts/issue-27890.rs
diff --git a/src/test/ui/issues/issue-28113.rs b/src/test/ui/consts/issue-28113.rs
index e5bd7aafe41..e5bd7aafe41 100644
--- a/src/test/ui/issues/issue-28113.rs
+++ b/src/test/ui/consts/issue-28113.rs
diff --git a/src/test/ui/issues/issue-28113.stderr b/src/test/ui/consts/issue-28113.stderr
index 3d274d777b0..3d274d777b0 100644
--- a/src/test/ui/issues/issue-28113.stderr
+++ b/src/test/ui/consts/issue-28113.stderr
diff --git a/src/test/ui/issues/issue-29914-2.rs b/src/test/ui/consts/issue-29914-2.rs
index 626de269d95..626de269d95 100644
--- a/src/test/ui/issues/issue-29914-2.rs
+++ b/src/test/ui/consts/issue-29914-2.rs
diff --git a/src/test/ui/issues/issue-29914-3.rs b/src/test/ui/consts/issue-29914-3.rs
index 1c6c64eb316..1c6c64eb316 100644
--- a/src/test/ui/issues/issue-29914-3.rs
+++ b/src/test/ui/consts/issue-29914-3.rs
diff --git a/src/test/ui/issues/issue-29914.rs b/src/test/ui/consts/issue-29914.rs
index 6da63664dfa..6da63664dfa 100644
--- a/src/test/ui/issues/issue-29914.rs
+++ b/src/test/ui/consts/issue-29914.rs
diff --git a/src/test/ui/issues/issue-29927-1.rs b/src/test/ui/consts/issue-29927-1.rs
index a236e491375..a236e491375 100644
--- a/src/test/ui/issues/issue-29927-1.rs
+++ b/src/test/ui/consts/issue-29927-1.rs
diff --git a/src/test/ui/issues/issue-29927.rs b/src/test/ui/consts/issue-29927.rs
index 3385e4e6e94..3385e4e6e94 100644
--- a/src/test/ui/issues/issue-29927.rs
+++ b/src/test/ui/consts/issue-29927.rs
diff --git a/src/test/ui/issues/issue-32829-2.rs b/src/test/ui/consts/issue-32829-2.rs
index c93c84b5fb7..c93c84b5fb7 100644
--- a/src/test/ui/issues/issue-32829-2.rs
+++ b/src/test/ui/consts/issue-32829-2.rs
diff --git a/src/test/ui/issues/issue-32829-2.stderr b/src/test/ui/consts/issue-32829-2.stderr
index 8d7423f29ae..8d7423f29ae 100644
--- a/src/test/ui/issues/issue-32829-2.stderr
+++ b/src/test/ui/consts/issue-32829-2.stderr
diff --git a/src/test/ui/issues/issue-36163.rs b/src/test/ui/consts/issue-36163.rs
index 340d2c3997c..340d2c3997c 100644
--- a/src/test/ui/issues/issue-36163.rs
+++ b/src/test/ui/consts/issue-36163.rs
diff --git a/src/test/ui/issues/issue-36163.stderr b/src/test/ui/consts/issue-36163.stderr
index 113f86cf0f9..113f86cf0f9 100644
--- a/src/test/ui/issues/issue-36163.stderr
+++ b/src/test/ui/consts/issue-36163.stderr
diff --git a/src/test/ui/issues/issue-43105.rs b/src/test/ui/consts/issue-43105.rs
index cc6a4850853..cc6a4850853 100644
--- a/src/test/ui/issues/issue-43105.rs
+++ b/src/test/ui/consts/issue-43105.rs
diff --git a/src/test/ui/issues/issue-43105.stderr b/src/test/ui/consts/issue-43105.stderr
index e508cbdd1dd..e508cbdd1dd 100644
--- a/src/test/ui/issues/issue-43105.stderr
+++ b/src/test/ui/consts/issue-43105.stderr
diff --git a/src/test/ui/issues/issue-47789.rs b/src/test/ui/consts/issue-47789.rs
index 32dd909b2e9..32dd909b2e9 100644
--- a/src/test/ui/issues/issue-47789.rs
+++ b/src/test/ui/consts/issue-47789.rs
diff --git a/src/test/ui/issues/issue-52023-array-size-pointer-cast.rs b/src/test/ui/consts/issue-52023-array-size-pointer-cast.rs
index cc756ce815f..cc756ce815f 100644
--- a/src/test/ui/issues/issue-52023-array-size-pointer-cast.rs
+++ b/src/test/ui/consts/issue-52023-array-size-pointer-cast.rs
diff --git a/src/test/ui/issues/issue-52023-array-size-pointer-cast.stderr b/src/test/ui/consts/issue-52023-array-size-pointer-cast.stderr
index 68b5cbd9bd7..68b5cbd9bd7 100644
--- a/src/test/ui/issues/issue-52023-array-size-pointer-cast.stderr
+++ b/src/test/ui/consts/issue-52023-array-size-pointer-cast.stderr
diff --git a/src/test/ui/issues/issue-58435-ice-with-assoc-const.rs b/src/test/ui/consts/issue-58435-ice-with-assoc-const.rs
index fac727d2d7d..fac727d2d7d 100644
--- a/src/test/ui/issues/issue-58435-ice-with-assoc-const.rs
+++ b/src/test/ui/consts/issue-58435-ice-with-assoc-const.rs
diff --git a/src/test/ui/issues/issue-6991.rs b/src/test/ui/consts/issue-6991.rs
index f00cd9aeffd..f00cd9aeffd 100644
--- a/src/test/ui/issues/issue-6991.rs
+++ b/src/test/ui/consts/issue-6991.rs
diff --git a/src/test/ui/rustc-args-required-const.rs b/src/test/ui/consts/rustc-args-required-const.rs
index 87f979f1b27..87f979f1b27 100644
--- a/src/test/ui/rustc-args-required-const.rs
+++ b/src/test/ui/consts/rustc-args-required-const.rs
diff --git a/src/test/ui/rustc-args-required-const.stderr b/src/test/ui/consts/rustc-args-required-const.stderr
index 8b302692053..8b302692053 100644
--- a/src/test/ui/rustc-args-required-const.stderr
+++ b/src/test/ui/consts/rustc-args-required-const.stderr
diff --git a/src/test/ui/issues/issue-30018-nopanic.rs b/src/test/ui/drop/issue-30018-nopanic.rs
index 291bab2736d..291bab2736d 100644
--- a/src/test/ui/issues/issue-30018-nopanic.rs
+++ b/src/test/ui/drop/issue-30018-nopanic.rs
diff --git a/src/test/ui/issues/issue-28498-ugeh-with-lifetime-param.rs b/src/test/ui/dropck/issue-28498-ugeh-with-lifetime-param.rs
index 43c0bfb26cd..43c0bfb26cd 100644
--- a/src/test/ui/issues/issue-28498-ugeh-with-lifetime-param.rs
+++ b/src/test/ui/dropck/issue-28498-ugeh-with-lifetime-param.rs
diff --git a/src/test/ui/issues/issue-28498-ugeh-with-trait-bound.rs b/src/test/ui/dropck/issue-28498-ugeh-with-trait-bound.rs
index 61d11cf3834..61d11cf3834 100644
--- a/src/test/ui/issues/issue-28498-ugeh-with-trait-bound.rs
+++ b/src/test/ui/dropck/issue-28498-ugeh-with-trait-bound.rs
diff --git a/src/test/ui/issues/issue-29844.rs b/src/test/ui/dropck/issue-29844.rs
index e08942da5e4..e08942da5e4 100644
--- a/src/test/ui/issues/issue-29844.rs
+++ b/src/test/ui/dropck/issue-29844.rs
diff --git a/src/test/ui/issues/issue-43398.rs b/src/test/ui/enum-discriminant/issue-43398.rs
index 581db033f92..581db033f92 100644
--- a/src/test/ui/issues/issue-43398.rs
+++ b/src/test/ui/enum-discriminant/issue-43398.rs
diff --git a/src/test/ui/issues/issue-43398.stderr b/src/test/ui/enum-discriminant/issue-43398.stderr
index 9a394153bf6..9a394153bf6 100644
--- a/src/test/ui/issues/issue-43398.stderr
+++ b/src/test/ui/enum-discriminant/issue-43398.stderr
diff --git a/src/test/ui/trace_macros-gate.rs b/src/test/ui/feature-gates/trace_macros-gate.rs
index c9af04741ac..c9af04741ac 100644
--- a/src/test/ui/trace_macros-gate.rs
+++ b/src/test/ui/feature-gates/trace_macros-gate.rs
diff --git a/src/test/ui/trace_macros-gate.stderr b/src/test/ui/feature-gates/trace_macros-gate.stderr
index 36d7dfdf8f8..36d7dfdf8f8 100644
--- a/src/test/ui/trace_macros-gate.stderr
+++ b/src/test/ui/feature-gates/trace_macros-gate.stderr
diff --git a/src/test/ui/issues/issue-2936.rs b/src/test/ui/generics/issue-2936.rs
index 6b932d01d55..6b932d01d55 100644
--- a/src/test/ui/issues/issue-2936.rs
+++ b/src/test/ui/generics/issue-2936.rs
diff --git a/src/test/ui/nested_impl_trait.rs b/src/test/ui/impl-trait/nested_impl_trait.rs
index be2c21a7743..be2c21a7743 100644
--- a/src/test/ui/nested_impl_trait.rs
+++ b/src/test/ui/impl-trait/nested_impl_trait.rs
diff --git a/src/test/ui/nested_impl_trait.stderr b/src/test/ui/impl-trait/nested_impl_trait.stderr
index 3749c268a68..3749c268a68 100644
--- a/src/test/ui/nested_impl_trait.stderr
+++ b/src/test/ui/impl-trait/nested_impl_trait.stderr
diff --git a/src/test/ui/point-to-type-err-cause-on-impl-trait-return.rs b/src/test/ui/impl-trait/point-to-type-err-cause-on-impl-trait-return.rs
index fa7664a83ee..fa7664a83ee 100644
--- a/src/test/ui/point-to-type-err-cause-on-impl-trait-return.rs
+++ b/src/test/ui/impl-trait/point-to-type-err-cause-on-impl-trait-return.rs
diff --git a/src/test/ui/point-to-type-err-cause-on-impl-trait-return.stderr b/src/test/ui/impl-trait/point-to-type-err-cause-on-impl-trait-return.stderr
index eb4dc45c8a9..eb4dc45c8a9 100644
--- a/src/test/ui/point-to-type-err-cause-on-impl-trait-return.stderr
+++ b/src/test/ui/impl-trait/point-to-type-err-cause-on-impl-trait-return.stderr
diff --git a/src/test/ui/issues/issue-26873-onefile.rs b/src/test/ui/imports/issue-26873-onefile.rs
index f06c6499eb0..f06c6499eb0 100644
--- a/src/test/ui/issues/issue-26873-onefile.rs
+++ b/src/test/ui/imports/issue-26873-onefile.rs
diff --git a/src/test/ui/issues/issue-32119.rs b/src/test/ui/imports/issue-32119.rs
index 36adb5289ac..36adb5289ac 100644
--- a/src/test/ui/issues/issue-32119.rs
+++ b/src/test/ui/imports/issue-32119.rs
diff --git a/src/test/ui/issues/issue-32222.rs b/src/test/ui/imports/issue-32222.rs
index 4ed06bff803..4ed06bff803 100644
--- a/src/test/ui/issues/issue-32222.rs
+++ b/src/test/ui/imports/issue-32222.rs
diff --git a/src/test/ui/issues/issue-15881-model-lexer-dotdotdot.rs b/src/test/ui/issues/issue-15881-model-lexer-dotdotdot.rs
deleted file mode 100644
index dee7f25d7bb..00000000000
--- a/src/test/ui/issues/issue-15881-model-lexer-dotdotdot.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-// run-pass
-#![allow(illegal_floating_point_literal_pattern)] // FIXME #41620
-#![allow(ellipsis_inclusive_range_patterns)]
-
-// regression test for the model lexer handling the DOTDOTDOT syntax (#15877)
-
-
-pub fn main() {
-    match 5_usize {
-      1_usize...5_usize => {}
-      _ => panic!("should match range"),
-    }
-    match 5_usize {
-      6_usize...7_usize => panic!("shouldn't match range"),
-      _ => {}
-    }
-    match 5_usize {
-      1_usize => panic!("should match non-first range"),
-      2_usize...6_usize => {}
-      _ => panic!("math is broken")
-    }
-    match 'c' {
-      'a'...'z' => {}
-      _ => panic!("should support char ranges")
-    }
-    match -3_isize {
-      -7...5 => {}
-      _ => panic!("should match signed range")
-    }
-    match 3.0f64 {
-      1.0...5.0 => {}
-      _ => panic!("should match float range")
-    }
-    match -1.5f64 {
-      -3.6...3.6 => {}
-      _ => panic!("should match negative float range")
-    }
-}
diff --git a/src/test/ui/expr_attr_paren_order.rs b/src/test/ui/lint/expr_attr_paren_order.rs
index 65f2b67d22b..65f2b67d22b 100644
--- a/src/test/ui/expr_attr_paren_order.rs
+++ b/src/test/ui/lint/expr_attr_paren_order.rs
diff --git a/src/test/ui/expr_attr_paren_order.stderr b/src/test/ui/lint/expr_attr_paren_order.stderr
index c6b373e3f13..c6b373e3f13 100644
--- a/src/test/ui/expr_attr_paren_order.stderr
+++ b/src/test/ui/lint/expr_attr_paren_order.stderr
diff --git a/src/test/ui/issues/issue-17718-const-naming.rs b/src/test/ui/lint/issue-17718-const-naming.rs
index 7386478f9f0..7386478f9f0 100644
--- a/src/test/ui/issues/issue-17718-const-naming.rs
+++ b/src/test/ui/lint/issue-17718-const-naming.rs
diff --git a/src/test/ui/issues/issue-17718-const-naming.stderr b/src/test/ui/lint/issue-17718-const-naming.stderr
index ce4ebcb5e3e..ce4ebcb5e3e 100644
--- a/src/test/ui/issues/issue-17718-const-naming.stderr
+++ b/src/test/ui/lint/issue-17718-const-naming.stderr
diff --git a/src/test/ui/issues/issue-30302.rs b/src/test/ui/lint/issue-30302.rs
index c37d4f29d10..c37d4f29d10 100644
--- a/src/test/ui/issues/issue-30302.rs
+++ b/src/test/ui/lint/issue-30302.rs
diff --git a/src/test/ui/issues/issue-30302.stderr b/src/test/ui/lint/issue-30302.stderr
index 849ff1ebd92..849ff1ebd92 100644
--- a/src/test/ui/issues/issue-30302.stderr
+++ b/src/test/ui/lint/issue-30302.stderr
diff --git a/src/test/ui/issues/issue-34798.rs b/src/test/ui/lint/issue-34798.rs
index f0d710123cd..f0d710123cd 100644
--- a/src/test/ui/issues/issue-34798.rs
+++ b/src/test/ui/lint/issue-34798.rs
diff --git a/src/test/ui/trivial_casts.rs b/src/test/ui/lint/trivial_casts.rs
index 0a8b9de1de3..0a8b9de1de3 100644
--- a/src/test/ui/trivial_casts.rs
+++ b/src/test/ui/lint/trivial_casts.rs
diff --git a/src/test/ui/trivial_casts.stderr b/src/test/ui/lint/trivial_casts.stderr
index 141703460ba..141703460ba 100644
--- a/src/test/ui/trivial_casts.stderr
+++ b/src/test/ui/lint/trivial_casts.stderr
diff --git a/src/test/ui/inline-asm-bad-constraint.rs b/src/test/ui/llvm-asm/inline-asm-bad-constraint.rs
index edf2c2e3180..edf2c2e3180 100644
--- a/src/test/ui/inline-asm-bad-constraint.rs
+++ b/src/test/ui/llvm-asm/inline-asm-bad-constraint.rs
diff --git a/src/test/ui/inline-asm-bad-constraint.stderr b/src/test/ui/llvm-asm/inline-asm-bad-constraint.stderr
index d6a3b6e8382..d6a3b6e8382 100644
--- a/src/test/ui/inline-asm-bad-constraint.stderr
+++ b/src/test/ui/llvm-asm/inline-asm-bad-constraint.stderr
diff --git a/src/test/ui/inline-asm-bad-operand.rs b/src/test/ui/llvm-asm/inline-asm-bad-operand.rs
index e5fc4ee0106..e5fc4ee0106 100644
--- a/src/test/ui/inline-asm-bad-operand.rs
+++ b/src/test/ui/llvm-asm/inline-asm-bad-operand.rs
diff --git a/src/test/ui/inline-asm-bad-operand.stderr b/src/test/ui/llvm-asm/inline-asm-bad-operand.stderr
index 1ac7024ec8b..1ac7024ec8b 100644
--- a/src/test/ui/inline-asm-bad-operand.stderr
+++ b/src/test/ui/llvm-asm/inline-asm-bad-operand.stderr
diff --git a/src/test/ui/issues/issue-14936.rs b/src/test/ui/llvm-asm/issue-14936.rs
index 02095a2f7e4..02095a2f7e4 100644
--- a/src/test/ui/issues/issue-14936.rs
+++ b/src/test/ui/llvm-asm/issue-14936.rs
diff --git a/src/test/ui/issues/auxiliary/issue-40469.rs b/src/test/ui/macros/auxiliary/issue-40469.rs
index 4f2f41f2cde..4f2f41f2cde 100644
--- a/src/test/ui/issues/auxiliary/issue-40469.rs
+++ b/src/test/ui/macros/auxiliary/issue-40469.rs
diff --git a/src/test/ui/issues/issue-26322.rs b/src/test/ui/macros/issue-26322.rs
index c1dc80eb7c5..c1dc80eb7c5 100644
--- a/src/test/ui/issues/issue-26322.rs
+++ b/src/test/ui/macros/issue-26322.rs
diff --git a/src/test/ui/issues/issue-40469.rs b/src/test/ui/macros/issue-40469.rs
index 25e08ef85e9..25e08ef85e9 100644
--- a/src/test/ui/issues/issue-40469.rs
+++ b/src/test/ui/macros/issue-40469.rs
diff --git a/src/test/ui/issues/issue-41803.rs b/src/test/ui/macros/issue-41803.rs
index 19ab81d04d0..19ab81d04d0 100644
--- a/src/test/ui/issues/issue-41803.rs
+++ b/src/test/ui/macros/issue-41803.rs
diff --git a/src/test/ui/issues/issue-5060.rs b/src/test/ui/macros/issue-5060.rs
index c4760bc029b..c4760bc029b 100644
--- a/src/test/ui/issues/issue-5060.rs
+++ b/src/test/ui/macros/issue-5060.rs
diff --git a/src/test/ui/issues/issue-66851.rs b/src/test/ui/mir/issue-66851.rs
index 72d62a30a33..72d62a30a33 100644
--- a/src/test/ui/issues/issue-66851.rs
+++ b/src/test/ui/mir/issue-66851.rs
diff --git a/src/test/ui/issues/issue-45696-long-live-borrows-in-boxes.rs b/src/test/ui/nll/issue-45696-long-live-borrows-in-boxes.rs
index b3f655628ba..b3f655628ba 100644
--- a/src/test/ui/issues/issue-45696-long-live-borrows-in-boxes.rs
+++ b/src/test/ui/nll/issue-45696-long-live-borrows-in-boxes.rs
diff --git a/src/test/ui/issues/issue-51345-2.rs b/src/test/ui/nll/issue-51345-2.rs
index 52f342a8500..52f342a8500 100644
--- a/src/test/ui/issues/issue-51345-2.rs
+++ b/src/test/ui/nll/issue-51345-2.rs
diff --git a/src/test/ui/issues/issue-51770.rs b/src/test/ui/nll/issue-51770.rs
index bcb37a5f4ff..bcb37a5f4ff 100644
--- a/src/test/ui/issues/issue-51770.rs
+++ b/src/test/ui/nll/issue-51770.rs
diff --git a/src/test/ui/issues/issue-54943-3.rs b/src/test/ui/nll/issue-54943-3.rs
index e6c2611b683..e6c2611b683 100644
--- a/src/test/ui/issues/issue-54943-3.rs
+++ b/src/test/ui/nll/issue-54943-3.rs
diff --git a/src/test/ui/issues/issue-55511.rs b/src/test/ui/nll/issue-55511.rs
index 7dfa9c7bcdf..7dfa9c7bcdf 100644
--- a/src/test/ui/issues/issue-55511.rs
+++ b/src/test/ui/nll/issue-55511.rs
diff --git a/src/test/ui/issues/issue-55511.stderr b/src/test/ui/nll/issue-55511.stderr
index bf3e58e8cdb..bf3e58e8cdb 100644
--- a/src/test/ui/issues/issue-55511.stderr
+++ b/src/test/ui/nll/issue-55511.stderr
diff --git a/src/test/ui/non-built-in-quote.rs b/src/test/ui/non-built-in-quote.rs
deleted file mode 100644
index 92efa99e396..00000000000
--- a/src/test/ui/non-built-in-quote.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// run-pass
-// pretty-expanded FIXME #23616
-
-macro_rules! quote_tokens { () => (()) }
-
-pub fn main() {
-    quote_tokens!();
-}
diff --git a/src/test/ui/issues/issue-8460-const.noopt.stderr b/src/test/ui/numbers-arithmetic/issue-8460-const.noopt.stderr
index d94c7742de3..d94c7742de3 100644
--- a/src/test/ui/issues/issue-8460-const.noopt.stderr
+++ b/src/test/ui/numbers-arithmetic/issue-8460-const.noopt.stderr
diff --git a/src/test/ui/issues/issue-8460-const.opt.stderr b/src/test/ui/numbers-arithmetic/issue-8460-const.opt.stderr
index d94c7742de3..d94c7742de3 100644
--- a/src/test/ui/issues/issue-8460-const.opt.stderr
+++ b/src/test/ui/numbers-arithmetic/issue-8460-const.opt.stderr
diff --git a/src/test/ui/issues/issue-8460-const.opt_with_overflow_checks.stderr b/src/test/ui/numbers-arithmetic/issue-8460-const.opt_with_overflow_checks.stderr
index d94c7742de3..d94c7742de3 100644
--- a/src/test/ui/issues/issue-8460-const.opt_with_overflow_checks.stderr
+++ b/src/test/ui/numbers-arithmetic/issue-8460-const.opt_with_overflow_checks.stderr
diff --git a/src/test/ui/issues/issue-8460-const.rs b/src/test/ui/numbers-arithmetic/issue-8460-const.rs
index dc754666c8e..dc754666c8e 100644
--- a/src/test/ui/issues/issue-8460-const.rs
+++ b/src/test/ui/numbers-arithmetic/issue-8460-const.rs
diff --git a/src/test/ui/issues/issue-8460.rs b/src/test/ui/numbers-arithmetic/issue-8460.rs
index a7de4bd74aa..a7de4bd74aa 100644
--- a/src/test/ui/issues/issue-8460.rs
+++ b/src/test/ui/numbers-arithmetic/issue-8460.rs
diff --git a/src/test/ui/issues/auxiliary/issue-21146-inc.rs b/src/test/ui/parser/auxiliary/issue-21146-inc.rs
index 32a3b9dcc35..32a3b9dcc35 100644
--- a/src/test/ui/issues/auxiliary/issue-21146-inc.rs
+++ b/src/test/ui/parser/auxiliary/issue-21146-inc.rs
diff --git a/src/test/ui/can-begin-expr-check.rs b/src/test/ui/parser/can-begin-expr-check.rs
index 8974d9f48c1..8974d9f48c1 100644
--- a/src/test/ui/can-begin-expr-check.rs
+++ b/src/test/ui/parser/can-begin-expr-check.rs
diff --git a/src/test/ui/can-begin-expr-check.stderr b/src/test/ui/parser/can-begin-expr-check.stderr
index d674fc36bc2..d674fc36bc2 100644
--- a/src/test/ui/can-begin-expr-check.stderr
+++ b/src/test/ui/parser/can-begin-expr-check.stderr
diff --git a/src/test/ui/issues/issue-20616-1.rs b/src/test/ui/parser/issue-20616-1.rs
index 49e9cb310c1..49e9cb310c1 100644
--- a/src/test/ui/issues/issue-20616-1.rs
+++ b/src/test/ui/parser/issue-20616-1.rs
diff --git a/src/test/ui/issues/issue-20616-1.stderr b/src/test/ui/parser/issue-20616-1.stderr
index 81604623785..81604623785 100644
--- a/src/test/ui/issues/issue-20616-1.stderr
+++ b/src/test/ui/parser/issue-20616-1.stderr
diff --git a/src/test/ui/issues/issue-20616-2.rs b/src/test/ui/parser/issue-20616-2.rs
index f108ae5de14..f108ae5de14 100644
--- a/src/test/ui/issues/issue-20616-2.rs
+++ b/src/test/ui/parser/issue-20616-2.rs
diff --git a/src/test/ui/issues/issue-20616-2.stderr b/src/test/ui/parser/issue-20616-2.stderr
index 01e3d3dd7cc..01e3d3dd7cc 100644
--- a/src/test/ui/issues/issue-20616-2.stderr
+++ b/src/test/ui/parser/issue-20616-2.stderr
diff --git a/src/test/ui/issues/issue-21146.rs b/src/test/ui/parser/issue-21146.rs
index 19eaffc3edd..19eaffc3edd 100644
--- a/src/test/ui/issues/issue-21146.rs
+++ b/src/test/ui/parser/issue-21146.rs
diff --git a/src/test/ui/issues/issue-21146.stderr b/src/test/ui/parser/issue-21146.stderr
index c71fda3d63f..c71fda3d63f 100644
--- a/src/test/ui/issues/issue-21146.stderr
+++ b/src/test/ui/parser/issue-21146.stderr
diff --git a/src/test/ui/issues/issue-34222-1.rs b/src/test/ui/parser/issue-34222-1.rs
index d36dddc97bb..d36dddc97bb 100644
--- a/src/test/ui/issues/issue-34222-1.rs
+++ b/src/test/ui/parser/issue-34222-1.rs
diff --git a/src/test/ui/issues/issue-34222-1.stderr b/src/test/ui/parser/issue-34222-1.stderr
index 0799656b06b..0799656b06b 100644
--- a/src/test/ui/issues/issue-34222-1.stderr
+++ b/src/test/ui/parser/issue-34222-1.stderr
diff --git a/src/test/ui/issues/issue-43196.rs b/src/test/ui/parser/issue-43196.rs
index 0eefa01ce6d..0eefa01ce6d 100644
--- a/src/test/ui/issues/issue-43196.rs
+++ b/src/test/ui/parser/issue-43196.rs
diff --git a/src/test/ui/issues/issue-43196.stderr b/src/test/ui/parser/issue-43196.stderr
index 4f7ed5cc6fd..4f7ed5cc6fd 100644
--- a/src/test/ui/issues/issue-43196.stderr
+++ b/src/test/ui/parser/issue-43196.stderr
diff --git a/src/test/ui/issues/issue-44021.rs b/src/test/ui/parser/issue-44021.rs
index 0b9558cc91e..0b9558cc91e 100644
--- a/src/test/ui/issues/issue-44021.rs
+++ b/src/test/ui/parser/issue-44021.rs
diff --git a/src/test/ui/issues/issue-44021.stderr b/src/test/ui/parser/issue-44021.stderr
index b888cd989a6..b888cd989a6 100644
--- a/src/test/ui/issues/issue-44021.stderr
+++ b/src/test/ui/parser/issue-44021.stderr
diff --git a/src/test/ui/issues/issue-45296.rs b/src/test/ui/parser/issue-45296.rs
index f242c1d2937..f242c1d2937 100644
--- a/src/test/ui/issues/issue-45296.rs
+++ b/src/test/ui/parser/issue-45296.rs
diff --git a/src/test/ui/issues/issue-45296.stderr b/src/test/ui/parser/issue-45296.stderr
index c0d4ce1243e..c0d4ce1243e 100644
--- a/src/test/ui/issues/issue-45296.stderr
+++ b/src/test/ui/parser/issue-45296.stderr
diff --git a/src/test/ui/issues/issue-46186.fixed b/src/test/ui/parser/issue-46186.fixed
index 2cb5a4996ee..2cb5a4996ee 100644
--- a/src/test/ui/issues/issue-46186.fixed
+++ b/src/test/ui/parser/issue-46186.fixed
diff --git a/src/test/ui/issues/issue-46186.rs b/src/test/ui/parser/issue-46186.rs
index 84cad38c5ec..84cad38c5ec 100644
--- a/src/test/ui/issues/issue-46186.rs
+++ b/src/test/ui/parser/issue-46186.rs
diff --git a/src/test/ui/issues/issue-46186.stderr b/src/test/ui/parser/issue-46186.stderr
index 0766c8a33df..0766c8a33df 100644
--- a/src/test/ui/issues/issue-46186.stderr
+++ b/src/test/ui/parser/issue-46186.stderr
diff --git a/src/test/ui/issues/issue-51602.rs b/src/test/ui/parser/issue-51602.rs
index 0e96ca914a9..0e96ca914a9 100644
--- a/src/test/ui/issues/issue-51602.rs
+++ b/src/test/ui/parser/issue-51602.rs
diff --git a/src/test/ui/issues/issue-51602.stderr b/src/test/ui/parser/issue-51602.stderr
index d800890bca3..d800890bca3 100644
--- a/src/test/ui/issues/issue-51602.stderr
+++ b/src/test/ui/parser/issue-51602.stderr
diff --git a/src/test/ui/issues/issue-52496.rs b/src/test/ui/parser/issue-52496.rs
index 4e945365373..4e945365373 100644
--- a/src/test/ui/issues/issue-52496.rs
+++ b/src/test/ui/parser/issue-52496.rs
diff --git a/src/test/ui/issues/issue-52496.stderr b/src/test/ui/parser/issue-52496.stderr
index 10fcc46f344..10fcc46f344 100644
--- a/src/test/ui/issues/issue-52496.stderr
+++ b/src/test/ui/parser/issue-52496.stderr
diff --git a/src/test/ui/issues/issue-58856-2.rs b/src/test/ui/parser/issue-58856-2.rs
index 9356d57b0e5..9356d57b0e5 100644
--- a/src/test/ui/issues/issue-58856-2.rs
+++ b/src/test/ui/parser/issue-58856-2.rs
diff --git a/src/test/ui/issues/issue-58856-2.stderr b/src/test/ui/parser/issue-58856-2.stderr
index 303b5eacc32..303b5eacc32 100644
--- a/src/test/ui/issues/issue-58856-2.stderr
+++ b/src/test/ui/parser/issue-58856-2.stderr
diff --git a/src/test/ui/issues/issue-60075.rs b/src/test/ui/parser/issue-60075.rs
index e89d78ee8a6..e89d78ee8a6 100644
--- a/src/test/ui/issues/issue-60075.rs
+++ b/src/test/ui/parser/issue-60075.rs
diff --git a/src/test/ui/issues/issue-60075.stderr b/src/test/ui/parser/issue-60075.stderr
index e3b7f4ad420..e3b7f4ad420 100644
--- a/src/test/ui/issues/issue-60075.stderr
+++ b/src/test/ui/parser/issue-60075.stderr
diff --git a/src/test/ui/issues/issue-62554.rs b/src/test/ui/parser/issue-62554.rs
index cfd02183cb4..cfd02183cb4 100644
--- a/src/test/ui/issues/issue-62554.rs
+++ b/src/test/ui/parser/issue-62554.rs
diff --git a/src/test/ui/issues/issue-62554.stderr b/src/test/ui/parser/issue-62554.stderr
index 935d3842cdf..935d3842cdf 100644
--- a/src/test/ui/issues/issue-62554.stderr
+++ b/src/test/ui/parser/issue-62554.stderr
diff --git a/src/test/ui/issues/issue-66473.rs b/src/test/ui/parser/issue-66473.rs
index 9db4521bb42..9db4521bb42 100644
--- a/src/test/ui/issues/issue-66473.rs
+++ b/src/test/ui/parser/issue-66473.rs
Binary files differdiff --git a/src/test/ui/issues/issue-66473.stderr b/src/test/ui/parser/issue-66473.stderr
index b370b125cfe..b370b125cfe 100644
--- a/src/test/ui/issues/issue-66473.stderr
+++ b/src/test/ui/parser/issue-66473.stderr
Binary files differdiff --git a/src/test/ui/issues/issue-72253.rs b/src/test/ui/parser/issue-72253.rs
index 6f9af73b039..6f9af73b039 100644
--- a/src/test/ui/issues/issue-72253.rs
+++ b/src/test/ui/parser/issue-72253.rs
diff --git a/src/test/ui/issues/issue-72253.stderr b/src/test/ui/parser/issue-72253.stderr
index 3819fd92a9e..3819fd92a9e 100644
--- a/src/test/ui/issues/issue-72253.stderr
+++ b/src/test/ui/parser/issue-72253.stderr
diff --git a/src/test/ui/issues/issue-72373.rs b/src/test/ui/parser/issue-72373.rs
index 4da6061c27f..4da6061c27f 100644
--- a/src/test/ui/issues/issue-72373.rs
+++ b/src/test/ui/parser/issue-72373.rs
diff --git a/src/test/ui/issues/issue-72373.stderr b/src/test/ui/parser/issue-72373.stderr
index dfde8624814..dfde8624814 100644
--- a/src/test/ui/issues/issue-72373.stderr
+++ b/src/test/ui/parser/issue-72373.stderr
diff --git a/src/test/ui/issues/issue-75599.rs b/src/test/ui/parser/issue-75599.rs
index 0857676e4ed..0857676e4ed 100644
--- a/src/test/ui/issues/issue-75599.rs
+++ b/src/test/ui/parser/issue-75599.rs
diff --git a/src/test/ui/issue-76597.fixed b/src/test/ui/parser/issue-76597.fixed
index 2d7a30b8361..2d7a30b8361 100644
--- a/src/test/ui/issue-76597.fixed
+++ b/src/test/ui/parser/issue-76597.fixed
diff --git a/src/test/ui/issue-76597.rs b/src/test/ui/parser/issue-76597.rs
index 521b9c64b1c..521b9c64b1c 100644
--- a/src/test/ui/issue-76597.rs
+++ b/src/test/ui/parser/issue-76597.rs
diff --git a/src/test/ui/issue-76597.stderr b/src/test/ui/parser/issue-76597.stderr
index 50b23329f0c..50b23329f0c 100644
--- a/src/test/ui/issue-76597.stderr
+++ b/src/test/ui/parser/issue-76597.stderr
diff --git a/src/test/ui/lifetime_starts_expressions.rs b/src/test/ui/parser/lifetime_starts_expressions.rs
index e0098793e1f..e0098793e1f 100644
--- a/src/test/ui/lifetime_starts_expressions.rs
+++ b/src/test/ui/parser/lifetime_starts_expressions.rs
diff --git a/src/test/ui/lifetime_starts_expressions.stderr b/src/test/ui/parser/lifetime_starts_expressions.stderr
index 7275841ebb8..7275841ebb8 100644
--- a/src/test/ui/lifetime_starts_expressions.stderr
+++ b/src/test/ui/parser/lifetime_starts_expressions.stderr
diff --git a/src/test/ui/issues/issue-12582.rs b/src/test/ui/pattern/issue-12582.rs
index f3366704e63..f3366704e63 100644
--- a/src/test/ui/issues/issue-12582.rs
+++ b/src/test/ui/pattern/issue-12582.rs
diff --git a/src/test/ui/issues/issue-14221.rs b/src/test/ui/pattern/issue-14221.rs
index 282c4111369..282c4111369 100644
--- a/src/test/ui/issues/issue-14221.rs
+++ b/src/test/ui/pattern/issue-14221.rs
diff --git a/src/test/ui/issues/issue-14221.stderr b/src/test/ui/pattern/issue-14221.stderr
index fc8ae1ed7b5..fc8ae1ed7b5 100644
--- a/src/test/ui/issues/issue-14221.stderr
+++ b/src/test/ui/pattern/issue-14221.stderr
diff --git a/src/test/ui/issues/issue-22546.rs b/src/test/ui/pattern/issue-22546.rs
index c26e457f9e4..c26e457f9e4 100644
--- a/src/test/ui/issues/issue-22546.rs
+++ b/src/test/ui/pattern/issue-22546.rs
diff --git a/src/test/ui/issues/issue-6449.rs b/src/test/ui/pattern/issue-6449.rs
index bfd4c123208..bfd4c123208 100644
--- a/src/test/ui/issues/issue-6449.rs
+++ b/src/test/ui/pattern/issue-6449.rs
diff --git a/src/test/ui/issues/issue-67037-pat-tup-scrut-ty-diff-less-fields.rs b/src/test/ui/pattern/issue-67037-pat-tup-scrut-ty-diff-less-fields.rs
index a3023ee906d..a3023ee906d 100644
--- a/src/test/ui/issues/issue-67037-pat-tup-scrut-ty-diff-less-fields.rs
+++ b/src/test/ui/pattern/issue-67037-pat-tup-scrut-ty-diff-less-fields.rs
diff --git a/src/test/ui/issues/issue-67037-pat-tup-scrut-ty-diff-less-fields.stderr b/src/test/ui/pattern/issue-67037-pat-tup-scrut-ty-diff-less-fields.stderr
index 9bdbf0bf9f4..9bdbf0bf9f4 100644
--- a/src/test/ui/issues/issue-67037-pat-tup-scrut-ty-diff-less-fields.stderr
+++ b/src/test/ui/pattern/issue-67037-pat-tup-scrut-ty-diff-less-fields.stderr
diff --git a/src/test/ui/size-and-align.rs b/src/test/ui/pattern/size-and-align.rs
index a32b5de7292..a32b5de7292 100644
--- a/src/test/ui/size-and-align.rs
+++ b/src/test/ui/pattern/size-and-align.rs
diff --git a/src/test/ui/issues/issue-29161.rs b/src/test/ui/privacy/issue-29161.rs
index d80405aa856..d80405aa856 100644
--- a/src/test/ui/issues/issue-29161.rs
+++ b/src/test/ui/privacy/issue-29161.rs
diff --git a/src/test/ui/issues/issue-29161.stderr b/src/test/ui/privacy/issue-29161.stderr
index 7ce95e4b0df..7ce95e4b0df 100644
--- a/src/test/ui/issues/issue-29161.stderr
+++ b/src/test/ui/privacy/issue-29161.stderr
diff --git a/src/test/ui/issues/issue-30079.rs b/src/test/ui/privacy/issue-30079.rs
index a02a932d057..a02a932d057 100644
--- a/src/test/ui/issues/issue-30079.rs
+++ b/src/test/ui/privacy/issue-30079.rs
diff --git a/src/test/ui/issues/issue-30079.stderr b/src/test/ui/privacy/issue-30079.stderr
index e40b1942059..e40b1942059 100644
--- a/src/test/ui/issues/issue-30079.stderr
+++ b/src/test/ui/privacy/issue-30079.stderr
diff --git a/src/test/ui/priv-in-bad-locations.rs b/src/test/ui/privacy/priv-in-bad-locations.rs
index 76af8c6cde8..76af8c6cde8 100644
--- a/src/test/ui/priv-in-bad-locations.rs
+++ b/src/test/ui/privacy/priv-in-bad-locations.rs
diff --git a/src/test/ui/priv-in-bad-locations.stderr b/src/test/ui/privacy/priv-in-bad-locations.stderr
index 75bd2fe47b7..75bd2fe47b7 100644
--- a/src/test/ui/priv-in-bad-locations.stderr
+++ b/src/test/ui/privacy/priv-in-bad-locations.stderr
diff --git a/src/test/ui/unreachable-code-ret.rs b/src/test/ui/reachable/unreachable-code-ret.rs
index fad35794fae..fad35794fae 100644
--- a/src/test/ui/unreachable-code-ret.rs
+++ b/src/test/ui/reachable/unreachable-code-ret.rs
diff --git a/src/test/ui/unreachable-code-ret.stderr b/src/test/ui/reachable/unreachable-code-ret.stderr
index 72abb4fc8db..72abb4fc8db 100644
--- a/src/test/ui/unreachable-code-ret.stderr
+++ b/src/test/ui/reachable/unreachable-code-ret.stderr
diff --git a/src/test/ui/issues/issue-12470.rs b/src/test/ui/regions/issue-12470.rs
index 0ade359923a..0ade359923a 100644
--- a/src/test/ui/issues/issue-12470.rs
+++ b/src/test/ui/regions/issue-12470.rs
diff --git a/src/test/ui/issues/issue-12470.stderr b/src/test/ui/regions/issue-12470.stderr
index c97e59195ed..c97e59195ed 100644
--- a/src/test/ui/issues/issue-12470.stderr
+++ b/src/test/ui/regions/issue-12470.stderr
diff --git a/src/test/ui/issues/issue-24085.rs b/src/test/ui/regions/issue-24085.rs
index 86e94beb7e2..86e94beb7e2 100644
--- a/src/test/ui/issues/issue-24085.rs
+++ b/src/test/ui/regions/issue-24085.rs
diff --git a/src/test/ui/issues/issue-2718.rs b/src/test/ui/regions/issue-2718.rs
index 6449337eea4..6449337eea4 100644
--- a/src/test/ui/issues/issue-2718.rs
+++ b/src/test/ui/regions/issue-2718.rs
diff --git a/src/test/ui/issues/issue-28848.nll.stderr b/src/test/ui/regions/issue-28848.nll.stderr
index a29dac4c9c8..a29dac4c9c8 100644
--- a/src/test/ui/issues/issue-28848.nll.stderr
+++ b/src/test/ui/regions/issue-28848.nll.stderr
diff --git a/src/test/ui/issues/issue-28848.rs b/src/test/ui/regions/issue-28848.rs
index a6250239030..a6250239030 100644
--- a/src/test/ui/issues/issue-28848.rs
+++ b/src/test/ui/regions/issue-28848.rs
diff --git a/src/test/ui/issues/issue-28848.stderr b/src/test/ui/regions/issue-28848.stderr
index 726844a3184..726844a3184 100644
--- a/src/test/ui/issues/issue-28848.stderr
+++ b/src/test/ui/regions/issue-28848.stderr
diff --git a/src/test/ui/issues/issue-5243.rs b/src/test/ui/regions/issue-5243.rs
index c511d45f02d..c511d45f02d 100644
--- a/src/test/ui/issues/issue-5243.rs
+++ b/src/test/ui/regions/issue-5243.rs
diff --git a/src/test/ui/eprint-on-tls-drop.rs b/src/test/ui/threads-sendsync/eprint-on-tls-drop.rs
index f5243077384..f5243077384 100644
--- a/src/test/ui/eprint-on-tls-drop.rs
+++ b/src/test/ui/threads-sendsync/eprint-on-tls-drop.rs
diff --git a/src/test/ui/issues/issue-6334.rs b/src/test/ui/traits/issue-6334.rs
index acf48da1543..acf48da1543 100644
--- a/src/test/ui/issues/issue-6334.rs
+++ b/src/test/ui/traits/issue-6334.rs
diff --git a/src/test/ui/issues/issue-65673.rs b/src/test/ui/traits/issue-65673.rs
index 4b47bd493a5..4b47bd493a5 100644
--- a/src/test/ui/issues/issue-65673.rs
+++ b/src/test/ui/traits/issue-65673.rs
diff --git a/src/test/ui/issues/issue-65673.stderr b/src/test/ui/traits/issue-65673.stderr
index 64cc0bab3f3..64cc0bab3f3 100644
--- a/src/test/ui/issues/issue-65673.stderr
+++ b/src/test/ui/traits/issue-65673.stderr
diff --git a/src/test/ui/issues/issue-9394-inherited-trait-calls.rs b/src/test/ui/traits/issue-9394-inherited-trait-calls.rs
index cc0dd4fc14a..cc0dd4fc14a 100644
--- a/src/test/ui/issues/issue-9394-inherited-trait-calls.rs
+++ b/src/test/ui/traits/issue-9394-inherited-trait-calls.rs
diff --git a/src/test/ui/typestate-cfg-nesting.rs b/src/test/ui/typestate-cfg-nesting.rs
deleted file mode 100644
index 5718e0efd18..00000000000
--- a/src/test/ui/typestate-cfg-nesting.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// run-pass
-
-#![allow(dead_code)]
-#![allow(unused_assignments)]
-#![allow(unknown_lints)]
-// pretty-expanded FIXME #23616
-
-#![allow(dead_assignment)]
-#![allow(unused_variables)]
-
-fn f() {
-    let x = 10; let mut y = 11;
-    if true { match x { _ => { y = x; } } } else { }
-}
-
-pub fn main() {
-    let x = 10;
-    let mut y = 11;
-    if true { while false { y = x; } } else { }
-}
diff --git a/src/test/ui/issues/issue-45087-unreachable-unsafe.rs b/src/test/ui/unsafe/issue-45087-unreachable-unsafe.rs
index 5edf7a47e2f..5edf7a47e2f 100644
--- a/src/test/ui/issues/issue-45087-unreachable-unsafe.rs
+++ b/src/test/ui/unsafe/issue-45087-unreachable-unsafe.rs
diff --git a/src/test/ui/issues/issue-45087-unreachable-unsafe.stderr b/src/test/ui/unsafe/issue-45087-unreachable-unsafe.stderr
index d112d7f4661..d112d7f4661 100644
--- a/src/test/ui/issues/issue-45087-unreachable-unsafe.stderr
+++ b/src/test/ui/unsafe/issue-45087-unreachable-unsafe.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index bc5e43d8f0a..e687901f212 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -7,8 +7,8 @@ use std::path::Path;
 
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
-const ROOT_ENTRY_LIMIT: usize = 1500;
-const ISSUES_ENTRY_LIMIT: usize = 2830;
+const ROOT_ENTRY_LIMIT: usize = 1458;
+const ISSUES_ENTRY_LIMIT: usize = 2669;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))
@@ -30,7 +30,7 @@ fn check_entries(path: &Path, bad: &mut bool) {
             };
 
             let count = std::fs::read_dir(dir_path).unwrap().count();
-            if count >= limit {
+            if count > limit {
                 tidy_error!(
                     bad,
                     "following path contains more than {} entries, \