Move some UI tests to more suitable subdirs

53 files changed, 11 insertions, 9 deletions

diff --git a/src/test/ui/issues/issue-82869.rs b/src/test/ui/asm/issue-82869.rs
index a8e688cbe1f..a8e688cbe1f 100644
--- a/src/test/ui/issues/issue-82869.rs
+++ b/src/test/ui/asm/issue-82869.rs
diff --git a/src/test/ui/issues/issue-82869.stderr b/src/test/ui/asm/issue-82869.stderr
index d05714ea6f2..d05714ea6f2 100644
--- a/src/test/ui/issues/issue-82869.stderr
+++ b/src/test/ui/asm/issue-82869.stderr
diff --git a/src/test/ui/issues/issue-20005.rs b/src/test/ui/associated-types/issue-20005.rs
index 36350bff100..36350bff100 100644
--- a/src/test/ui/issues/issue-20005.rs
+++ b/src/test/ui/associated-types/issue-20005.rs
diff --git a/src/test/ui/issues/issue-20005.stderr b/src/test/ui/associated-types/issue-20005.stderr
index bc414044f78..bc414044f78 100644
--- a/src/test/ui/issues/issue-20005.stderr
+++ b/src/test/ui/associated-types/issue-20005.stderr
diff --git a/src/test/ui/fsu-moves-and-copies.rs b/src/test/ui/borrowck/fsu-moves-and-copies.rs
index 6a0b4ed17b9..6a0b4ed17b9 100644
--- a/src/test/ui/fsu-moves-and-copies.rs
+++ b/src/test/ui/borrowck/fsu-moves-and-copies.rs
diff --git a/src/test/ui/issues/issue-37655.rs b/src/test/ui/coercion/issue-37655.rs
index 416854d66f3..416854d66f3 100644
--- a/src/test/ui/issues/issue-37655.rs
+++ b/src/test/ui/coercion/issue-37655.rs
diff --git a/src/test/ui/test-cfg.rs b/src/test/ui/conditional-compilation/test-cfg.rs
index 8750bae0028..8750bae0028 100644
--- a/src/test/ui/test-cfg.rs
+++ b/src/test/ui/conditional-compilation/test-cfg.rs
diff --git a/src/test/ui/test-cfg.stderr b/src/test/ui/conditional-compilation/test-cfg.stderr
index c35fe2f9458..c35fe2f9458 100644
--- a/src/test/ui/test-cfg.stderr
+++ b/src/test/ui/conditional-compilation/test-cfg.stderr
diff --git a/src/test/ui/issues/issue-17756.rs b/src/test/ui/consts/issue-17756.rs
index 1835b177ff3..1835b177ff3 100644
--- a/src/test/ui/issues/issue-17756.rs
+++ b/src/test/ui/consts/issue-17756.rs
diff --git a/src/test/ui/issues/issue-69532.rs b/src/test/ui/consts/issue-69532.rs
index 81007b15074..81007b15074 100644
--- a/src/test/ui/issues/issue-69532.rs
+++ b/src/test/ui/consts/issue-69532.rs
diff --git a/src/test/ui/non-integer-atomic.rs b/src/test/ui/intrinsics/non-integer-atomic.rs
index 00a7f368a0f..00a7f368a0f 100644
--- a/src/test/ui/non-integer-atomic.rs
+++ b/src/test/ui/intrinsics/non-integer-atomic.rs
diff --git a/src/test/ui/non-integer-atomic.stderr b/src/test/ui/intrinsics/non-integer-atomic.stderr
index ee485c21cd6..ee485c21cd6 100644
--- a/src/test/ui/non-integer-atomic.stderr
+++ b/src/test/ui/intrinsics/non-integer-atomic.stderr
diff --git a/src/test/ui/issues/issue-36638.rs b/src/test/ui/keyword/keyword-self-as-type-param.rs
index 2e64853697a..785d64ec8ea 100644
--- a/src/test/ui/issues/issue-36638.rs
+++ b/src/test/ui/keyword/keyword-self-as-type-param.rs
@@ -1,3 +1,5 @@
+// Regression test of #36638.
+
 struct Foo<Self>(Self);
 //~^ ERROR expected identifier, found keyword `Self`
 //~^^ ERROR E0392
diff --git a/src/test/ui/issues/issue-36638.stderr b/src/test/ui/keyword/keyword-self-as-type-param.stderr
index 733fc4af534..cc3df2e36f7 100644
--- a/src/test/ui/issues/issue-36638.stderr
+++ b/src/test/ui/keyword/keyword-self-as-type-param.stderr
@@ -1,17 +1,17 @@
 error: expected identifier, found keyword `Self`
