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

Move some tests to more reasonable directories r? ``@petrochenkov``
JohnTitor · Jun 14, 2022 · 749576c · 749576c
2 parents c476198 + 767d0e7
commit 749576c
Show file tree

Hide file tree

Showing 19 changed files with 2 additions and 2 deletions.
diff --git a/src/test/ui/issues/issue-39974.rs → src/test/ui/consts/issue-39974.rs b/src/test/ui/issues/issue-39974.rs → src/test/ui/consts/issue-39974.rs
diff --git a/src/test/ui/issues/issue-39974.stderr → src/test/ui/consts/issue-39974.stderr b/src/test/ui/issues/issue-39974.stderr → src/test/ui/consts/issue-39974.stderr
diff --git a/src/test/ui/issues/issue-17728.rs → src/test/ui/lifetimes/issue-17728.rs b/src/test/ui/issues/issue-17728.rs → src/test/ui/lifetimes/issue-17728.rs
diff --git a/src/test/ui/issues/issue-17728.stderr → src/test/ui/lifetimes/issue-17728.stderr b/src/test/ui/issues/issue-17728.stderr → src/test/ui/lifetimes/issue-17728.stderr
diff --git a/src/test/ui/issues/issue-55796.rs → src/test/ui/lifetimes/issue-55796.rs b/src/test/ui/issues/issue-55796.rs → src/test/ui/lifetimes/issue-55796.rs
diff --git a/src/test/ui/issues/issue-55796.stderr → src/test/ui/lifetimes/issue-55796.stderr b/src/test/ui/issues/issue-55796.stderr → src/test/ui/lifetimes/issue-55796.stderr
diff --git a/src/test/ui/issues/issue-11154.rs → src/test/ui/lto/issue-11154.rs b/src/test/ui/issues/issue-11154.rs → src/test/ui/lto/issue-11154.rs
diff --git a/src/test/ui/issues/issue-11154.stderr → src/test/ui/lto/issue-11154.stderr b/src/test/ui/issues/issue-11154.stderr → src/test/ui/lto/issue-11154.stderr
diff --git a/...t-messages/feature-gate-generic_assert.rs → ...t-messages/feature-gate-generic_assert.rs b/...t-messages/feature-gate-generic_assert.rs → ...t-messages/feature-gate-generic_assert.rs
diff --git a/src/test/ui/issues/issue-46023.rs → src/test/ui/nll/issue-46023.rs b/src/test/ui/issues/issue-46023.rs → src/test/ui/nll/issue-46023.rs
diff --git a/src/test/ui/issues/issue-46023.stderr → src/test/ui/nll/issue-46023.stderr b/src/test/ui/issues/issue-46023.stderr → src/test/ui/nll/issue-46023.stderr
diff --git a/src/test/ui/issues/issue-18400.rs → src/test/ui/traits/issue-18400.rs b/src/test/ui/issues/issue-18400.rs → src/test/ui/traits/issue-18400.rs
diff --git a/src/test/ui/issues/issue-18400.stderr → src/test/ui/traits/issue-18400.stderr b/src/test/ui/issues/issue-18400.stderr → src/test/ui/traits/issue-18400.stderr
diff --git a/src/test/ui/issues/issue-18412.rs → src/test/ui/traits/issue-18412.rs b/src/test/ui/issues/issue-18412.rs → src/test/ui/traits/issue-18412.rs
diff --git a/src/test/ui/issues/issue-35869.rs → src/test/ui/traits/issue-35869.rs b/src/test/ui/issues/issue-35869.rs → src/test/ui/traits/issue-35869.rs
diff --git a/src/test/ui/issues/issue-35869.stderr → src/test/ui/traits/issue-35869.stderr b/src/test/ui/issues/issue-35869.stderr → src/test/ui/traits/issue-35869.stderr
diff --git a/src/test/ui/issues/issue-29124.rs → src/test/ui/typeck/issue-29124.rs b/src/test/ui/issues/issue-29124.rs → src/test/ui/typeck/issue-29124.rs
diff --git a/src/test/ui/issues/issue-29124.stderr → src/test/ui/typeck/issue-29124.stderr b/src/test/ui/issues/issue-29124.stderr → src/test/ui/typeck/issue-29124.stderr
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 = 969;
-const ISSUES_ENTRY_LIMIT: usize = 2211;
+const ROOT_ENTRY_LIMIT: usize = 968;
+const ISSUES_ENTRY_LIMIT: usize = 2179;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))