From b7b0291147c3897fe2619e2069bb828b059f44f1 Mon Sep 17 00:00:00 2001
From: Yuki Okushi <yuki.okushi@huawei.com>
Date: Fri, 30 Jul 2021 02:36:57 +0900
Subject: [PATCH] Move some UI tests to more suitable subdirs

---
 src/test/ui/{issues => consts}/issue-37222.rs     |  0
 src/test/ui/{issues => derives}/issue-43023.rs    |  0
 .../ui/{issues => derives}/issue-43023.stderr     |  0
 src/test/ui/estr-subtyping.rs                     | 15 ---------------
 src/test/ui/estr-subtyping.stderr                 | 11 -----------
 src/test/ui/{ => inference}/deref-suggestion.rs   |  0
 .../ui/{ => inference}/deref-suggestion.stderr    |  0
 src/test/ui/{issues => privacy}/issue-13641.rs    |  0
 .../ui/{issues => privacy}/issue-13641.stderr     |  0
 src/tools/tidy/src/ui_tests.rs                    |  2 +-
 10 files changed, 1 insertion(+), 27 deletions(-)
 rename src/test/ui/{issues => consts}/issue-37222.rs (100%)
 rename src/test/ui/{issues => derives}/issue-43023.rs (100%)
 rename src/test/ui/{issues => derives}/issue-43023.stderr (100%)
 delete mode 100644 src/test/ui/estr-subtyping.rs
 delete mode 100644 src/test/ui/estr-subtyping.stderr
 rename src/test/ui/{ => inference}/deref-suggestion.rs (100%)
 rename src/test/ui/{ => inference}/deref-suggestion.stderr (100%)
 rename src/test/ui/{issues => privacy}/issue-13641.rs (100%)
 rename src/test/ui/{issues => privacy}/issue-13641.stderr (100%)

diff --git a/src/test/ui/issues/issue-37222.rs b/src/test/ui/consts/issue-37222.rs
similarity index 100%
rename from src/test/ui/issues/issue-37222.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-43023.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-43023.stderr
rename to 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 9c5825fff8552..0000000000000
--- 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 d929c32633a0a..0000000000000
--- 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
similarity index 100%
rename from src/test/ui/deref-suggestion.rs
rename to src/test/ui/inference/deref-suggestion.rs
diff --git a/src/test/ui/deref-suggestion.stderr b/src/test/ui/inference/deref-suggestion.stderr
similarity index 100%
rename from src/test/ui/deref-suggestion.stderr
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-13641.rs
rename to 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
similarity index 100%
rename from src/test/ui/issues/issue-13641.stderr
rename to 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 66d05d9f00ee9..46b5b877b4c26 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"))