-  --> $DIR/issue-36638.rs:1:12
+  --> $DIR/keyword-self-as-type-param.rs:3:12
    |
 LL | struct Foo<Self>(Self);
    |            ^^^^ expected identifier, found keyword
 
 error: expected identifier, found keyword `Self`
-  --> $DIR/issue-36638.rs:5:11
+  --> $DIR/keyword-self-as-type-param.rs:7:11
    |
 LL | trait Bar<Self> {}
    |           ^^^^ expected identifier, found keyword
 
 error[E0392]: parameter `Self` is never used
-  --> $DIR/issue-36638.rs:1:12
+  --> $DIR/keyword-self-as-type-param.rs:3:12
    |
 LL | struct Foo<Self>(Self);
    |            ^^^^ unused parameter
diff --git a/src/test/ui/issues/issue-52169.rs b/src/test/ui/macros/issue-52169.rs
index 60be97f0aee..60be97f0aee 100644
--- a/src/test/ui/issues/issue-52169.rs
+++ b/src/test/ui/macros/issue-52169.rs
diff --git a/src/test/ui/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs b/src/test/ui/nll/issue-24535-allow-mutable-borrow-in-match-guard.rs
index 7253d35ed2d..7253d35ed2d 100644
--- a/src/test/ui/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs
+++ b/src/test/ui/nll/issue-24535-allow-mutable-borrow-in-match-guard.rs
diff --git a/src/test/ui/issues/issue-45157.rs b/src/test/ui/nll/issue-45157.rs
index 8d2bf22a03c..8d2bf22a03c 100644
--- a/src/test/ui/issues/issue-45157.rs
+++ b/src/test/ui/nll/issue-45157.rs
diff --git a/src/test/ui/issues/issue-45157.stderr b/src/test/ui/nll/issue-45157.stderr
index 57fd8d49c88..57fd8d49c88 100644
--- a/src/test/ui/issues/issue-45157.stderr
+++ b/src/test/ui/nll/issue-45157.stderr
diff --git a/src/test/ui/issues/issue-27060-2.rs b/src/test/ui/packed/issue-27060-2.rs
index a001ce1e0ac..a001ce1e0ac 100644
--- a/src/test/ui/issues/issue-27060-2.rs
+++ b/src/test/ui/packed/issue-27060-2.rs
diff --git a/src/test/ui/issues/issue-27060-2.stderr b/src/test/ui/packed/issue-27060-2.stderr
index 5dbcc96e874..5dbcc96e874 100644
--- a/src/test/ui/issues/issue-27060-2.stderr
+++ b/src/test/ui/packed/issue-27060-2.stderr
diff --git a/src/test/ui/issues/issue-27060-rpass.rs b/src/test/ui/packed/issue-27060-rpass.rs
index d9159f6669d..d9159f6669d 100644
--- a/src/test/ui/issues/issue-27060-rpass.rs
+++ b/src/test/ui/packed/issue-27060-rpass.rs
diff --git a/src/test/ui/issues/issue-27060.rs b/src/test/ui/packed/issue-27060.rs
index 5317a616719..5317a616719 100644
--- a/src/test/ui/issues/issue-27060.rs
+++ b/src/test/ui/packed/issue-27060.rs
diff --git a/src/test/ui/issues/issue-27060.stderr b/src/test/ui/packed/issue-27060.stderr
index 09297884ed3..09297884ed3 100644
--- a/src/test/ui/issues/issue-27060.stderr
+++ b/src/test/ui/packed/issue-27060.stderr
diff --git a/src/test/ui/issues/issue-48636.fixed b/src/test/ui/parser/issue-48636.fixed
index 87c19a32d4c..87c19a32d4c 100644
--- a/src/test/ui/issues/issue-48636.fixed
+++ b/src/test/ui/parser/issue-48636.fixed
diff --git a/src/test/ui/issues/issue-48636.rs b/src/test/ui/parser/issue-48636.rs
index 8610dc2f72e..8610dc2f72e 100644
--- a/src/test/ui/issues/issue-48636.rs
+++ b/src/test/ui/parser/issue-48636.rs
diff --git a/src/test/ui/issues/issue-48636.stderr b/src/test/ui/parser/issue-48636.stderr
index 462723d1d93..462723d1d93 100644
--- a/src/test/ui/issues/issue-48636.stderr
+++ b/src/test/ui/parser/issue-48636.stderr
diff --git a/src/test/ui/issues/issue-54521-1.rs b/src/test/ui/parser/issue-54521-1.rs
index 8a682ef0a11..8a682ef0a11 100644
--- a/src/test/ui/issues/issue-54521-1.rs
+++ b/src/test/ui/parser/issue-54521-1.rs
diff --git a/src/test/ui/issues/issue-54521-2.fixed b/src/test/ui/parser/issue-54521-2.fixed
index a91c4fe43ea..a91c4fe43ea 100644
--- a/src/test/ui/issues/issue-54521-2.fixed
+++ b/src/test/ui/parser/issue-54521-2.fixed
diff --git a/src/test/ui/issues/issue-54521-2.rs b/src/test/ui/parser/issue-54521-2.rs
index 3639aac87ee..3639aac87ee 100644
--- a/src/test/ui/issues/issue-54521-2.rs
+++ b/src/test/ui/parser/issue-54521-2.rs
diff --git a/src/test/ui/issues/issue-54521-2.stderr b/src/test/ui/parser/issue-54521-2.stderr
index 9556b83b730..9556b83b730 100644
--- a/src/test/ui/issues/issue-54521-2.stderr
+++ b/src/test/ui/parser/issue-54521-2.stderr
diff --git a/src/test/ui/issues/issue-54521.fixed b/src/test/ui/parser/issue-54521-3.fixed
index 84ab6866cf1..84ab6866cf1 100644
--- a/src/test/ui/issues/issue-54521.fixed
+++ b/src/test/ui/parser/issue-54521-3.fixed
diff --git a/src/test/ui/issues/issue-54521.rs b/src/test/ui/parser/issue-54521-3.rs
index f1d68504178..f1d68504178 100644
--- a/src/test/ui/issues/issue-54521.rs
+++ b/src/test/ui/parser/issue-54521-3.rs
diff --git a/src/test/ui/issues/issue-54521.stderr b/src/test/ui/parser/issue-54521-3.stderr
index ffefbfd0348..0f23dd62107 100644
--- a/src/test/ui/issues/issue-54521.stderr
+++ b/src/test/ui/parser/issue-54521-3.stderr
@@ -1,23 +1,23 @@
 error: unmatched angle brackets
