diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
index ea1a967538b..cd3976ea657 100644
--- a/src/tools/tidy/src/issues.txt
+++ b/src/tools/tidy/src/issues.txt
@@ -98,6 +98,7 @@
 "ui/associated-types/issue-25700-1.rs",
 "ui/associated-types/issue-25700-2.rs",
 "ui/associated-types/issue-25700.rs",
+"ui/associated-types/issue-26262.rs",
 "ui/associated-types/issue-26681.rs",
 "ui/associated-types/issue-27675-unchecked-bounds.rs",
 "ui/associated-types/issue-27901.rs",
@@ -182,8 +183,8 @@
 "ui/async-await/issue-67651.rs",
 "ui/async-await/issue-67765-async-diagnostic.rs",
 "ui/async-await/issue-68112.rs",
-"ui/async-await/issue-68523-start.rs",
 "ui/async-await/issue-68523.rs",
+"ui/async-await/issue-68523-start.rs",
 "ui/async-await/issue-69446-fnmut-capture.rs",
 "ui/async-await/issue-70594.rs",
 "ui/async-await/issue-70818.rs",
@@ -341,8 +342,8 @@
 "ui/borrowck/issue-52967-edition-2018-needs-two-phase-borrows.rs",
 "ui/borrowck/issue-53432-nested-closure-outlives-borrowed-value.rs",
 "ui/borrowck/issue-54499-field-mutation-marks-mut-as-used.rs",
-"ui/borrowck/issue-54499-field-mutation-of-moved-out-with-mut.rs",
 "ui/borrowck/issue-54499-field-mutation-of-moved-out.rs",
+"ui/borrowck/issue-54499-field-mutation-of-moved-out-with-mut.rs",
 "ui/borrowck/issue-54499-field-mutation-of-never-init.rs",
 "ui/borrowck/issue-54597-reject-move-out-of-borrow-via-pat.rs",
 "ui/borrowck/issue-55492-borrowck-migrate-scans-parents.rs",
@@ -359,9 +360,9 @@
 "ui/borrowck/issue-71546.rs",
 "ui/borrowck/issue-7573.rs",
 "ui/borrowck/issue-80772.rs",
-"ui/borrowck/issue-81365-1.rs",
 "ui/borrowck/issue-81365-10.rs",
 "ui/borrowck/issue-81365-11.rs",
+"ui/borrowck/issue-81365-1.rs",
 "ui/borrowck/issue-81365-2.rs",
 "ui/borrowck/issue-81365-3.rs",
 "ui/borrowck/issue-81365-4.rs",
@@ -391,9 +392,6 @@
 "ui/borrowck/issue-95079-missing-move-in-nested-closure.rs",
 "ui/box/issue-82446.rs",
 "ui/box/issue-95036.rs",
-"ui/c-variadic/issue-32201.rs",
-"ui/c-variadic/issue-86053-1.rs",
-"ui/c-variadic/issue-86053-2.rs",
 "ui/cast/issue-106883-is-empty.rs",
 "ui/cast/issue-10991.rs",
 "ui/cast/issue-17444.rs",
@@ -401,19 +399,19 @@
 "ui/cast/issue-85586.rs",
 "ui/cast/issue-88621.rs",
 "ui/cast/issue-89497.rs",
-"ui/closure-expected-type/issue-24421.rs",
 "ui/closure_context/issue-26046-fn-mut.rs",
 "ui/closure_context/issue-26046-fn-once.rs",
 "ui/closure_context/issue-42065.rs",
+"ui/closure-expected-type/issue-24421.rs",
 "ui/closures/2229_closure_analysis/issue-118144.rs",
 "ui/closures/2229_closure_analysis/issue-87378.rs",
 "ui/closures/2229_closure_analysis/issue-87987.rs",
 "ui/closures/2229_closure_analysis/issue-88118-2.rs",
+"ui/closures/2229_closure_analysis/issue_88118.rs",
 "ui/closures/2229_closure_analysis/issue-88476.rs",
 "ui/closures/2229_closure_analysis/issue-89606.rs",
 "ui/closures/2229_closure_analysis/issue-90465.rs",
 "ui/closures/2229_closure_analysis/issue-92724-needsdrop-query-cycle.rs",
-"ui/closures/2229_closure_analysis/issue_88118.rs",
 "ui/closures/2229_closure_analysis/match/issue-87097.rs",
 "ui/closures/2229_closure_analysis/match/issue-87426.rs",
 "ui/closures/2229_closure_analysis/match/issue-87988.rs",
@@ -466,6 +464,7 @@
 "ui/codegen/issue-16602-1.rs",
 "ui/codegen/issue-16602-2.rs",
 "ui/codegen/issue-16602-3.rs",
+"ui/codegen/issue-27859.rs",
 "ui/codegen/issue-28950.rs",
 "ui/codegen/issue-55976.rs",
 "ui/codegen/issue-63787.rs",
@@ -645,8 +644,8 @@
 "ui/const-generics/issues/issue-99641.rs",
 "ui/const-generics/parser-error-recovery/issue-89013-no-assoc.rs",
 "ui/const-generics/parser-error-recovery/issue-89013-no-kw.rs",
-"ui/const-generics/parser-error-recovery/issue-89013-type.rs",
 "ui/const-generics/parser-error-recovery/issue-89013.rs",
+"ui/const-generics/parser-error-recovery/issue-89013-type.rs",
 "ui/const-generics/type-dependent/issue-61936.rs",
 "ui/const-generics/type-dependent/issue-63695.rs",
 "ui/const-generics/type-dependent/issue-67144-1.rs",
@@ -690,13 +689,13 @@
 "ui/consts/const-eval/issue-91827-extern-types-field-offset.rs",
 "ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier-2.rs",
 "ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier.rs",
-"ui/consts/const-mut-refs/issue-76510.rs",
 "ui/consts/const_in_pattern/issue-34784-match-on-non-int-raw-ptr.rs",
 "ui/consts/const_in_pattern/issue-44333.rs",
 "ui/consts/const_in_pattern/issue-53708.rs",
 "ui/consts/const_in_pattern/issue-62614.rs",
 "ui/consts/const_in_pattern/issue-65466.rs",
 "ui/consts/const_in_pattern/issue-73431.rs",
+"ui/consts/const-mut-refs/issue-76510.rs",
 "ui/consts/control-flow/issue-46843.rs",
 "ui/consts/control-flow/issue-50577.rs",
 "ui/consts/extra-const-ub/issue-100771.rs",
@@ -715,9 +714,9 @@
 "ui/consts/issue-17074.rs",
 "ui/consts/issue-17458.rs",
 "ui/consts/issue-17718-borrow-interior.rs",
+"ui/consts/issue-17718-constants-not-static.rs",
 "ui/consts/issue-17718-const-bad-values.rs",
 "ui/consts/issue-17718-const-borrow.rs",
-"ui/consts/issue-17718-constants-not-static.rs",
 "ui/consts/issue-17718-references.rs",
 "ui/consts/issue-17718.rs",
 "ui/consts/issue-17756.rs",
@@ -842,6 +841,9 @@
 "ui/coroutine/issue-91477.rs",
 "ui/coroutine/issue-93161.rs",
 "ui/cross-crate/issue-64872/issue-64872.rs",
