Rollup merge of #97043 - c410-f3r:z-errors, r=petrochenkov

Move some tests to more reasonable directories

r? `@petrochenkov`

17 files changed, 2 insertions, 2 deletions

diff --git a/src/test/ui/issues/issue-20825-2.rs b/src/test/ui/associated-types/issue-20825-2.rs
index b79a2973082..b79a2973082 100644
--- a/src/test/ui/issues/issue-20825-2.rs
+++ b/src/test/ui/associated-types/issue-20825-2.rs
diff --git a/src/test/ui/issues/issue-20825.rs b/src/test/ui/associated-types/issue-20825.rs
index 516c304d8b3..516c304d8b3 100644
--- a/src/test/ui/issues/issue-20825.rs
+++ b/src/test/ui/associated-types/issue-20825.rs
diff --git a/src/test/ui/issues/issue-20825.stderr b/src/test/ui/associated-types/issue-20825.stderr
index be2bbd44800..be2bbd44800 100644
--- a/src/test/ui/issues/issue-20825.stderr
+++ b/src/test/ui/associated-types/issue-20825.stderr
diff --git a/src/test/ui/issues/issue-32922.rs b/src/test/ui/hygiene/issue-32922.rs
index 54ec44a1cf4..54ec44a1cf4 100644
--- a/src/test/ui/issues/issue-32922.rs
+++ b/src/test/ui/hygiene/issue-32922.rs
diff --git a/src/test/ui/issues/issue-46959.rs b/src/test/ui/impl-trait/issue-46959.rs
index 3611a956836..3611a956836 100644
--- a/src/test/ui/issues/issue-46959.rs
+++ b/src/test/ui/impl-trait/issue-46959.rs
diff --git a/src/test/ui/issues/issue-33185.rs b/src/test/ui/macros/issue-33185.rs
index 0d6669146a6..0d6669146a6 100644
--- a/src/test/ui/issues/issue-33185.rs
+++ b/src/test/ui/macros/issue-33185.rs
diff --git a/src/test/ui/issues/issue-27021.rs b/src/test/ui/match/issue-27021.rs
index ef3b114a5fa..ef3b114a5fa 100644
--- a/src/test/ui/issues/issue-27021.rs
+++ b/src/test/ui/match/issue-27021.rs
diff --git a/src/test/ui/issues/issue-27320.rs b/src/test/ui/pattern/issue-27320.rs
index d1aa56b915b..d1aa56b915b 100644
--- a/src/test/ui/issues/issue-27320.rs
+++ b/src/test/ui/pattern/issue-27320.rs
diff --git a/src/test/ui/issues/issue-13304.rs b/src/test/ui/process/issue-13304.rs
index b10f6d57255..b10f6d57255 100644
--- a/src/test/ui/issues/issue-13304.rs
+++ b/src/test/ui/process/issue-13304.rs
diff --git a/src/test/ui/issues/issue-26459.rs b/src/test/ui/save-analysis/issue-26459.rs
index 2ba05a0a47e..2ba05a0a47e 100644
--- a/src/test/ui/issues/issue-26459.rs
+++ b/src/test/ui/save-analysis/issue-26459.rs
diff --git a/src/test/ui/issues/issue-26459.stderr b/src/test/ui/save-analysis/issue-26459.stderr
index 9f594990c6d..9f594990c6d 100644
--- a/src/test/ui/issues/issue-26459.stderr
+++ b/src/test/ui/save-analysis/issue-26459.stderr
diff --git a/src/test/ui/issues/auxiliary/issue-36708.rs b/src/test/ui/typeck/auxiliary/issue-36708.rs
index bd8580f9782..bd8580f9782 100644
--- a/src/test/ui/issues/auxiliary/issue-36708.rs
+++ b/src/test/ui/typeck/auxiliary/issue-36708.rs
diff --git a/src/test/ui/issues/issue-36708.rs b/src/test/ui/typeck/issue-36708.rs
index c9d9f2a6d50..c9d9f2a6d50 100644
--- a/src/test/ui/issues/issue-36708.rs
+++ b/src/test/ui/typeck/issue-36708.rs
diff --git a/src/test/ui/issues/issue-36708.stderr b/src/test/ui/typeck/issue-36708.stderr
index 140f19f1ff7..140f19f1ff7 100644
--- a/src/test/ui/issues/issue-36708.stderr
+++ b/src/test/ui/typeck/issue-36708.stderr
diff --git a/src/test/ui/issues/issue-40231-1.rs b/src/test/ui/unsized/issue-40231-1.rs
index 999399ec8d3..999399ec8d3 100644
--- a/src/test/ui/issues/issue-40231-1.rs
+++ b/src/test/ui/unsized/issue-40231-1.rs
diff --git a/src/test/ui/issues/issue-40231-2.rs b/src/test/ui/unsized/issue-40231-2.rs
index 780433b28c5..780433b28c5 100644
--- a/src/test/ui/issues/issue-40231-2.rs
+++ b/src/test/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 5712e84adbc..cf72dc4bd09 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 = 974;
-const ISSUES_ENTRY_LIMIT: usize = 2248;
+const ROOT_ENTRY_LIMIT: usize = 971;
+const ISSUES_ENTRY_LIMIT: usize = 2234;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))