Move some UI tests to more suitable subdirs

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

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

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

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"))