-  --> $DIR/issue-54521.rs:11:60
+  --> $DIR/issue-54521-3.rs:11:60
    |
 LL |     let _ = vec![1, 2, 3].into_iter().collect::<Vec<usize>>>>>>();
    |                                                            ^^^^ help: remove extra angle brackets
 
 error: unmatched angle brackets
-  --> $DIR/issue-54521.rs:14:60
+  --> $DIR/issue-54521-3.rs:14:60
    |
 LL |     let _ = vec![1, 2, 3].into_iter().collect::<Vec<usize>>>>>();
    |                                                            ^^^ help: remove extra angle brackets
 
 error: unmatched angle brackets
-  --> $DIR/issue-54521.rs:17:60
+  --> $DIR/issue-54521-3.rs:17:60
    |
 LL |     let _ = vec![1, 2, 3].into_iter().collect::<Vec<usize>>>>();
    |                                                            ^^ help: remove extra angle brackets
 
 error: unmatched angle bracket
-  --> $DIR/issue-54521.rs:20:60
+  --> $DIR/issue-54521-3.rs:20:60
    |
 LL |     let _ = vec![1, 2, 3].into_iter().collect::<Vec<usize>>>();
    |                                                            ^ help: remove extra angle bracket
diff --git a/src/test/ui/test-panic-abort-disabled.rs b/src/test/ui/test-attrs/test-panic-abort-disabled.rs
index 874dbdb42c3..874dbdb42c3 100644
--- a/src/test/ui/test-panic-abort-disabled.rs
+++ b/src/test/ui/test-attrs/test-panic-abort-disabled.rs
diff --git a/src/test/ui/test-panic-abort-disabled.stderr b/src/test/ui/test-attrs/test-panic-abort-disabled.stderr
index 9c65c7360c1..9c65c7360c1 100644
--- a/src/test/ui/test-panic-abort-disabled.stderr
+++ b/src/test/ui/test-attrs/test-panic-abort-disabled.stderr
diff --git a/src/test/ui/test-panic-abort-nocapture.rs b/src/test/ui/test-attrs/test-panic-abort-nocapture.rs
index af530cc1a0b..af530cc1a0b 100644
--- a/src/test/ui/test-panic-abort-nocapture.rs
+++ b/src/test/ui/test-attrs/test-panic-abort-nocapture.rs
diff --git a/src/test/ui/test-panic-abort-nocapture.run.stderr b/src/test/ui/test-attrs/test-panic-abort-nocapture.run.stderr
index 727e9691c53..727e9691c53 100644
--- a/src/test/ui/test-panic-abort-nocapture.run.stderr
+++ b/src/test/ui/test-attrs/test-panic-abort-nocapture.run.stderr
diff --git a/src/test/ui/test-panic-abort-nocapture.run.stdout b/src/test/ui/test-attrs/test-panic-abort-nocapture.run.stdout
index 8a91732a754..8a91732a754 100644
--- a/src/test/ui/test-panic-abort-nocapture.run.stdout
+++ b/src/test/ui/test-attrs/test-panic-abort-nocapture.run.stdout
diff --git a/src/test/ui/test-panic-abort.rs b/src/test/ui/test-attrs/test-panic-abort.rs
index 931b7993c81..931b7993c81 100644
--- a/src/test/ui/test-panic-abort.rs
+++ b/src/test/ui/test-attrs/test-panic-abort.rs
diff --git a/src/test/ui/test-panic-abort.run.stdout b/src/test/ui/test-attrs/test-panic-abort.run.stdout
index f608a8cdc55..f608a8cdc55 100644
--- a/src/test/ui/test-panic-abort.run.stdout
+++ b/src/test/ui/test-attrs/test-panic-abort.run.stdout
diff --git a/src/test/ui/test-panic-while-printing.rs b/src/test/ui/test-attrs/test-panic-while-printing.rs
index 23f45407c1a..23f45407c1a 100644
--- a/src/test/ui/test-panic-while-printing.rs
+++ b/src/test/ui/test-attrs/test-panic-while-printing.rs
diff --git a/src/test/ui/test-passed-wasm.rs b/src/test/ui/test-attrs/test-passed-wasm.rs
index 578aa4b1760..578aa4b1760 100644
--- a/src/test/ui/test-passed-wasm.rs
+++ b/src/test/ui/test-attrs/test-passed-wasm.rs
diff --git a/src/test/ui/test-passed-wasm.run.stdout b/src/test/ui/test-attrs/test-passed-wasm.run.stdout
index c3005a77983..c3005a77983 100644
--- a/src/test/ui/test-passed-wasm.run.stdout
+++ b/src/test/ui/test-attrs/test-passed-wasm.run.stdout
diff --git a/src/test/ui/test-passed.rs b/src/test/ui/test-attrs/test-passed.rs
index f65f0003022..f65f0003022 100644
--- a/src/test/ui/test-passed.rs
+++ b/src/test/ui/test-attrs/test-passed.rs
diff --git a/src/test/ui/test-passed.run.stdout b/src/test/ui/test-attrs/test-passed.run.stdout
index 17f70d60749..17f70d60749 100644
--- a/src/test/ui/test-passed.run.stdout
+++ b/src/test/ui/test-attrs/test-passed.run.stdout
diff --git a/src/test/ui/test-thread-capture.rs b/src/test/ui/test-attrs/test-thread-capture.rs
index edc972837a3..edc972837a3 100644
--- a/src/test/ui/test-thread-capture.rs
+++ b/src/test/ui/test-attrs/test-thread-capture.rs
diff --git a/src/test/ui/test-thread-capture.run.stdout b/src/test/ui/test-attrs/test-thread-capture.run.stdout
index 487cfb55eb4..487cfb55eb4 100644
--- a/src/test/ui/test-thread-capture.run.stdout
+++ b/src/test/ui/test-attrs/test-thread-capture.run.stdout
diff --git a/src/test/ui/test-thread-nocapture.rs b/src/test/ui/test-attrs/test-thread-nocapture.rs
index 8e8e9bbfdf0..8e8e9bbfdf0 100644
--- a/src/test/ui/test-thread-nocapture.rs
+++ b/src/test/ui/test-attrs/test-thread-nocapture.rs
diff --git a/src/test/ui/test-thread-nocapture.run.stderr b/src/test/ui/test-attrs/test-thread-nocapture.run.stderr
index 06495681b3e..06495681b3e 100644
--- a/src/test/ui/test-thread-nocapture.run.stderr
+++ b/src/test/ui/test-attrs/test-thread-nocapture.run.stderr
diff --git a/src/test/ui/test-thread-nocapture.run.stdout b/src/test/ui/test-attrs/test-thread-nocapture.run.stdout
index 9d2da50826c..9d2da50826c 100644
--- a/src/test/ui/test-thread-nocapture.run.stdout
+++ b/src/test/ui/test-attrs/test-thread-nocapture.run.stdout
diff --git a/src/test/ui/conversion-methods.rs b/src/test/ui/typeck/conversion-methods.rs
index 46c2e511f33..46c2e511f33 100644
--- a/src/test/ui/conversion-methods.rs
+++ b/src/test/ui/typeck/conversion-methods.rs
diff --git a/src/test/ui/conversion-methods.stderr b/src/test/ui/typeck/conversion-methods.stderr
index 4f47e1fd0ff..4f47e1fd0ff 100644
--- a/src/test/ui/conversion-methods.stderr
+++ b/src/test/ui/typeck/conversion-methods.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index f61295c8830..66d05d9f00e 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 = 1371;
-const ISSUES_ENTRY_LIMIT: usize = 2559;
+const ROOT_ENTRY_LIMIT: usize = 1345;
+const ISSUES_ENTRY_LIMIT: usize = 2530;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))