rust-lang
diff --git a/‎src/test/ui/issues/issue-17718-static-move.rs renamed to ‎src/test/ui/borrowck/issue-17718-static-move.rs b/‎src/test/ui/issues/issue-17718-static-move.rs renamed to ‎src/test/ui/borrowck/issue-17718-static-move.rs
diff --git a/‎src/test/ui/issues/issue-17718-static-move.stderr renamed to ‎src/test/ui/borrowck/issue-17718-static-move.stderr b/‎src/test/ui/issues/issue-17718-static-move.stderr renamed to ‎src/test/ui/borrowck/issue-17718-static-move.stderr
diff --git a/‎src/test/ui/issues/issue-17718-constants-not-static.rs renamed to ‎src/test/ui/consts/issue-17718-constants-not-static.rs b/‎src/test/ui/issues/issue-17718-constants-not-static.rs renamed to ‎src/test/ui/consts/issue-17718-constants-not-static.rs
diff --git a/‎src/test/ui/issues/issue-17718-constants-not-static.stderr renamed to ‎src/test/ui/consts/issue-17718-constants-not-static.stderr b/‎src/test/ui/issues/issue-17718-constants-not-static.stderr renamed to ‎src/test/ui/consts/issue-17718-constants-not-static.stderr
diff --git a/‎src/test/ui/issues/issue-17718-const-destructors.rs renamed to ‎src/test/ui/drop/issue-17718-const-destructors.rs b/‎src/test/ui/issues/issue-17718-const-destructors.rs renamed to ‎src/test/ui/drop/issue-17718-const-destructors.rs
diff --git a/‎src/test/ui/issues/issue-48962.rs renamed to ‎src/test/ui/drop/issue-48962.rs b/‎src/test/ui/issues/issue-48962.rs renamed to ‎src/test/ui/drop/issue-48962.rs
diff --git a/‎src/test/ui/issues/issue-77993-1.rs
-12 b/‎src/test/ui/issues/issue-77993-1.rs
-12
diff --git a/‎src/test/ui/issues/issue-77993-1.stderr
-16 b/‎src/test/ui/issues/issue-77993-1.stderr
-16
diff --git a/‎src/test/ui/issues/issue-5500-1.rs renamed to ‎src/test/ui/never_type/issue-5500-1.rs b/‎src/test/ui/issues/issue-5500-1.rs renamed to ‎src/test/ui/never_type/issue-5500-1.rs
diff --git a/‎src/test/ui/issues/issue-17718-parse-const.rs renamed to ‎src/test/ui/parser/issue-17718-parse-const.rs b/‎src/test/ui/issues/issue-17718-parse-const.rs renamed to ‎src/test/ui/parser/issue-17718-parse-const.rs
diff --git a/‎src/test/ui/issues/issue-17718-patterns.rs renamed to ‎src/test/ui/pattern/issue-17718-patterns.rs b/‎src/test/ui/issues/issue-17718-patterns.rs renamed to ‎src/test/ui/pattern/issue-17718-patterns.rs
diff --git a/‎src/test/ui/issues/issue-17718-patterns.stderr renamed to ‎src/test/ui/pattern/issue-17718-patterns.stderr b/‎src/test/ui/issues/issue-17718-patterns.stderr renamed to ‎src/test/ui/pattern/issue-17718-patterns.stderr
diff --git a/‎src/test/ui/issues/auxiliary/issue-17718-const-privacy.rs renamed to ‎src/test/ui/privacy/auxiliary/issue-17718-const-privacy.rs b/‎src/test/ui/issues/auxiliary/issue-17718-const-privacy.rs renamed to ‎src/test/ui/privacy/auxiliary/issue-17718-const-privacy.rs
diff --git a/‎src/test/ui/issues/issue-17718-const-privacy.rs renamed to ‎src/test/ui/privacy/issue-17718-const-privacy.rs b/‎src/test/ui/issues/issue-17718-const-privacy.rs renamed to ‎src/test/ui/privacy/issue-17718-const-privacy.rs
diff --git a/‎src/test/ui/issues/issue-17718-const-privacy.stderr renamed to ‎src/test/ui/privacy/issue-17718-const-privacy.stderr b/‎src/test/ui/issues/issue-17718-const-privacy.stderr renamed to ‎src/test/ui/privacy/issue-17718-const-privacy.stderr
diff --git a/‎src/test/ui/issues/issue-17718-static-sync.rs renamed to ‎src/test/ui/statics/issue-17718-static-sync.rs b/‎src/test/ui/issues/issue-17718-static-sync.rs renamed to ‎src/test/ui/statics/issue-17718-static-sync.rs
diff --git a/‎src/test/ui/issues/issue-17718-static-sync.stderr renamed to ‎src/test/ui/statics/issue-17718-static-sync.stderr b/‎src/test/ui/issues/issue-17718-static-sync.stderr renamed to ‎src/test/ui/statics/issue-17718-static-sync.stderr
diff --git a/‎src/test/ui/issues/issue-17718-static-unsafe-interior.rs renamed to ‎src/test/ui/statics/issue-17718-static-unsafe-interior.rs b/‎src/test/ui/issues/issue-17718-static-unsafe-interior.rs renamed to ‎src/test/ui/statics/issue-17718-static-unsafe-interior.rs
diff --git a/‎src/tools/tidy/src/ui_tests.rs
+2-2 b/‎src/tools/tidy/src/ui_tests.rs
+2-2
@@ -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 = 950;
-const ISSUES_ENTRY_LIMIT: usize = 2141;
+const ROOT_ENTRY_LIMIT: usize = 948;
+const ISSUES_ENTRY_LIMIT: usize = 2126;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))