Move some tests to more reasonable places

29 files changed, 2 insertions, 2 deletions

diff --git a/src/test/ui/issues/issue-54387.rs b/src/test/ui/consts/issue-54387.rs
index 60e3a02f4ce..60e3a02f4ce 100644
--- a/src/test/ui/issues/issue-54387.rs
+++ b/src/test/ui/consts/issue-54387.rs
diff --git a/src/test/ui/issues/issue-54966.rs b/src/test/ui/impl-trait/issue-54966.rs
index 0ed3c4b3ca9..0ed3c4b3ca9 100644
--- a/src/test/ui/issues/issue-54966.rs
+++ b/src/test/ui/impl-trait/issue-54966.rs
diff --git a/src/test/ui/issues/issue-54966.stderr b/src/test/ui/impl-trait/issue-54966.stderr
index aa9a61cb592..aa9a61cb592 100644
--- a/src/test/ui/issues/issue-54966.stderr
+++ b/src/test/ui/impl-trait/issue-54966.stderr
diff --git a/src/test/ui/issues/issue-26873-multifile/A/B.rs b/src/test/ui/imports/issue-26873-multifile/A/B.rs
index ab7b0d81605..ab7b0d81605 100644
--- a/src/test/ui/issues/issue-26873-multifile/A/B.rs
+++ b/src/test/ui/imports/issue-26873-multifile/A/B.rs
diff --git a/src/test/ui/issues/issue-26873-multifile/A/C.rs b/src/test/ui/imports/issue-26873-multifile/A/C.rs
index b287283df53..b287283df53 100644
--- a/src/test/ui/issues/issue-26873-multifile/A/C.rs
+++ b/src/test/ui/imports/issue-26873-multifile/A/C.rs
diff --git a/src/test/ui/issues/issue-26873-multifile/A/mod.rs b/src/test/ui/imports/issue-26873-multifile/A/mod.rs
index 0f18772bf1b..0f18772bf1b 100644
--- a/src/test/ui/issues/issue-26873-multifile/A/mod.rs
+++ b/src/test/ui/imports/issue-26873-multifile/A/mod.rs
diff --git a/src/test/ui/issues/issue-26873-multifile/compiletest-ignore-dir b/src/test/ui/imports/issue-26873-multifile/compiletest-ignore-dir
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/ui/issues/issue-26873-multifile/compiletest-ignore-dir
+++ b/src/test/ui/imports/issue-26873-multifile/compiletest-ignore-dir
diff --git a/src/test/ui/issues/issue-26873-multifile.rs b/src/test/ui/imports/issue-26873-multifile/issue-26873-multifile.rs
index da2acf6c9f7..da2acf6c9f7 100644
--- a/src/test/ui/issues/issue-26873-multifile.rs
+++ b/src/test/ui/imports/issue-26873-multifile/issue-26873-multifile.rs
diff --git a/src/test/ui/imports/issue-26873-onefile.rs b/src/test/ui/imports/issue-26873-multifile/issue-26873-onefile.rs
index f06c6499eb0..f06c6499eb0 100644
--- a/src/test/ui/imports/issue-26873-onefile.rs
+++ b/src/test/ui/imports/issue-26873-multifile/issue-26873-onefile.rs
diff --git a/src/test/ui/issues/issue-26873-multifile/mod.rs b/src/test/ui/imports/issue-26873-multifile/mod.rs
index a1ba53f9191..a1ba53f9191 100644
--- a/src/test/ui/issues/issue-26873-multifile/mod.rs
+++ b/src/test/ui/imports/issue-26873-multifile/mod.rs
diff --git a/src/test/ui/issues/issue-28098.rs b/src/test/ui/iterators/issue-28098.rs
index 62a90d90d12..62a90d90d12 100644
--- a/src/test/ui/issues/issue-28098.rs
+++ b/src/test/ui/iterators/issue-28098.rs
diff --git a/src/test/ui/issues/issue-28098.stderr b/src/test/ui/iterators/issue-28098.stderr
index 3beb9929244..3beb9929244 100644
--- a/src/test/ui/issues/issue-28098.stderr
+++ b/src/test/ui/iterators/issue-28098.stderr
diff --git a/src/test/ui/issues/issue-11319.rs b/src/test/ui/match/issue-11319.rs
index ab69ab250ff..ab69ab250ff 100644
--- a/src/test/ui/issues/issue-11319.rs
+++ b/src/test/ui/match/issue-11319.rs
diff --git a/src/test/ui/issues/issue-11319.stderr b/src/test/ui/match/issue-11319.stderr
index fc44205e81e..fc44205e81e 100644
--- a/src/test/ui/issues/issue-11319.stderr
+++ b/src/test/ui/match/issue-11319.stderr
diff --git a/src/test/ui/issues/issue-14958.rs b/src/test/ui/overloaded/issue-14958.rs
index a12564ca9c0..a12564ca9c0 100644
--- a/src/test/ui/issues/issue-14958.rs
+++ b/src/test/ui/overloaded/issue-14958.rs
diff --git a/src/test/ui/issues/issue-68091-unicode-ident-after-if.rs b/src/test/ui/parser/issue-68091-unicode-ident-after-if.rs
index 00f90cc73b3..00f90cc73b3 100644
--- a/src/test/ui/issues/issue-68091-unicode-ident-after-if.rs
+++ b/src/test/ui/parser/issue-68091-unicode-ident-after-if.rs
diff --git a/src/test/ui/issues/issue-68091-unicode-ident-after-if.stderr b/src/test/ui/parser/issue-68091-unicode-ident-after-if.stderr
index cdd4c670500..cdd4c670500 100644
--- a/src/test/ui/issues/issue-68091-unicode-ident-after-if.stderr
+++ b/src/test/ui/parser/issue-68091-unicode-ident-after-if.stderr
diff --git a/src/test/ui/issues/issue-68092-unicode-ident-after-incomplete-expr.rs b/src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.rs
index 1a90b4724d4..1a90b4724d4 100644
--- a/src/test/ui/issues/issue-68092-unicode-ident-after-incomplete-expr.rs
+++ b/src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.rs
diff --git a/src/test/ui/issues/issue-68092-unicode-ident-after-incomplete-expr.stderr b/src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.stderr
index 0b9c364f1f1..0b9c364f1f1 100644
--- a/src/test/ui/issues/issue-68092-unicode-ident-after-incomplete-expr.stderr
+++ b/src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.stderr
diff --git a/src/test/ui/issues/issue-8153.rs b/src/test/ui/traits/issue-8153.rs
index 81a8f5338eb..81a8f5338eb 100644
--- a/src/test/ui/issues/issue-8153.rs
+++ b/src/test/ui/traits/issue-8153.rs
diff --git a/src/test/ui/issues/issue-8153.stderr b/src/test/ui/traits/issue-8153.stderr
index 4389c3dc288..4389c3dc288 100644
--- a/src/test/ui/issues/issue-8153.stderr
+++ b/src/test/ui/traits/issue-8153.stderr
diff --git a/src/test/ui/issues/issue-14933.rs b/src/test/ui/type-alias/issue-14933.rs
index bd95332caba..bd95332caba 100644
--- a/src/test/ui/issues/issue-14933.rs
+++ b/src/test/ui/type-alias/issue-14933.rs
diff --git a/src/test/ui/issues/issue-13853-2.rs b/src/test/ui/typeck/issue-13853-2.rs
index 27319c98d6e..27319c98d6e 100644
--- a/src/test/ui/issues/issue-13853-2.rs
+++ b/src/test/ui/typeck/issue-13853-2.rs
diff --git a/src/test/ui/issues/issue-13853-2.stderr b/src/test/ui/typeck/issue-13853-2.stderr
index 92068df6c05..92068df6c05 100644
--- a/src/test/ui/issues/issue-13853-2.stderr
+++ b/src/test/ui/typeck/issue-13853-2.stderr
diff --git a/src/test/ui/issues/issue-13853-5.rs b/src/test/ui/typeck/issue-13853-5.rs
index 2afdf95aacf..2afdf95aacf 100644
--- a/src/test/ui/issues/issue-13853-5.rs
+++ b/src/test/ui/typeck/issue-13853-5.rs
diff --git a/src/test/ui/issues/issue-13853-5.stderr b/src/test/ui/typeck/issue-13853-5.stderr
index 3d8f824ec94..3d8f824ec94 100644
--- a/src/test/ui/issues/issue-13853-5.stderr
+++ b/src/test/ui/typeck/issue-13853-5.stderr
diff --git a/src/test/ui/issues/issue-13853.rs b/src/test/ui/typeck/issue-13853.rs
index ac9886d2e72..ac9886d2e72 100644
--- a/src/test/ui/issues/issue-13853.rs
+++ b/src/test/ui/typeck/issue-13853.rs
diff --git a/src/test/ui/issues/issue-13853.stderr b/src/test/ui/typeck/issue-13853.stderr
index 657bda5f62b..657bda5f62b 100644
--- a/src/test/ui/issues/issue-13853.stderr
+++ b/src/test/ui/typeck/issue-13853.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index cf72dc4bd09..135a12b5571 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 = 971;
-const ISSUES_ENTRY_LIMIT: usize = 2234;
+const ROOT_ENTRY_LIMIT: usize = 969;
+const ISSUES_ENTRY_LIMIT: usize = 2211;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))