+"ui/c-variadic/issue-32201.rs",
+"ui/c-variadic/issue-86053-1.rs",
+"ui/c-variadic/issue-86053-2.rs",
 "ui/cycle-trait/issue-12511.rs",
 "ui/debuginfo/issue-105386-debuginfo-ub.rs",
 "ui/deprecation/issue-66340-deprecated-attr-non-meta-grammar.rs",
@@ -857,6 +859,7 @@
 "ui/deriving/issue-103157.rs",
 "ui/deriving/issue-15689-1.rs",
 "ui/deriving/issue-15689-2.rs",
+"ui/deriving/issue-18738.rs",
 "ui/deriving/issue-19358.rs",
 "ui/deriving/issue-3935.rs",
 "ui/deriving/issue-58319.rs",
@@ -899,6 +902,15 @@
 "ui/did_you_mean/issue-56028-there-is-an-enum-variant.rs",
 "ui/did_you_mean/issue-87830-try-brackets-for-arrays.rs",
 "ui/drop/auxiliary/issue-10028.rs",
+"ui/dropck/issue-24805-dropck-itemless.rs",
+"ui/dropck/issue-28498-ugeh-with-lifetime-param.rs",
+"ui/dropck/issue-28498-ugeh-with-passed-to-fn.rs",
+"ui/dropck/issue-28498-ugeh-with-trait-bound.rs",
+"ui/dropck/issue-29844.rs",
+"ui/dropck/issue-34053.rs",
+"ui/dropck/issue-38868.rs",
+"ui/dropck/issue-54943-1.rs",
+"ui/dropck/issue-54943-2.rs",
 "ui/drop/issue-100276.rs",
 "ui/drop/issue-10028.rs",
 "ui/drop/issue-103107.rs",
@@ -906,6 +918,7 @@
 "ui/drop/issue-17718-const-destructors.rs",
 "ui/drop/issue-21486.rs",
 "ui/drop/issue-23338-ensure-param-drop-order.rs",
+"ui/drop/issue-23611-enum-swap-in-drop.rs",
 "ui/drop/issue-2734.rs",
 "ui/drop/issue-2735-2.rs",
 "ui/drop/issue-2735-3.rs",
@@ -916,21 +929,13 @@
 "ui/drop/issue-90752-raw-ptr-shenanigans.rs",
 "ui/drop/issue-90752.rs",
 "ui/drop/issue-979.rs",
-"ui/dropck/issue-24805-dropck-itemless.rs",
-"ui/dropck/issue-28498-ugeh-with-lifetime-param.rs",
-"ui/dropck/issue-28498-ugeh-with-passed-to-fn.rs",
-"ui/dropck/issue-28498-ugeh-with-trait-bound.rs",
-"ui/dropck/issue-29844.rs",
-"ui/dropck/issue-34053.rs",
-"ui/dropck/issue-38868.rs",
-"ui/dropck/issue-54943-1.rs",
-"ui/dropck/issue-54943-2.rs",
 "ui/dst/issue-113447.rs",
 "ui/dst/issue-90528-unsizing-not-suggestion-110063.rs",
 "ui/dst/issue-90528-unsizing-suggestion-1.rs",
 "ui/dst/issue-90528-unsizing-suggestion-2.rs",
 "ui/dst/issue-90528-unsizing-suggestion-3.rs",
 "ui/dst/issue-90528-unsizing-suggestion-4.rs",
+"ui/dyn-keyword/issue-5153.rs",
 "ui/dyn-keyword/issue-56327-dyn-trait-in-macro-is-okay.rs",
 "ui/dyn-star/issue-102430.rs",
 "ui/empty/issue-37026.rs",
@@ -1009,14 +1014,14 @@
 "ui/fn/issue-3904.rs",
 "ui/fn/issue-39259.rs",
 "ui/fn/issue-80179.rs",
+"ui/foreign/issue-74120-lowering-of-ffi-block-bodies.rs",
+"ui/foreign/issue-91370-foreign-fn-block-impl.rs",
+"ui/foreign/issue-99276-same-type-lifetimes.rs",
+"ui/for/issue-20605.rs",
 "ui/for-loop-while/issue-1257.rs",
 "ui/for-loop-while/issue-2216.rs",
 "ui/for-loop-while/issue-51345.rs",
 "ui/for-loop-while/issue-69841.rs",
-"ui/for/issue-20605.rs",
-"ui/foreign/issue-74120-lowering-of-ffi-block-bodies.rs",
-"ui/foreign/issue-91370-foreign-fn-block-impl.rs",
-"ui/foreign/issue-99276-same-type-lifetimes.rs",
 "ui/function-pointer/issue-102289.rs",
 "ui/functions-closures/closure-expected-type/issue-38714.rs",
 "ui/generic-associated-types/bugs/issue-100013.rs",
@@ -1079,8 +1084,8 @@
 "ui/generic-associated-types/issue-87258_b.rs",
 "ui/generic-associated-types/issue-87429-2.rs",
 "ui/generic-associated-types/issue-87429-associated-type-default.rs",
-"ui/generic-associated-types/issue-87429-specialization.rs",
 "ui/generic-associated-types/issue-87429.rs",
+"ui/generic-associated-types/issue-87429-specialization.rs",
 "ui/generic-associated-types/issue-87748.rs",
 "ui/generic-associated-types/issue-87750.rs",
 "ui/generic-associated-types/issue-88287.rs",
@@ -1090,9 +1095,9 @@
 "ui/generic-associated-types/issue-88595.rs",
 "ui/generic-associated-types/issue-89008.rs",
 "ui/generic-associated-types/issue-89352.rs",
-"ui/generic-associated-types/issue-90014-tait.rs",
-"ui/generic-associated-types/issue-90014-tait2.rs",
 "ui/generic-associated-types/issue-90014.rs",
+"ui/generic-associated-types/issue-90014-tait2.rs",
+"ui/generic-associated-types/issue-90014-tait.rs",
 "ui/generic-associated-types/issue-90729.rs",
 "ui/generic-associated-types/issue-91139.rs",
 "ui/generic-associated-types/issue-91883.rs",
@@ -1114,8 +1119,8 @@
 "ui/generics/issue-333.rs",
 "ui/generics/issue-59508-1.rs",
 "ui/generics/issue-59508.rs",
-"ui/generics/issue-61631-default-type-param-can-reference-self-in-trait.rs",
 "ui/generics/issue-61631-default-type-param-cannot-reference-self.rs",
+"ui/generics/issue-61631-default-type-param-can-reference-self-in-trait.rs",
 "ui/generics/issue-65285-incorrect-explicit-lifetime-name-needed.rs",
 "ui/generics/issue-79605.rs",
 "ui/generics/issue-80512-param-reordering-with-defaults.rs",
@@ -1174,6 +1179,9 @@
 "ui/hygiene/issue-47312.rs",
 "ui/hygiene/issue-61574-const-parameters.rs",
 "ui/hygiene/issue-77523-def-site-async-await.rs",
