35 files changed, 26 insertions, 26 deletions
diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
index 9be10528a64..060a6fa903f 100644
--- a/src/tools/tidy/src/issues.txt
+++ b/src/tools/tidy/src/issues.txt
@@ -1380,18 +1380,12 @@ ui/issues/auxiliary/issue-11224.rs
 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-rlib.rs
 ui/issues/auxiliary/issue-12612-1.rs
 ui/issues/auxiliary/issue-12612-2.rs
 ui/issues/auxiliary/issue-12660-aux.rs
 ui/issues/auxiliary/issue-13507.rs
 ui/issues/auxiliary/issue-13620-1.rs
 ui/issues/auxiliary/issue-13620-2.rs
-ui/issues/auxiliary/issue-13872-1.rs
-ui/issues/auxiliary/issue-13872-2.rs
-ui/issues/auxiliary/issue-13872-3.rs
 ui/issues/auxiliary/issue-14344-1.rs
 ui/issues/auxiliary/issue-14344-2.rs
 ui/issues/auxiliary/issue-14421.rs
@@ -1510,9 +1504,6 @@ ui/issues/issue-11958.rs
 ui/issues/issue-12033.rs
 ui/issues/issue-12041.rs
 ui/issues/issue-12127.rs
-ui/issues/issue-12133-1.rs
-ui/issues/issue-12133-2.rs
-ui/issues/issue-12133-3.rs
 ui/issues/issue-12187-1.rs
 ui/issues/issue-12187-2.rs
 ui/issues/issue-12285.rs
@@ -1556,7 +1547,6 @@ ui/issues/issue-13775.rs
 ui/issues/issue-13808.rs
 ui/issues/issue-13847.rs
 ui/issues/issue-13867.rs
-ui/issues/issue-13872.rs
 ui/issues/issue-14082.rs
 ui/issues/issue-14091-2.rs
 ui/issues/issue-14091.rs
@@ -1726,10 +1716,6 @@ ui/issues/issue-19127.rs
 ui/issues/issue-19129-1.rs
 ui/issues/issue-19129-2.rs
 ui/issues/issue-19135.rs
-ui/issues/issue-1920-absolute-paths/auxiliary/issue-1920.rs
-ui/issues/issue-1920-absolute-paths/issue-1920-1.rs
-ui/issues/issue-1920-absolute-paths/issue-1920-2.rs
-ui/issues/issue-1920-absolute-paths/issue-1920-3.rs
 ui/issues/issue-19244-1.rs
 ui/issues/issue-19244-2.rs
 ui/issues/issue-19293.rs
@@ -1878,9 +1864,6 @@ ui/issues/issue-23217.rs
 ui/issues/issue-23253.rs
 ui/issues/issue-23261.rs
 ui/issues/issue-23281.rs
-ui/issues/issue-23302-enum-infinite-recursion/issue-23302-1.rs
-ui/issues/issue-23302-enum-infinite-recursion/issue-23302-2.rs
-ui/issues/issue-23302-enum-infinite-recursion/issue-23302-3.rs
 ui/issues/issue-23304-1.rs
 ui/issues/issue-23304-2.rs
 ui/issues/issue-23311.rs
@@ -1897,9 +1880,6 @@ ui/issues/issue-23543.rs
 ui/issues/issue-23544.rs
 ui/issues/issue-23550.rs
 ui/issues/issue-23589.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
@@ -1970,7 +1950,6 @@ ui/issues/issue-25901.rs
 ui/issues/issue-26056.rs
 ui/issues/issue-26093.rs
 ui/issues/issue-26095.rs
-ui/issues/issue-2611-3.rs
 ui/issues/issue-26127.rs
 ui/issues/issue-26186.rs
 ui/issues/issue-26205.rs
@@ -2268,10 +2247,6 @@ ui/issues/issue-40350.rs
 ui/issues/issue-40402-ref-hints/issue-40402-1.rs
 ui/issues/issue-40402-ref-hints/issue-40402-2.rs
 ui/issues/issue-40408.rs
