Rollup merge of rust-lang#96849 - c410-f3r:z-errors, r=petrochenkov

Move some tests to more reasonable places cc rust-lang#73494 r? `@petrochenkov`
JohnTitor · May 10, 2022 · ac97727 · ac97727
2 parents f689f65 + 3ddac0f
commit ac97727
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 2 deletions.
diff --git a/src/test/ui/issues/issue-28934.rs → src/test/ui/borrowck/issue-28934.rs b/src/test/ui/issues/issue-28934.rs → src/test/ui/borrowck/issue-28934.rs
diff --git a/src/test/ui/issues/issue-6801.rs → src/test/ui/closures/issue-6801.rs b/src/test/ui/issues/issue-6801.rs → src/test/ui/closures/issue-6801.rs
diff --git a/src/test/ui/issues/issue-6801.stderr → src/test/ui/closures/issue-6801.stderr b/src/test/ui/issues/issue-6801.stderr → src/test/ui/closures/issue-6801.stderr
diff --git a/src/test/ui/issues/issue-38715.rs → src/test/ui/macros/issue-38715.rs b/src/test/ui/issues/issue-38715.rs → src/test/ui/macros/issue-38715.rs
diff --git a/src/test/ui/issues/issue-38715.stderr → src/test/ui/macros/issue-38715.stderr b/src/test/ui/issues/issue-38715.stderr → src/test/ui/macros/issue-38715.stderr
diff --git a/...ui/continue-after-missing-main.nll.stderr → ...ll/continue-after-missing-main.nll.stderr b/...ui/continue-after-missing-main.nll.stderr → ...ll/continue-after-missing-main.nll.stderr
diff --git a/src/test/ui/continue-after-missing-main.rs → ...est/ui/nll/continue-after-missing-main.rs b/src/test/ui/continue-after-missing-main.rs → ...est/ui/nll/continue-after-missing-main.rs
diff --git a/...est/ui/continue-after-missing-main.stderr → ...ui/nll/continue-after-missing-main.stderr b/...est/ui/continue-after-missing-main.stderr → ...ui/nll/continue-after-missing-main.stderr
diff --git a/src/test/ui/issues/issue-48803.rs → src/test/ui/nll/issue-48803.rs b/src/test/ui/issues/issue-48803.rs → src/test/ui/nll/issue-48803.rs
diff --git a/src/test/ui/issues/issue-48803.stderr → src/test/ui/nll/issue-48803.stderr b/src/test/ui/issues/issue-48803.stderr → src/test/ui/nll/issue-48803.stderr
diff --git a/src/test/ui/issues/issue-52533-1.nll.stderr → src/test/ui/nll/issue-52533-1.nll.stderr b/src/test/ui/issues/issue-52533-1.nll.stderr → src/test/ui/nll/issue-52533-1.nll.stderr
diff --git a/src/test/ui/issues/issue-52533-1.rs → src/test/ui/nll/issue-52533-1.rs b/src/test/ui/issues/issue-52533-1.rs → src/test/ui/nll/issue-52533-1.rs
diff --git a/src/test/ui/issues/issue-52533-1.stderr → src/test/ui/nll/issue-52533-1.stderr b/src/test/ui/issues/issue-52533-1.stderr → src/test/ui/nll/issue-52533-1.stderr
diff --git a/src/test/ui/issues/issue-14940.rs → src/test/ui/process/issue-14940.rs b/src/test/ui/issues/issue-14940.rs → src/test/ui/process/issue-14940.rs
diff --git 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 = 977;
-const ISSUES_ENTRY_LIMIT: usize = 2278;
+const ROOT_ENTRY_LIMIT: usize = 974;
+const ISSUES_ENTRY_LIMIT: usize = 2248;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))