+"ui/implied-bounds/issue-100690.rs",
+"ui/implied-bounds/issue-101951.rs",
+"ui/implied-bounds/issue-110161.rs",
 "ui/impl-trait/explicit-generic-args-with-impl-trait/issue-87718.rs",
 "ui/impl-trait/in-trait/issue-102140.rs",
 "ui/impl-trait/in-trait/issue-102301.rs",
@@ -1253,9 +1261,6 @@
 "ui/impl-trait/issues/issue-92305.rs",
 "ui/impl-trait/issues/issue-93788.rs",
 "ui/impl-trait/issues/issue-99348-impl-compatibility.rs",
-"ui/implied-bounds/issue-100690.rs",
-"ui/implied-bounds/issue-101951.rs",
-"ui/implied-bounds/issue-110161.rs",
 "ui/imports/auxiliary/issue-114682-2-extern.rs",
 "ui/imports/auxiliary/issue-114682-3-extern.rs",
 "ui/imports/auxiliary/issue-114682-4-extern.rs",
@@ -1344,6 +1349,7 @@
 "ui/inference/issue-12028.rs",
 "ui/inference/issue-28935.rs",
 "ui/inference/issue-36053.rs",
+"ui/inference/issue-3743.rs",
 "ui/inference/issue-70082.rs",
 "ui/inference/issue-70703.rs",
 "ui/inference/issue-71309.rs",
@@ -1362,8 +1368,8 @@
 "ui/inference/need_type_info/issue-107745-avoid-expr-from-macro-expansion.rs",
 "ui/inference/need_type_info/issue-109905.rs",
 "ui/inference/need_type_info/issue-113264-incorrect-impl-trait-in-path-suggestion.rs",
-"ui/infinite/issue-41731-infinite-macro-print.rs",
 "ui/infinite/issue-41731-infinite-macro-println.rs",
+"ui/infinite/issue-41731-infinite-macro-print.rs",
 "ui/intrinsics/issue-28575.rs",
 "ui/intrinsics/issue-84297-reifying-copy.rs",
 "ui/invalid/issue-114435-layout-type-err.rs",
@@ -1380,8 +1386,8 @@
 "ui/issues/auxiliary/issue-11508.rs",
 "ui/issues/auxiliary/issue-11529.rs",
 "ui/issues/auxiliary/issue-11680.rs",
-"ui/issues/auxiliary/issue-12133-dylib.rs",
 "ui/issues/auxiliary/issue-12133-dylib2.rs",
+"ui/issues/auxiliary/issue-12133-dylib.rs",
 "ui/issues/auxiliary/issue-12133-rlib.rs",
 "ui/issues/auxiliary/issue-12612-1.rs",
 "ui/issues/auxiliary/issue-12612-2.rs",
@@ -1548,8 +1554,8 @@
 "ui/issues/issue-13497-2.rs",
 "ui/issues/issue-13497.rs",
 "ui/issues/issue-13507-2.rs",
-"ui/issues/issue-1362.rs",
 "ui/issues/issue-13620.rs",
+"ui/issues/issue-1362.rs",
 "ui/issues/issue-13665.rs",
 "ui/issues/issue-13703.rs",
 "ui/issues/issue-13763.rs",
@@ -1595,7 +1601,6 @@
 "ui/issues/issue-15094.rs",
 "ui/issues/issue-15104.rs",
 "ui/issues/issue-15129-rpass.rs",
-"ui/issues/issue-15155.rs",
 "ui/issues/issue-15167.rs",
 "ui/issues/issue-15189.rs",
 "ui/issues/issue-15207.rs",
@@ -1644,8 +1649,8 @@
 "ui/issues/issue-16819.rs",
 "ui/issues/issue-16922-rpass.rs",
 "ui/issues/issue-16939.rs",
-"ui/issues/issue-1696.rs",
 "ui/issues/issue-16966.rs",
+"ui/issues/issue-1696.rs",
 "ui/issues/issue-16994.rs",
 "ui/issues/issue-17001.rs",
 "ui/issues/issue-17033.rs",
@@ -1713,7 +1718,6 @@
 "ui/issues/issue-18611.rs",
 "ui/issues/issue-18685.rs",
 "ui/issues/issue-18711.rs",
-"ui/issues/issue-18738.rs",
 "ui/issues/issue-18767.rs",
 "ui/issues/issue-18783.rs",
 "ui/issues/issue-18809.rs",
@@ -1725,8 +1729,8 @@
 "ui/issues/issue-18952.rs",
 "ui/issues/issue-18959.rs",
 "ui/issues/issue-18988.rs",
-"ui/issues/issue-1900.rs",
 "ui/issues/issue-19001.rs",
+"ui/issues/issue-1900.rs",
 "ui/issues/issue-19037.rs",
 "ui/issues/issue-19086.rs",
 "ui/issues/issue-19097.rs",
@@ -1752,7 +1756,6 @@
 "ui/issues/issue-19479.rs",
 "ui/issues/issue-19482.rs",
 "ui/issues/issue-19499.rs",
-"ui/issues/issue-19521.rs",
 "ui/issues/issue-19601.rs",
 "ui/issues/issue-1962.rs",
 "ui/issues/issue-19631.rs",
@@ -1823,10 +1826,9 @@
 "ui/issues/issue-21622.rs",
 "ui/issues/issue-21634.rs",
 "ui/issues/issue-21655.rs",
-"ui/issues/issue-2170-exe.rs",
 "ui/issues/issue-21701.rs",
+"ui/issues/issue-2170-exe.rs",
 "ui/issues/issue-21763.rs",
-"ui/issues/issue-21837.rs",
 "ui/issues/issue-21891.rs",
 "ui/issues/issue-2190-1.rs",
 "ui/issues/issue-21909.rs",
@@ -1861,15 +1863,15 @@
 "ui/issues/issue-22777.rs",
 "ui/issues/issue-22781.rs",
 "ui/issues/issue-22789.rs",
-"ui/issues/issue-2281-part1.rs",
 "ui/issues/issue-22814.rs",
+"ui/issues/issue-2281-part1.rs",
 "ui/issues/issue-2284.rs",
 "ui/issues/issue-22864-1.rs",
 "ui/issues/issue-22864-2.rs",
 "ui/issues/issue-22872.rs",
 "ui/issues/issue-22874.rs",
-"ui/issues/issue-2288.rs",
 "ui/issues/issue-22886.rs",
+"ui/issues/issue-2288.rs",
 "ui/issues/issue-22894.rs",
 "ui/issues/issue-22933-1.rs",
 "ui/issues/issue-22933-2.rs",
@@ -1882,9 +1884,9 @@
 "ui/issues/issue-23073.rs",
 "ui/issues/issue-2311-2.rs",
 "ui/issues/issue-2311.rs",
-"ui/issues/issue-2312.rs",
 "ui/issues/issue-23122-1.rs",
 "ui/issues/issue-23122-2.rs",
+"ui/issues/issue-2312.rs",
 "ui/issues/issue-2316-c.rs",
 "ui/issues/issue-23173.rs",
 "ui/issues/issue-23189.rs",
@@ -1911,13 +1913,12 @@
 "ui/issues/issue-23544.rs",
 "ui/issues/issue-23550.rs",
 "ui/issues/issue-23589.rs",