-ui/issues/issue-40510-captured-variable-return/issue-40510-1.rs
-ui/issues/issue-40510-captured-variable-return/issue-40510-2.rs
-ui/issues/issue-40510-captured-variable-return/issue-40510-3.rs
-ui/issues/issue-40510-captured-variable-return/issue-40510-4.rs
 ui/issues/issue-40610.rs
 ui/issues/issue-40749.rs
 ui/issues/issue-40782.rs
@@ -2764,8 +2739,14 @@ ui/limits/issue-55878.rs
 ui/limits/issue-56762.rs
 ui/limits/issue-69485-var-size-diffs-too-large.rs
 ui/limits/issue-75158-64.rs
+ui/linkage-attr/auxiliary/issue-12133-dylib.rs
+ui/linkage-attr/auxiliary/issue-12133-dylib2.rs
+ui/linkage-attr/auxiliary/issue-12133-rlib.rs
 ui/linkage-attr/issue-10755.rs
 ui/linkage-attr/issue-109144.rs
+ui/linkage-attr/issue-12133-1.rs
+ui/linkage-attr/issue-12133-2.rs
+ui/linkage-attr/issue-12133-3.rs
 ui/lint/dead-code/issue-41883.rs
 ui/lint/dead-code/issue-59003.rs
 ui/lint/dead-code/issue-68408-false-positive.rs
@@ -3051,7 +3032,15 @@ ui/mismatched_types/issue-84976.rs
 ui/missing-trait-bounds/auxiliary/issue-69725.rs
 ui/missing-trait-bounds/issue-35677.rs
 ui/missing-trait-bounds/issue-69725.rs
+ui/modules/auxiliary/issue-13872-1.rs
+ui/modules/auxiliary/issue-13872-2.rs
+ui/modules/auxiliary/issue-13872-3.rs
+ui/modules/auxiliary/issue-1920.rs
 ui/modules/issue-107649.rs
+ui/modules/issue-13872.rs
+ui/modules/issue-1920-1.rs
+ui/modules/issue-1920-2.rs
+ui/modules/issue-1920-3.rs
 ui/modules/issue-56411-aux.rs
 ui/modules/issue-56411.rs
 ui/moves/issue-22536-copy-mustnt-zero.rs
@@ -3092,6 +3081,10 @@ ui/nll/issue-30438-b.rs
 ui/nll/issue-30438-c.rs
 ui/nll/issue-31567.rs
 ui/nll/issue-32382-index-assoc-type-with-lifetime.rs
+ui/nll/issue-40510-1.rs
+ui/nll/issue-40510-2.rs
+ui/nll/issue-40510-3.rs
+ui/nll/issue-40510-4.rs
 ui/nll/issue-42574-diagnostic-in-nested-closure.rs
 ui/nll/issue-43058.rs
 ui/nll/issue-45157.rs
@@ -3621,6 +3614,9 @@ ui/reachable/issue-11225-1.rs
 ui/reachable/issue-11225-2.rs
 ui/reachable/issue-11225-3.rs
 ui/reachable/issue-948.rs
+ui/recursion/issue-23302-1.rs
+ui/recursion/issue-23302-2.rs
+ui/recursion/issue-23302-3.rs
 ui/recursion/issue-26548-recursion-via-normalize.rs
 ui/recursion/issue-38591-non-regular-dropck-recursion.rs
 ui/recursion/issue-83150.rs
@@ -4039,6 +4035,7 @@ ui/traits/issue-23003-overflow.rs
 ui/traits/issue-23003.rs
 ui/traits/issue-23825.rs
 ui/traits/issue-24010.rs
+ui/traits/issue-2611-3.rs
 ui/traits/issue-26339.rs
 ui/traits/issue-28576.rs
 ui/traits/issue-32963.rs
@@ -4350,6 +4347,9 @@ 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-23649-1.rs
+ui/unsized/issue-23649-2.rs
+ui/unsized/issue-23649-3.rs
 ui/unsized/issue-30355.rs
 ui/unsized/issue-40231-1.rs
 ui/unsized/issue-40231-2.rs
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 65ea685b37c..4fae7572ffb 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 = 1733;
+const ISSUES_ENTRY_LIMIT: usize = 1722;
 const ROOT_ENTRY_LIMIT: usize = 861;
 
 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
