Auto merge of #87600 - JohnTitor:classify-ui-tests, r=petrochenkov

Move some UI tests to more suitable subdirs

The classifui result: https://gist.github.com/JohnTitor/c9e00840990b5e4a8fc562ec3571e427/e06c42226c6038da91e403c33b9947843420cf44

Some notes:
- backtrace-debuginfo.rs: previously I skipped this, I'm still not sure what the best dir is. Any ideas?
- estr-subtyping.rs: Seems a quite old test so removed, shouldn't?
- deref-suggestion.rs: moved to inference as `suggestions` is not an ideal dir.
- issue-43023.rs: a bit misclassified, moved to `derives`

cc #73494
r? `@petrochenkov`

10 files changed, 1 insertions, 27 deletions

diff --git a/src/test/ui/issues/issue-37222.rs b/src/test/ui/consts/issue-37222.rs
index 8ea5f6b7a27..8ea5f6b7a27 100644
--- a/src/test/ui/issues/issue-37222.rs
+++ b/src/test/ui/consts/issue-37222.rs
diff --git a/src/test/ui/issues/issue-43023.rs b/src/test/ui/derives/issue-43023.rs
index c0208e68084..c0208e68084 100644
--- a/src/test/ui/issues/issue-43023.rs
+++ b/src/test/ui/derives/issue-43023.rs
diff --git a/src/test/ui/issues/issue-43023.stderr b/src/test/ui/derives/issue-43023.stderr
index 007eb259594..007eb259594 100644
--- a/src/test/ui/issues/issue-43023.stderr
+++ b/src/test/ui/derives/issue-43023.stderr
diff --git a/src/test/ui/estr-subtyping.rs b/src/test/ui/estr-subtyping.rs
deleted file mode 100644
index 9c5825fff85..00000000000
--- a/src/test/ui/estr-subtyping.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-fn wants_uniq(x: String) { }
-fn wants_slice(x: &str) { }
-
-fn has_uniq(x: String) {
-   wants_uniq(x);
-   wants_slice(&*x);
-}
-
-fn has_slice(x: &str) {
-   wants_uniq(x); //~ ERROR mismatched types
-   wants_slice(x);
-}
-
-fn main() {
-}
diff --git a/src/test/ui/estr-subtyping.stderr b/src/test/ui/estr-subtyping.stderr
deleted file mode 100644
index d929c32633a..00000000000
--- a/src/test/ui/estr-subtyping.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/estr-subtyping.rs:10:15
-   |
-LL |    wants_uniq(x);
-   |               ^- help: try using a conversion method: `.to_string()`
-   |               |
-   |               expected struct `String`, found `&str`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/deref-suggestion.rs b/src/test/ui/inference/deref-suggestion.rs
index 4fd695585ba..4fd695585ba 100644
--- a/src/test/ui/deref-suggestion.rs
+++ b/src/test/ui/inference/deref-suggestion.rs
diff --git a/src/test/ui/deref-suggestion.stderr b/src/test/ui/inference/deref-suggestion.stderr
index c5c8b884297..c5c8b884297 100644
--- a/src/test/ui/deref-suggestion.stderr
+++ b/src/test/ui/inference/deref-suggestion.stderr
diff --git a/src/test/ui/issues/issue-13641.rs b/src/test/ui/privacy/issue-13641.rs
index 198cea4289c..198cea4289c 100644
--- a/src/test/ui/issues/issue-13641.rs
+++ b/src/test/ui/privacy/issue-13641.rs
diff --git a/src/test/ui/issues/issue-13641.stderr b/src/test/ui/privacy/issue-13641.stderr
index cdd0772d39f..cdd0772d39f 100644
--- a/src/test/ui/issues/issue-13641.stderr
+++ b/src/test/ui/privacy/issue-13641.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 66d05d9f00e..46b5b877b4c 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -8,7 +8,7 @@ use std::path::Path;
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
 const ROOT_ENTRY_LIMIT: usize = 1345;
-const ISSUES_ENTRY_LIMIT: usize = 2530;
+const ISSUES_ENTRY_LIMIT: usize = 2525;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))