-"ui/issues/issue-23611-enum-swap-in-drop.rs",
 "ui/issues/issue-23649-1.rs",
 "ui/issues/issue-23649-2.rs",
 "ui/issues/issue-23649-3.rs",
 "ui/issues/issue-23699.rs",
-"ui/issues/issue-2380-b.rs",
 "ui/issues/issue-23808.rs",
+"ui/issues/issue-2380-b.rs",
 "ui/issues/issue-2383.rs",
 "ui/issues/issue-23891.rs",
 "ui/issues/issue-23898.rs",
@@ -1941,7 +1942,6 @@
 "ui/issues/issue-24389.rs",
 "ui/issues/issue-24424.rs",
 "ui/issues/issue-24434.rs",
-"ui/issues/issue-24446.rs",
 "ui/issues/issue-2445-b.rs",
 "ui/issues/issue-2445.rs",
 "ui/issues/issue-24533.rs",
@@ -1981,8 +1981,8 @@
 "ui/issues/issue-25746-bool-transmute.rs",
 "ui/issues/issue-25757.rs",
 "ui/issues/issue-25810.rs",
-"ui/issues/issue-2590.rs",
 "ui/issues/issue-25901.rs",
+"ui/issues/issue-2590.rs",
 "ui/issues/issue-26056.rs",
 "ui/issues/issue-26093.rs",
 "ui/issues/issue-26095.rs",
@@ -1992,7 +1992,6 @@
 "ui/issues/issue-26205.rs",
 "ui/issues/issue-26217.rs",
 "ui/issues/issue-26237.rs",
-"ui/issues/issue-26262.rs",
 "ui/issues/issue-2631-b.rs",
 "ui/issues/issue-2642.rs",
 "ui/issues/issue-26468.rs",
@@ -2029,7 +2028,6 @@
 "ui/issues/issue-27697.rs",
 "ui/issues/issue-27815.rs",
 "ui/issues/issue-27842.rs",
-"ui/issues/issue-27859.rs",
 "ui/issues/issue-27889.rs",
 "ui/issues/issue-27942.rs",
 "ui/issues/issue-27949.rs",
@@ -2043,10 +2041,10 @@
 "ui/issues/issue-28433.rs",
 "ui/issues/issue-28472.rs",
 "ui/issues/issue-2848.rs",
-"ui/issues/issue-2849.rs",
 "ui/issues/issue-28498-must-work-ex1.rs",
 "ui/issues/issue-28498-must-work-ex2.rs",
 "ui/issues/issue-28498-ugeh-ex1.rs",
+"ui/issues/issue-2849.rs",
 "ui/issues/issue-28550.rs",
 "ui/issues/issue-28561.rs",
 "ui/issues/issue-28568.rs",
@@ -2064,8 +2062,8 @@
 "ui/issues/issue-28999.rs",
 "ui/issues/issue-29030.rs",
 "ui/issues/issue-29037.rs",
-"ui/issues/issue-2904.rs",
 "ui/issues/issue-29048.rs",
+"ui/issues/issue-2904.rs",
 "ui/issues/issue-29053.rs",
 "ui/issues/issue-29071-2.rs",
 "ui/issues/issue-29071.rs",
@@ -2077,8 +2075,8 @@
 "ui/issues/issue-2935.rs",
 "ui/issues/issue-29466.rs",
 "ui/issues/issue-29485.rs",
-"ui/issues/issue-2951.rs",
 "ui/issues/issue-29516.rs",
+"ui/issues/issue-2951.rs",
 "ui/issues/issue-29522.rs",
 "ui/issues/issue-29540.rs",
 "ui/issues/issue-29663.rs",
@@ -2093,7 +2091,6 @@
 "ui/issues/issue-2989.rs",
 "ui/issues/issue-29948.rs",
 "ui/issues/issue-2995.rs",
-"ui/issues/issue-30007.rs",
 "ui/issues/issue-30018-panic.rs",
 "ui/issues/issue-30081.rs",
 "ui/issues/issue-3012-2.rs",
@@ -2104,11 +2101,10 @@
 "ui/issues/issue-30255.rs",
 "ui/issues/issue-3026.rs",
 "ui/issues/issue-3029.rs",
-"ui/issues/issue-3037.rs",
 "ui/issues/issue-30371.rs",
-"ui/issues/issue-3038.rs",
+"ui/issues/issue-3037.rs",
 "ui/issues/issue-30380.rs",
-"ui/issues/issue-30490.rs",
+"ui/issues/issue-3038.rs",
 "ui/issues/issue-3052.rs",
 "ui/issues/issue-30530.rs",
 "ui/issues/issue-30589.rs",
@@ -2152,7 +2148,6 @@
 "ui/issues/issue-32950.rs",
 "ui/issues/issue-32995-2.rs",
 "ui/issues/issue-32995.rs",
-"ui/issues/issue-33187.rs",
 "ui/issues/issue-33202.rs",
 "ui/issues/issue-33241.rs",
 "ui/issues/issue-33287.rs",
@@ -2197,7 +2192,6 @@
 "ui/issues/issue-35570.rs",
 "ui/issues/issue-3559.rs",
 "ui/issues/issue-35600.rs",
-"ui/issues/issue-3563-3.rs",
 "ui/issues/issue-3574.rs",
 "ui/issues/issue-35815.rs",
 "ui/issues/issue-35976.rs",
@@ -2212,7 +2206,6 @@
 "ui/issues/issue-36299.rs",
 "ui/issues/issue-36379.rs",
 "ui/issues/issue-36400.rs",
-"ui/issues/issue-36401.rs",
 "ui/issues/issue-36474.rs",
 "ui/issues/issue-3656.rs",
 "ui/issues/issue-3668-non-constant-value-in-constant/issue-3668-2.rs",
@@ -2232,12 +2225,10 @@
 "ui/issues/issue-37109.rs",
 "ui/issues/issue-37131.rs",
 "ui/issues/issue-37311-type-length-limit/issue-37311.rs",
-"ui/issues/issue-3743.rs",
 "ui/issues/issue-37510.rs",
-"ui/issues/issue-3753.rs",
 "ui/issues/issue-37534.rs",
+"ui/issues/issue-3753.rs",
 "ui/issues/issue-37576.rs",
-"ui/issues/issue-37598.rs",
 "ui/issues/issue-3763.rs",
 "ui/issues/issue-37665.rs",
 "ui/issues/issue-37686.rs",
@@ -2263,8 +2254,8 @@
 "ui/issues/issue-3888-2.rs",
 "ui/issues/issue-38919.rs",
 "ui/issues/issue-38942.rs",
-"ui/issues/issue-3895.rs",
 "ui/issues/issue-38954.rs",
+"ui/issues/issue-3895.rs",
 "ui/issues/issue-38987.rs",
 "ui/issues/issue-39089.rs",
 "ui/issues/issue-39175.rs",
@@ -2274,9 +2265,8 @@
 "ui/issues/issue-39687.rs",
 "ui/issues/issue-39709.rs",
 "ui/issues/issue-3979-2.rs",
-"ui/issues/issue-3979-generics.rs",
-"ui/issues/issue-3979-xcrate.rs",
 "ui/issues/issue-3979.rs",