diff --git a/tests/ui/issues/auxiliary/issue-12133-dylib.rs b/tests/ui/linkage-attr/auxiliary/issue-12133-dylib.rs
index 8bd2b3353b8..8bd2b3353b8 100644
--- a/tests/ui/issues/auxiliary/issue-12133-dylib.rs
+++ b/tests/ui/linkage-attr/auxiliary/issue-12133-dylib.rs
diff --git a/tests/ui/issues/auxiliary/issue-12133-dylib2.rs b/tests/ui/linkage-attr/auxiliary/issue-12133-dylib2.rs
index 42e13ad6908..42e13ad6908 100644
--- a/tests/ui/issues/auxiliary/issue-12133-dylib2.rs
+++ b/tests/ui/linkage-attr/auxiliary/issue-12133-dylib2.rs
diff --git a/tests/ui/issues/auxiliary/issue-12133-rlib.rs b/tests/ui/linkage-attr/auxiliary/issue-12133-rlib.rs
index 1adaf2b0379..1adaf2b0379 100644
--- a/tests/ui/issues/auxiliary/issue-12133-rlib.rs
+++ b/tests/ui/linkage-attr/auxiliary/issue-12133-rlib.rs
diff --git a/tests/ui/issues/issue-12133-1.rs b/tests/ui/linkage-attr/issue-12133-1.rs
index dc3f7f33da1..dc3f7f33da1 100644
--- a/tests/ui/issues/issue-12133-1.rs
+++ b/tests/ui/linkage-attr/issue-12133-1.rs
diff --git a/tests/ui/issues/issue-12133-2.rs b/tests/ui/linkage-attr/issue-12133-2.rs
index 55742a1b383..55742a1b383 100644
--- a/tests/ui/issues/issue-12133-2.rs
+++ b/tests/ui/linkage-attr/issue-12133-2.rs
diff --git a/tests/ui/issues/issue-12133-3.rs b/tests/ui/linkage-attr/issue-12133-3.rs
index a34c075d64d..a34c075d64d 100644
--- a/tests/ui/issues/issue-12133-3.rs
+++ b/tests/ui/linkage-attr/issue-12133-3.rs
diff --git a/tests/ui/issues/auxiliary/issue-13872-1.rs b/tests/ui/modules/auxiliary/issue-13872-1.rs
index fa9258834c7..fa9258834c7 100644
--- a/tests/ui/issues/auxiliary/issue-13872-1.rs
+++ b/tests/ui/modules/auxiliary/issue-13872-1.rs
diff --git a/tests/ui/issues/auxiliary/issue-13872-2.rs b/tests/ui/modules/auxiliary/issue-13872-2.rs
index 8c64f16e3f9..8c64f16e3f9 100644
--- a/tests/ui/issues/auxiliary/issue-13872-2.rs
+++ b/tests/ui/modules/auxiliary/issue-13872-2.rs
diff --git a/tests/ui/issues/auxiliary/issue-13872-3.rs b/tests/ui/modules/auxiliary/issue-13872-3.rs
index d31d52eb847..d31d52eb847 100644
--- a/tests/ui/issues/auxiliary/issue-13872-3.rs
+++ b/tests/ui/modules/auxiliary/issue-13872-3.rs
diff --git a/tests/ui/issues/issue-1920-absolute-paths/auxiliary/issue-1920.rs b/tests/ui/modules/auxiliary/issue-1920.rs
index 1548cb99563..1548cb99563 100644
--- a/tests/ui/issues/issue-1920-absolute-paths/auxiliary/issue-1920.rs
+++ b/tests/ui/modules/auxiliary/issue-1920.rs
diff --git a/tests/ui/issues/issue-13872.rs b/tests/ui/modules/issue-13872.rs
index 5589d2d4f68..5589d2d4f68 100644
--- a/tests/ui/issues/issue-13872.rs
+++ b/tests/ui/modules/issue-13872.rs
diff --git a/tests/ui/issues/issue-1920-absolute-paths/issue-1920-1.rs b/tests/ui/modules/issue-1920-1.rs
index 763d07db2cd..763d07db2cd 100644
--- a/tests/ui/issues/issue-1920-absolute-paths/issue-1920-1.rs
+++ b/tests/ui/modules/issue-1920-1.rs
diff --git a/tests/ui/issues/issue-1920-absolute-paths/issue-1920-1.stderr b/tests/ui/modules/issue-1920-1.stderr
index b7c7da00672..b7c7da00672 100644
--- a/tests/ui/issues/issue-1920-absolute-paths/issue-1920-1.stderr
+++ b/tests/ui/modules/issue-1920-1.stderr
diff --git a/tests/ui/issues/issue-1920-absolute-paths/issue-1920-2.rs b/tests/ui/modules/issue-1920-2.rs
index b5a90b2c8e8..b5a90b2c8e8 100644
--- a/tests/ui/issues/issue-1920-absolute-paths/issue-1920-2.rs
+++ b/tests/ui/modules/issue-1920-2.rs
diff --git a/tests/ui/issues/issue-1920-absolute-paths/issue-1920-2.stderr b/tests/ui/modules/issue-1920-2.stderr
index 844cb0ff199..844cb0ff199 100644
--- a/tests/ui/issues/issue-1920-absolute-paths/issue-1920-2.stderr
+++ b/tests/ui/modules/issue-1920-2.stderr
diff --git a/tests/ui/issues/issue-1920-absolute-paths/issue-1920-3.rs b/tests/ui/modules/issue-1920-3.rs
index 372c8b1511c..372c8b1511c 100644
--- a/tests/ui/issues/issue-1920-absolute-paths/issue-1920-3.rs
+++ b/tests/ui/modules/issue-1920-3.rs
diff --git a/tests/ui/issues/issue-1920-absolute-paths/issue-1920-3.stderr b/tests/ui/modules/issue-1920-3.stderr
index 525ca4685bb..525ca4685bb 100644
--- a/tests/ui/issues/issue-1920-absolute-paths/issue-1920-3.stderr
+++ b/tests/ui/modules/issue-1920-3.stderr
diff --git a/tests/ui/issues/issue-40510-captured-variable-return/issue-40510-1.rs b/tests/ui/nll/issue-40510-1.rs
index ca53dcd9b41..ca53dcd9b41 100644
--- a/tests/ui/issues/issue-40510-captured-variable-return/issue-40510-1.rs
+++ b/tests/ui/nll/issue-40510-1.rs
diff --git a/tests/ui/issues/issue-40510-captured-variable-return/issue-40510-1.stderr b/tests/ui/nll/issue-40510-1.stderr
index 81fed1305cb..81fed1305cb 100644
--- a/tests/ui/issues/issue-40510-captured-variable-return/issue-40510-1.stderr
+++ b/tests/ui/nll/issue-40510-1.stderr
diff --git a/tests/ui/issues/issue-40510-captured-variable-return/issue-40510-2.rs b/tests/ui/nll/issue-40510-2.rs
index 9ce54862265..9ce54862265 100644
--- a/tests/ui/issues/issue-40510-captured-variable-return/issue-40510-2.rs
+++ b/tests/ui/nll/issue-40510-2.rs
diff --git a/tests/ui/issues/issue-40510-captured-variable-return/issue-40510-3.rs b/tests/ui/nll/issue-40510-3.rs
index 181263adcbf..181263adcbf 100644
--- a/tests/ui/issues/issue-40510-captured-variable-return/issue-40510-3.rs
+++ b/tests/ui/nll/issue-40510-3.rs
diff --git a/tests/ui/issues/issue-40510-captured-variable-return/issue-40510-3.stderr b/tests/ui/nll/issue-40510-3.stderr
index 43e8a73b819..43e8a73b819 100644
--- a/tests/ui/issues/issue-40510-captured-variable-return/issue-40510-3.stderr
+++ b/tests/ui/nll/issue-40510-3.stderr
diff --git a/tests/ui/issues/issue-40510-captured-variable-return/issue-40510-4.rs b/tests/ui/nll/issue-40510-4.rs
index 771502894f1..771502894f1 100644
--- a/tests/ui/issues/issue-40510-captured-variable-return/issue-40510-4.rs
+++ b/tests/ui/nll/issue-40510-4.rs
diff --git a/tests/ui/issues/issue-23302-enum-infinite-recursion/issue-23302-1.rs b/tests/ui/recursion/issue-23302-1.rs
index 24e79dc5811..24e79dc5811 100644
--- a/tests/ui/issues/issue-23302-enum-infinite-recursion/issue-23302-1.rs
+++ b/tests/ui/recursion/issue-23302-1.rs
diff --git a/tests/ui/issues/issue-23302-enum-infinite-recursion/issue-23302-1.stderr b/tests/ui/recursion/issue-23302-1.stderr
index 234060ab5c8..234060ab5c8 100644
--- a/tests/ui/issues/issue-23302-enum-infinite-recursion/issue-23302-1.stderr
+++ b/tests/ui/recursion/issue-23302-1.stderr
diff --git a/tests/ui/issues/issue-23302-enum-infinite-recursion/issue-23302-2.rs b/tests/ui/recursion/issue-23302-2.rs
index e89c7eab503..e89c7eab503 100644
--- a/tests/ui/issues/issue-23302-enum-infinite-recursion/issue-23302-2.rs
+++ b/tests/ui/recursion/issue-23302-2.rs
diff --git a/tests/ui/issues/issue-23302-enum-infinite-recursion/issue-23302-2.stderr b/tests/ui/recursion/issue-23302-2.stderr
index 9bd95239c83..9bd95239c83 100644
--- a/tests/ui/issues/issue-23302-enum-infinite-recursion/issue-23302-2.stderr
+++ b/tests/ui/recursion/issue-23302-2.stderr
diff --git a/tests/ui/issues/issue-23302-enum-infinite-recursion/issue-23302-3.rs b/tests/ui/recursion/issue-23302-3.rs
index da75f330798..da75f330798 100644
--- a/tests/ui/issues/issue-23302-enum-infinite-recursion/issue-23302-3.rs
+++ b/tests/ui/recursion/issue-23302-3.rs
diff --git a/tests/ui/issues/issue-23302-enum-infinite-recursion/issue-23302-3.stderr b/tests/ui/recursion/issue-23302-3.stderr
index 8a152f58966..8a152f58966 100644
--- a/tests/ui/issues/issue-23302-enum-infinite-recursion/issue-23302-3.stderr
+++ b/tests/ui/recursion/issue-23302-3.stderr
diff --git a/tests/ui/issues/issue-2611-3.rs b/tests/ui/traits/issue-2611-3.rs
index c95ebae33fa..c95ebae33fa 100644
--- a/tests/ui/issues/issue-2611-3.rs
+++ b/tests/ui/traits/issue-2611-3.rs
diff --git a/tests/ui/issues/issue-23649-1.rs b/tests/ui/unsized/issue-23649-1.rs
index 1c4252b40c6..1c4252b40c6 100644
--- a/tests/ui/issues/issue-23649-1.rs
+++ b/tests/ui/unsized/issue-23649-1.rs
diff --git a/tests/ui/issues/issue-23649-2.rs b/tests/ui/unsized/issue-23649-2.rs
index 4a953de1768..4a953de1768 100644
--- a/tests/ui/issues/issue-23649-2.rs
+++ b/tests/ui/unsized/issue-23649-2.rs
diff --git a/tests/ui/issues/issue-23649-3.rs b/tests/ui/unsized/issue-23649-3.rs
index 524055d99b4..524055d99b4 100644
--- a/tests/ui/issues/issue-23649-3.rs
+++ b/tests/ui/unsized/issue-23649-3.rs