+"ui/issues/issue-3979-xcrate.rs",
 "ui/issues/issue-39808.rs",
 "ui/issues/issue-39827.rs",
 "ui/issues/issue-39848.rs",
@@ -2347,14 +2337,13 @@
 "ui/issues/issue-42880.rs",
 "ui/issues/issue-42956.rs",
 "ui/issues/issue-43057.rs",
-"ui/issues/issue-43162.rs",
 "ui/issues/issue-43205.rs",
 "ui/issues/issue-43250.rs",
 "ui/issues/issue-43291.rs",
 "ui/issues/issue-4333.rs",
-"ui/issues/issue-4335.rs",
 "ui/issues/issue-43355.rs",
 "ui/issues/issue-43357.rs",
+"ui/issues/issue-4335.rs",
 "ui/issues/issue-43420-no-over-suggest.rs",
 "ui/issues/issue-43424.rs",
 "ui/issues/issue-43431.rs",
@@ -2383,8 +2372,8 @@
 "ui/issues/issue-44851.rs",
 "ui/issues/issue-4517.rs",
 "ui/issues/issue-4541.rs",
-"ui/issues/issue-4542.rs",
 "ui/issues/issue-45425.rs",
+"ui/issues/issue-4542.rs",
 "ui/issues/issue-4545.rs",
 "ui/issues/issue-45510.rs",
 "ui/issues/issue-45562.rs",
@@ -2413,8 +2402,8 @@
 "ui/issues/issue-47309.rs",
 "ui/issues/issue-4734.rs",
 "ui/issues/issue-4735.rs",
-"ui/issues/issue-4736.rs",
 "ui/issues/issue-47364.rs",
+"ui/issues/issue-4736.rs",
 "ui/issues/issue-47377.rs",
 "ui/issues/issue-47380.rs",
 "ui/issues/issue-47486.rs",
@@ -2423,8 +2412,8 @@
 "ui/issues/issue-47638.rs",
 "ui/issues/issue-47673.rs",
 "ui/issues/issue-47703-1.rs",
-"ui/issues/issue-47703-tuple.rs",
 "ui/issues/issue-47703.rs",
+"ui/issues/issue-47703-tuple.rs",
 "ui/issues/issue-47715.rs",
 "ui/issues/issue-47722.rs",
 "ui/issues/issue-48006.rs",
@@ -2480,7 +2469,6 @@
 "ui/issues/issue-51116.rs",
 "ui/issues/issue-51154.rs",
 "ui/issues/issue-51515.rs",
-"ui/issues/issue-5153.rs",
 "ui/issues/issue-51632-try-desugar-incompatible-types.rs",
 "ui/issues/issue-51655.rs",
 "ui/issues/issue-51714.rs",
@@ -2573,8 +2561,8 @@
 "ui/issues/issue-59756.rs",
 "ui/issues/issue-5988.rs",
 "ui/issues/issue-5997-outer-generic-parameter/issue-5997-enum.rs",
-"ui/issues/issue-5997-outer-generic-parameter/issue-5997-struct.rs",
 "ui/issues/issue-5997-outer-generic-parameter/issue-5997.rs",
+"ui/issues/issue-5997-outer-generic-parameter/issue-5997-struct.rs",
 "ui/issues/issue-60218.rs",
 "ui/issues/issue-60622.rs",
 "ui/issues/issue-60989.rs",
@@ -2599,7 +2587,6 @@
 "ui/issues/issue-65230.rs",
 "ui/issues/issue-65462.rs",
 "ui/issues/issue-6557.rs",
-"ui/issues/issue-6596-2.rs",
 "ui/issues/issue-66308.rs",
 "ui/issues/issue-66353.rs",
 "ui/issues/issue-66667-function-cmp-cycle.rs",
@@ -2673,7 +2660,6 @@
 "ui/issues/issue-78957.rs",
 "ui/issues/issue-7899.rs",
 "ui/issues/issue-7911.rs",
-"ui/issues/issue-7950.rs",
 "ui/issues/issue-7970a.rs",
 "ui/issues/issue-8044.rs",
 "ui/issues/issue-80607.rs",
@@ -2851,8 +2837,8 @@
 "ui/lint/unused/issue-103320-must-use-ops.rs",
 "ui/lint/unused/issue-104397.rs",
 "ui/lint/unused/issue-105061-array-lint.rs",
-"ui/lint/unused/issue-105061-should-lint.rs",
 "ui/lint/unused/issue-105061.rs",
+"ui/lint/unused/issue-105061-should-lint.rs",
 "ui/lint/unused/issue-117142-invalid-remove-parens.rs",
 "ui/lint/unused/issue-117284-arg-in-macro.rs",
 "ui/lint/unused/issue-119383-if-let-guard.rs",
@@ -2874,9 +2860,10 @@
 "ui/lint/unused/issue-92751.rs",
 "ui/lint/unused/issue-96606.rs",
 "ui/lint/use-redundant/issue-92904.rs",
+"ui/loops/issue-43162.rs",
 "ui/loops/issue-50576.rs",
-"ui/loops/issue-69225-SCEVAddExpr-wrap-flag.rs",
 "ui/loops/issue-69225-layout-repeated-checked-add.rs",
+"ui/loops/issue-69225-SCEVAddExpr-wrap-flag.rs",
 "ui/loops/issue-82916.rs",
 "ui/lowering/issue-121108.rs",
 "ui/lowering/issue-96847.rs",
@@ -2911,6 +2898,7 @@
 "ui/macros/issue-2804-2.rs",
 "ui/macros/issue-2804.rs",
 "ui/macros/issue-29084.rs",
+"ui/macros/issue-30007.rs",
 "ui/macros/issue-30143.rs",
 "ui/macros/issue-33185.rs",
 "ui/macros/issue-34171.rs",
@@ -2942,6 +2930,7 @@
 "ui/macros/issue-61053-unbound.rs",
 "ui/macros/issue-63102.rs",
 "ui/macros/issue-6596-1.rs",
+"ui/macros/issue-6596-2.rs",
 "ui/macros/issue-68058.rs",
 "ui/macros/issue-68060.rs",
 "ui/macros/issue-69396-const-no-type-in-macro.rs",
@@ -2990,6 +2979,8 @@
 "ui/match/issue-26996.rs",
 "ui/match/issue-27021.rs",
 "ui/match/issue-33498.rs",
+"ui/match/issue-36401.rs",
+"ui/match/issue-37598.rs",
 "ui/match/issue-42679.rs",
 "ui/match/issue-46920-byte-array-patterns.rs",
 "ui/match/issue-5530.rs",
@@ -3003,7 +2994,9 @@
 "ui/match/issue-84434.rs",
 "ui/match/issue-91058.rs",
 "ui/match/issue-92100.rs",
+"ui/methods/issue-19521.rs",
 "ui/methods/issue-3707.rs",
+"ui/methods/issue-7950.rs",
 "ui/methods/issues/issue-105732.rs",
 "ui/methods/issues/issue-61525.rs",
 "ui/methods/issues/issue-84495.rs",
@@ -3023,6 +3016,7 @@
 "ui/mir/issue-29227.rs",
 "ui/mir/issue-46845.rs",
 "ui/mir/issue-60390.rs",
+"ui/mir/issue66339.rs",
 "ui/mir/issue-66851.rs",
 "ui/mir/issue-66930.rs",
 "ui/mir/issue-67639-normalization-ice.rs",
@@ -3049,7 +3043,6 @@
 "ui/mir/issue-92893.rs",
 "ui/mir/issue-99852.rs",
 "ui/mir/issue-99866.rs",
-"ui/mir/issue66339.rs",
 "ui/mir/validate/issue-95978-validator-lifetime-comparison.rs",
 "ui/mismatched_types/issue-106182.rs",
 "ui/mismatched_types/issue-112036.rs",
@@ -3060,10 +3053,10 @@
 "ui/mismatched_types/issue-26480.rs",
 "ui/mismatched_types/issue-35030.rs",
 "ui/mismatched_types/issue-36053-2.rs",
-"ui/mismatched_types/issue-38371-unfixable.rs",
 "ui/mismatched_types/issue-38371.rs",
-"ui/mismatched_types/issue-47706-trait.rs",
+"ui/mismatched_types/issue-38371-unfixable.rs",
 "ui/mismatched_types/issue-47706.rs",
+"ui/mismatched_types/issue-47706-trait.rs",
 "ui/mismatched_types/issue-74918-missing-lifetime.rs",
 "ui/mismatched_types/issue-75361-mismatched-impl.rs",
 "ui/mismatched_types/issue-84976.rs",
@@ -3421,8 +3414,8 @@
 "ui/parser/issues/issue-73568-lifetime-after-mut.rs",
 "ui/parser/issues/issue-75599.rs",
 "ui/parser/issues/issue-76437-async.rs",
-"ui/parser/issues/issue-76437-const-async-unsafe.rs",
 "ui/parser/issues/issue-76437-const-async.rs",
+"ui/parser/issues/issue-76437-const-async-unsafe.rs",
 "ui/parser/issues/issue-76437-const.rs",
 "ui/parser/issues/issue-76437-pub-crate-unsafe.rs",
 "ui/parser/issues/issue-76437-unsafe.rs",
@@ -3568,10 +3561,16 @@
 "ui/privacy/issue-57264-2.rs",
 "ui/privacy/issue-75062-fieldless-tuple-struct.rs",
 "ui/privacy/issue-75906.rs",
-"ui/privacy/issue-75907.rs",
 "ui/privacy/issue-75907_b.rs",
+"ui/privacy/issue-75907.rs",
 "ui/privacy/issue-79593.rs",
 "ui/privacy/issue-92755.rs",
+"ui/process/issue-13304.rs",
+"ui/process/issue-14456.rs",
+"ui/process/issue-14940.rs",
+"ui/process/issue-16272.rs",
+"ui/process/issue-20091.rs",
+"ui/process/issue-30490.rs",
 "ui/proc-macro/auxiliary/issue-104884.rs",
 "ui/proc-macro/auxiliary/issue-107113.rs",
 "ui/proc-macro/auxiliary/issue-118809.rs",
@@ -3620,13 +3619,8 @@
 "ui/proc-macro/issue-86781-bad-inner-doc.rs",
 "ui/proc-macro/issue-89566-suggest-fix-invalid-top-level-macro-attr.rs",
 "ui/proc-macro/issue-91800.rs",
-"ui/process/issue-13304.rs",
-"ui/process/issue-14456.rs",
-"ui/process/issue-14940.rs",
-"ui/process/issue-16272.rs",
-"ui/process/issue-20091.rs",
-"ui/ptr_ops/issue-80309-safe.rs",
 "ui/ptr_ops/issue-80309.rs",
+"ui/ptr_ops/issue-80309-safe.rs",
 "ui/pub/issue-33174-restricted-type-in-public-interface.rs",
 "ui/query-system/issue-83479.rs",
 "ui/range/issue-54505-no-literals.rs",
@@ -3704,8 +3698,8 @@
 "ui/resolve/issue-21221-3.rs",
 "ui/resolve/issue-21221-4.rs",
 "ui/resolve/issue-22692.rs",
-"ui/resolve/issue-2330.rs",
 "ui/resolve/issue-23305.rs",
+"ui/resolve/issue-2330.rs",
 "ui/resolve/issue-2356.rs",
 "ui/resolve/issue-23716.rs",
 "ui/resolve/issue-24968.rs",
@@ -3826,6 +3820,10 @@
 "ui/span/issue-25199.rs",
 "ui/span/issue-26656.rs",
 "ui/span/issue-27522.rs",
+"ui/span/issue28498-reject-ex1.rs",
+"ui/span/issue28498-reject-lifetime-param.rs",
+"ui/span/issue28498-reject-passed-to-fn.rs",
+"ui/span/issue28498-reject-trait-bound.rs",
 "ui/span/issue-29106.rs",
 "ui/span/issue-29595.rs",
 "ui/span/issue-33884.rs",
@@ -3840,10 +3838,6 @@
 "ui/span/issue-43927-non-ADT-derive.rs",
 "ui/span/issue-71363.rs",
 "ui/span/issue-81800.rs",
-"ui/span/issue28498-reject-ex1.rs",
-"ui/span/issue28498-reject-lifetime-param.rs",
-"ui/span/issue28498-reject-passed-to-fn.rs",
-"ui/span/issue28498-reject-trait-bound.rs",
 "ui/specialization/issue-111232.rs",
 "ui/specialization/issue-33017.rs",
 "ui/specialization/issue-35376.rs",
@@ -3873,6 +3867,7 @@
 "ui/static/auxiliary/issue_24843.rs",
 "ui/static/issue-18118-2.rs",
 "ui/static/issue-18118.rs",
+"ui/static/issue-24446.rs",
 "ui/static/issue-24843.rs",
 "ui/static/issue-34194.rs",
 "ui/static/issue-5216.rs",
@@ -3885,6 +3880,7 @@
 "ui/statics/issue-44373.rs",
 "ui/statics/issue-91050-1.rs",
 "ui/statics/issue-91050-2.rs",
+"ui/std/issue-3563-3.rs",
 "ui/std/issue-81357-unsound-file-methods.rs",
 "ui/stdlib-unit-tests/issue-21058.rs",
 "ui/structs-enums/enum-rec/issue-17431-6.rs",
@@ -4042,9 +4038,11 @@
 "ui/traits/issue-105231.rs",
 "ui/traits/issue-106072.rs",
 "ui/traits/issue-117794.rs",
+"ui/traits/issue-15155.rs",
 "ui/traits/issue-18400.rs",
 "ui/traits/issue-18412.rs",
 "ui/traits/issue-20692.rs",
+"ui/traits/issue-21837.rs",
 "ui/traits/issue-22019.rs",
 "ui/traits/issue-22110.rs",
 "ui/traits/issue-22384.rs",
@@ -4059,12 +4057,14 @@
 "ui/traits/issue-33096.rs",
 "ui/traits/issue-33140-hack-boundaries.rs",
 "ui/traits/issue-33140.rs",
+"ui/traits/issue-33187.rs",
 "ui/traits/issue-35869.rs",
 "ui/traits/issue-3683.rs",
 "ui/traits/issue-38033.rs",
 "ui/traits/issue-38404.rs",
 "ui/traits/issue-38604.rs",
 "ui/traits/issue-3973.rs",
+"ui/traits/issue-3979-generics.rs",
 "ui/traits/issue-40085.rs",
 "ui/traits/issue-4107.rs",
 "ui/traits/issue-43132.rs",
@@ -4124,8 +4124,8 @@
 "ui/traits/object/issue-44454-3.rs",
 "ui/traits/suggest-dereferences/issue-39029.rs",
 "ui/traits/suggest-dereferences/issue-62530.rs",
-"ui/traits/trait-upcasting/issue-11515-upcast-fn_mut-fn.rs",
 "ui/traits/trait-upcasting/issue-11515.rs",
+"ui/traits/trait-upcasting/issue-11515-upcast-fn_mut-fn.rs",
 "ui/traits/vtable/issue-91807.rs",
 "ui/traits/vtable/issue-97381.rs",
 "ui/transmutability/arrays/issue-103783-array-length.rs",
@@ -4163,8 +4163,8 @@
 "ui/type-alias-impl-trait/issue-58951.rs",
 "ui/type-alias-impl-trait/issue-60371.rs",
 "ui/type-alias-impl-trait/issue-60407.rs",
-"ui/type-alias-impl-trait/issue-60564-working.rs",
 "ui/type-alias-impl-trait/issue-60564.rs",
+"ui/type-alias-impl-trait/issue-60564-working.rs",
 "ui/type-alias-impl-trait/issue-60662.rs",
 "ui/type-alias-impl-trait/issue-62000-associate-impl-trait-lifetimes.rs",
 "ui/type-alias-impl-trait/issue-63263-closure-return.rs",
@@ -4208,26 +4208,10 @@
 "ui/type-alias/issue-62263-self-in-atb.rs",
 "ui/type-alias/issue-62305-self-assoc-ty.rs",
 "ui/type-alias/issue-62364-self-ty-arg.rs",
-"ui/type-inference/issue-113283-alllocator-trait-eq.rs",
-"ui/type-inference/issue-30225.rs",
 "ui/type/ascription/issue-34255-1.rs",
 "ui/type/ascription/issue-47666.rs",
 "ui/type/ascription/issue-54516.rs",
 "ui/type/ascription/issue-60933.rs",
-"ui/type/issue-100584.rs",
-"ui/type/issue-101866.rs",
-"ui/type/issue-102598.rs",
-"ui/type/issue-103271.rs",
-"ui/type/issue-58355.rs",
-"ui/type/issue-67690-type-alias-bound-diagnostic-crash.rs",
-"ui/type/issue-91268.rs",
-"ui/type/issue-94187-verbose-type-name.rs",
-"ui/type/type-check/issue-116967-cannot-coerce-returned-result.rs",
-"ui/type/type-check/issue-22897.rs",
-"ui/type/type-check/issue-40294.rs",
-"ui/type/type-check/issue-41314.rs",
-"ui/type/type-check/issue-67273-assignment-match-prior-arm-bool-expected-unit.rs",
-"ui/type/type-check/issue-88577-check-fn-with-more-than-65535-arguments.rs",
 "ui/typeck/auxiliary/issue-29181.rs",
 "ui/typeck/auxiliary/issue-36708.rs",
 "ui/typeck/auxiliary/issue-81943-lib.rs",
@@ -4332,9 +4316,25 @@
 "ui/typeck/issue-96738.rs",
 "ui/typeck/issue-98260.rs",
 "ui/typeck/issue-98982.rs",
+"ui/type-inference/issue-113283-alllocator-trait-eq.rs",
+"ui/type-inference/issue-30225.rs",
+"ui/type/issue-100584.rs",
+"ui/type/issue-101866.rs",
+"ui/type/issue-102598.rs",
+"ui/type/issue-103271.rs",
+"ui/type/issue-58355.rs",
+"ui/type/issue-67690-type-alias-bound-diagnostic-crash.rs",
+"ui/type/issue-91268.rs",
+"ui/type/issue-94187-verbose-type-name.rs",
 "ui/typeof/issue-100183.rs",
 "ui/typeof/issue-29184.rs",
 "ui/typeof/issue-42060.rs",
+"ui/type/type-check/issue-116967-cannot-coerce-returned-result.rs",
+"ui/type/type-check/issue-22897.rs",
+"ui/type/type-check/issue-40294.rs",
+"ui/type/type-check/issue-41314.rs",
+"ui/type/type-check/issue-67273-assignment-match-prior-arm-bool-expected-unit.rs",
+"ui/type/type-check/issue-88577-check-fn-with-more-than-65535-arguments.rs",
 "ui/unboxed-closures/issue-18652.rs",
 "ui/unboxed-closures/issue-18661.rs",
 "ui/unboxed-closures/issue-30906.rs",
@@ -4355,11 +4355,6 @@
 "ui/unsafe/issue-47412.rs",
 "ui/unsafe/issue-85435-unsafe-op-in-let-under-unsafe-under-closure.rs",
 "ui/unsafe/issue-87414-query-cycle.rs",
-"ui/unsized-locals/issue-30276-feature-flagged.rs",
-"ui/unsized-locals/issue-30276.rs",
-"ui/unsized-locals/issue-50940-with-feature.rs",
-"ui/unsized-locals/issue-50940.rs",
-"ui/unsized-locals/issue-67981.rs",
 "ui/unsized/issue-115203.rs",
 "ui/unsized/issue-115809.rs",
 "ui/unsized/issue-30355.rs",
@@ -4372,6 +4367,11 @@
 "ui/unsized/issue-91801.rs",
 "ui/unsized/issue-91803.rs",
 "ui/unsized/issue-97732.rs",
+"ui/unsized-locals/issue-30276-feature-flagged.rs",
+"ui/unsized-locals/issue-30276.rs",
+"ui/unsized-locals/issue-50940.rs",
+"ui/unsized-locals/issue-50940-with-feature.rs",
+"ui/unsized-locals/issue-67981.rs",
 "ui/use/issue-18986.rs",
 "ui/use/issue-60976-extern-use-primitive-type.rs",
 "ui/wf/issue-103573.rs",
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index e35f3f05d66..a9c5be913ba 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -17,7 +17,7 @@ use std::path::{Path, PathBuf};
 const ENTRY_LIMIT: usize = 900;
 // FIXME: The following limits should be reduced eventually.
 
-const ISSUES_ENTRY_LIMIT: usize = 1781;
+const ISSUES_ENTRY_LIMIT: usize = 1750;
 const ROOT_ENTRY_LIMIT: usize = 872;
 
 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
diff --git a/tests/ui/issues/issue-26262.rs b/tests/ui/associated-types/issue-26262.rs
similarity index 100%
rename from tests/ui/issues/issue-26262.rs
rename to tests/ui/associated-types/issue-26262.rs
diff --git a/tests/ui/issues/issue-26262.stderr b/tests/ui/associated-types/issue-26262.stderr
similarity index 100%
rename from tests/ui/issues/issue-26262.stderr
rename to tests/ui/associated-types/issue-26262.stderr
diff --git a/tests/ui/issues/issue-27859.rs b/tests/ui/codegen/issue-27859.rs
similarity index 100%
rename from tests/ui/issues/issue-27859.rs
rename to tests/ui/codegen/issue-27859.rs
diff --git a/tests/ui/issues/issue-18738.rs b/tests/ui/deriving/issue-18738.rs
similarity index 100%
rename from tests/ui/issues/issue-18738.rs
rename to tests/ui/deriving/issue-18738.rs
diff --git a/tests/ui/issues/issue-23611-enum-swap-in-drop.rs b/tests/ui/drop/issue-23611-enum-swap-in-drop.rs
similarity index 100%
rename from tests/ui/issues/issue-23611-enum-swap-in-drop.rs
rename to tests/ui/drop/issue-23611-enum-swap-in-drop.rs
diff --git a/tests/ui/issues/issue-23611-enum-swap-in-drop.stderr b/tests/ui/drop/issue-23611-enum-swap-in-drop.stderr
similarity index 100%
rename from tests/ui/issues/issue-23611-enum-swap-in-drop.stderr
rename to tests/ui/drop/issue-23611-enum-swap-in-drop.stderr
diff --git a/tests/ui/issues/issue-5153.rs b/tests/ui/dyn-keyword/issue-5153.rs
similarity index 100%
rename from tests/ui/issues/issue-5153.rs
rename to tests/ui/dyn-keyword/issue-5153.rs
diff --git a/tests/ui/issues/issue-5153.stderr b/tests/ui/dyn-keyword/issue-5153.stderr
similarity index 100%
rename from tests/ui/issues/issue-5153.stderr
rename to tests/ui/dyn-keyword/issue-5153.stderr
diff --git a/tests/ui/issues/issue-3743.rs b/tests/ui/inference/issue-3743.rs
similarity index 100%
rename from tests/ui/issues/issue-3743.rs
rename to tests/ui/inference/issue-3743.rs
diff --git a/tests/ui/issues/issue-43162.rs b/tests/ui/loops/issue-43162.rs
similarity index 100%
rename from tests/ui/issues/issue-43162.rs
rename to tests/ui/loops/issue-43162.rs
diff --git a/tests/ui/issues/issue-43162.stderr b/tests/ui/loops/issue-43162.stderr
similarity index 100%
rename from tests/ui/issues/issue-43162.stderr
rename to tests/ui/loops/issue-43162.stderr
diff --git a/tests/ui/issues/issue-30007.rs b/tests/ui/macros/issue-30007.rs
similarity index 100%
rename from tests/ui/issues/issue-30007.rs
rename to tests/ui/macros/issue-30007.rs
diff --git a/tests/ui/issues/issue-30007.stderr b/tests/ui/macros/issue-30007.stderr
similarity index 100%
rename from tests/ui/issues/issue-30007.stderr
rename to tests/ui/macros/issue-30007.stderr
diff --git a/tests/ui/issues/issue-6596-2.rs b/tests/ui/macros/issue-6596-2.rs
similarity index 100%
rename from tests/ui/issues/issue-6596-2.rs
rename to tests/ui/macros/issue-6596-2.rs
diff --git a/tests/ui/issues/issue-6596-2.stderr b/tests/ui/macros/issue-6596-2.stderr
similarity index 100%
rename from tests/ui/issues/issue-6596-2.stderr
rename to tests/ui/macros/issue-6596-2.stderr
diff --git a/tests/ui/issues/issue-36401.rs b/tests/ui/match/issue-36401.rs
similarity index 100%
rename from tests/ui/issues/issue-36401.rs
rename to tests/ui/match/issue-36401.rs
diff --git a/tests/ui/issues/issue-37598.rs b/tests/ui/match/issue-37598.rs
similarity index 100%
rename from tests/ui/issues/issue-37598.rs
rename to tests/ui/match/issue-37598.rs
diff --git a/tests/ui/issues/issue-19521.rs b/tests/ui/methods/issue-19521.rs
similarity index 100%
rename from tests/ui/issues/issue-19521.rs
rename to tests/ui/methods/issue-19521.rs
diff --git a/tests/ui/issues/issue-19521.stderr b/tests/ui/methods/issue-19521.stderr
similarity index 100%
rename from tests/ui/issues/issue-19521.stderr
rename to tests/ui/methods/issue-19521.stderr
diff --git a/tests/ui/issues/issue-7950.rs b/tests/ui/methods/issue-7950.rs
similarity index 100%
rename from tests/ui/issues/issue-7950.rs
rename to tests/ui/methods/issue-7950.rs
diff --git a/tests/ui/issues/issue-7950.stderr b/tests/ui/methods/issue-7950.stderr
similarity index 100%
rename from tests/ui/issues/issue-7950.stderr
rename to tests/ui/methods/issue-7950.stderr
diff --git a/tests/ui/issues/issue-30490.rs b/tests/ui/process/issue-30490.rs
similarity index 100%
rename from tests/ui/issues/issue-30490.rs
rename to tests/ui/process/issue-30490.rs
diff --git a/tests/ui/issues/issue-24446.rs b/tests/ui/static/issue-24446.rs
similarity index 100%
rename from tests/ui/issues/issue-24446.rs
rename to tests/ui/static/issue-24446.rs
diff --git a/tests/ui/issues/issue-24446.stderr b/tests/ui/static/issue-24446.stderr
similarity index 100%
rename from tests/ui/issues/issue-24446.stderr
rename to tests/ui/static/issue-24446.stderr
diff --git a/tests/ui/issues/issue-3563-3.rs b/tests/ui/std/issue-3563-3.rs
similarity index 100%
rename from tests/ui/issues/issue-3563-3.rs
rename to tests/ui/std/issue-3563-3.rs
diff --git a/tests/ui/issues/issue-3563-3.stderr b/tests/ui/std/issue-3563-3.stderr
similarity index 100%
rename from tests/ui/issues/issue-3563-3.stderr
rename to tests/ui/std/issue-3563-3.stderr
diff --git a/tests/ui/issues/issue-15155.rs b/tests/ui/traits/issue-15155.rs
similarity index 100%
rename from tests/ui/issues/issue-15155.rs
rename to tests/ui/traits/issue-15155.rs
diff --git a/tests/ui/issues/issue-21837.rs b/tests/ui/traits/issue-21837.rs
similarity index 100%
rename from tests/ui/issues/issue-21837.rs
rename to tests/ui/traits/issue-21837.rs
diff --git a/tests/ui/issues/issue-21837.stderr b/tests/ui/traits/issue-21837.stderr
similarity index 100%
rename from tests/ui/issues/issue-21837.stderr
rename to tests/ui/traits/issue-21837.stderr
diff --git a/tests/ui/issues/issue-33187.rs b/tests/ui/traits/issue-33187.rs
similarity index 100%
rename from tests/ui/issues/issue-33187.rs
rename to tests/ui/traits/issue-33187.rs
diff --git a/tests/ui/issues/issue-3979-generics.rs b/tests/ui/traits/issue-3979-generics.rs
similarity index 100%
rename from tests/ui/issues/issue-3979-generics.rs
rename to tests/ui/traits/issue-3979-generics.rs