Rollup merge of #82203 - c410-f3r:tests-tests-tests, r=Dylan-DPC

Move some tests to more reasonable directories - 4 cc #81941
2024-11-27 01:04:03 +00:00 · 2021-02-18 15:57:29 +09:00 · 2021-02-18 15:57:29 +09:00 · fe15494857
commit fe15494857
parent 135a05c5ae e7e93717ce
55 changed files with 5 additions and 19 deletions
--- a/src/test/ui/associated-types/issue-21726.rs
+++ b/src/test/ui/associated-types/issue-21726.rs
--- a/src/test/ui/associated-types/issue-22560.rs
+++ b/src/test/ui/associated-types/issue-22560.rs
--- a/src/test/ui/associated-types/issue-22560.stderr
+++ b/src/test/ui/associated-types/issue-22560.stderr
--- a/src/test/ui/associated-types/issue-23595-2.rs
+++ b/src/test/ui/associated-types/issue-23595-2.rs
--- a/src/test/ui/associated-types/issue-23595-2.stderr
+++ b/src/test/ui/associated-types/issue-23595-2.stderr
--- a/src/test/ui/associated-types/issue-24204.rs
+++ b/src/test/ui/associated-types/issue-24204.rs
--- a/src/test/ui/associated-types/issue-43784-associated-type.rs
+++ b/src/test/ui/associated-types/issue-43784-associated-type.rs
--- a/src/test/ui/associated-types/issue-43784-associated-type.stderr
+++ b/src/test/ui/associated-types/issue-43784-associated-type.stderr
--- a/src/test/ui/associated-types/project-defer-unification.rs
+++ b/src/test/ui/associated-types/project-defer-unification.rs
--- a/src/test/ui/async-await/issue-77993-2.rs
+++ b/src/test/ui/async-await/issue-77993-2.rs
--- a/src/test/ui/async-await/issue-77993-2.stderr
+++ b/src/test/ui/async-await/issue-77993-2.stderr
--- a/src/test/ui/async-await/repeat_count_const_in_async_fn.rs
+++ b/src/test/ui/async-await/repeat_count_const_in_async_fn.rs
--- a/src/test/ui/consts/issue-13837.rs
+++ b/src/test/ui/consts/issue-13837.rs
--- a/src/test/ui/consts/issue-17718-references.rs
+++ b/src/test/ui/consts/issue-17718-references.rs
--- a/src/test/ui/consts/issue-17718-references.stderr
+++ b/src/test/ui/consts/issue-17718-references.stderr
--- a/src/test/ui/consts/issue-32829.rs
+++ b/src/test/ui/consts/issue-32829.rs
--- a/src/test/ui/consts/issue-32829.stderr
+++ b/src/test/ui/consts/issue-32829.stderr
--- a/src/test/ui/consts/issue-33537.rs
+++ b/src/test/ui/consts/issue-33537.rs
--- a/src/test/ui/consts/rvalue-static-promotion.rs
+++ b/src/test/ui/consts/rvalue-static-promotion.rs
--- a/src/test/ui/consts/write-to-static-mut-in-static.rs
+++ b/src/test/ui/consts/write-to-static-mut-in-static.rs
--- a/src/test/ui/consts/write-to-static-mut-in-static.stderr
+++ b/src/test/ui/consts/write-to-static-mut-in-static.stderr
--- a/src/test/ui/emit-artifact-notifications.nll.stderr
+++ b/src/test/ui/emit-artifact-notifications.nll.stderr
@ -1 +0,0 @@
-{"artifact":"$TEST_BUILD_DIR/emit-artifact-notifications.nll/libemit_artifact_notifications.rmeta","emit":"metadata"}
--- a/src/test/ui/emit-artifact-notifications.polonius.stderr
+++ b/src/test/ui/emit-artifact-notifications.polonius.stderr
@ -1 +0,0 @@
-{"artifact":"$TEST_BUILD_DIR/emit-artifact-notifications.polonius/libemit_artifact_notifications.rmeta","emit":"metadata"}
--- a/src/test/ui/emit-artifact-notifications.stderr
+++ b/src/test/ui/emit-artifact-notifications.stderr
@ -1 +0,0 @@
-{"artifact":"$TEST_BUILD_DIR/emit-artifact-notifications/libemit_artifact_notifications.rmeta","emit":"metadata"}
--- a/src/test/ui/expr/if/expr-if-panic-pass.rs
+++ b/src/test/ui/expr/if/expr-if-panic-pass.rs
--- a/src/test/ui/expr/if/issue-4201.rs
+++ b/src/test/ui/expr/if/issue-4201.rs
--- a/src/test/ui/expr/if/issue-4201.stderr
+++ b/src/test/ui/expr/if/issue-4201.stderr
--- a/src/test/ui/for-loop-while/cleanup-rvalue-during-if-and-while.rs
+++ b/src/test/ui/for-loop-while/cleanup-rvalue-during-if-and-while.rs
--- a/src/test/ui/hygiene/issue-40847.rs
+++ b/src/test/ui/hygiene/issue-40847.rs
--- a/src/test/ui/issues/issue-6157.rs
+++ b/src/test/ui/issues/issue-6157.rs
--- a/src/test/ui/issues/issue-31924-non-snake-ffi.rs
+++ b/src/test/ui/issues/issue-31924-non-snake-ffi.rs
--- a/src/test/ui/macros/html-literals.rs
+++ b/src/test/ui/macros/html-literals.rs
--- a/src/test/ui/parser/dotdotdot-expr.rs
+++ b/src/test/ui/parser/dotdotdot-expr.rs
--- a/src/test/ui/parser/dotdotdot-expr.stderr
+++ b/src/test/ui/parser/dotdotdot-expr.stderr
--- a/src/test/ui/parser/issue-20616-3.rs
+++ b/src/test/ui/parser/issue-20616-3.rs
--- a/src/test/ui/parser/issue-20616-3.stderr
+++ b/src/test/ui/parser/issue-20616-3.stderr
--- a/src/test/ui/parser/issue-44406.rs
+++ b/src/test/ui/parser/issue-44406.rs
--- a/src/test/ui/parser/issue-44406.stderr
+++ b/src/test/ui/parser/issue-44406.stderr
--- a/src/test/ui/parser/old-suffixes-are-really-forbidden.rs
+++ b/src/test/ui/parser/old-suffixes-are-really-forbidden.rs
--- a/src/test/ui/parser/old-suffixes-are-really-forbidden.stderr
+++ b/src/test/ui/parser/old-suffixes-are-really-forbidden.stderr
--- a/src/test/ui/parser/struct-literal-variant-in-if.rs
+++ b/src/test/ui/parser/struct-literal-variant-in-if.rs
--- a/src/test/ui/parser/struct-literal-variant-in-if.stderr
+++ b/src/test/ui/parser/struct-literal-variant-in-if.stderr
--- a/src/test/ui/range_inclusive_gate.rs
+++ b/src/test/ui/range_inclusive_gate.rs
@ -1,14 +0,0 @@
-// run-pass
-
-#![allow(unused_comparisons)]
-// Test that you only need the syntax gate if you don't mention the structs.
-// (Obsoleted since both features are stabilized)
-
-fn main() {
-    let mut count = 0;
-    for i in 0_usize..=10 {
-        assert!(i >= 0 && i <= 10);
-        count += i;
-    }
-    assert_eq!(count, 55);
-}
--- a/src/test/ui/regions/regions-fn-subtyping-return-static-fail.nll.stderr
+++ b/src/test/ui/regions/regions-fn-subtyping-return-static-fail.nll.stderr
--- a/src/test/ui/regions/regions-fn-subtyping-return-static-fail.rs
+++ b/src/test/ui/regions/regions-fn-subtyping-return-static-fail.rs
--- a/src/test/ui/regions/regions-fn-subtyping-return-static-fail.stderr
+++ b/src/test/ui/regions/regions-fn-subtyping-return-static-fail.stderr
--- a/src/test/ui/rmeta/emit-artifact-notifications.nll.stderr
+++ b/src/test/ui/rmeta/emit-artifact-notifications.nll.stderr
@ -0,0 +1 @@
+{"artifact":"$TEST_BUILD_DIR/rmeta/emit-artifact-notifications.nll/libemit_artifact_notifications.rmeta","emit":"metadata"}
--- a/src/test/ui/rmeta/emit-artifact-notifications.polonius.stderr
+++ b/src/test/ui/rmeta/emit-artifact-notifications.polonius.stderr
@ -0,0 +1 @@
+{"artifact":"$TEST_BUILD_DIR/rmeta/emit-artifact-notifications.polonius/libemit_artifact_notifications.rmeta","emit":"metadata"}
--- a/src/test/ui/rmeta/emit-artifact-notifications.rs
+++ b/src/test/ui/rmeta/emit-artifact-notifications.rs
--- a/src/test/ui/rmeta/emit-artifact-notifications.stderr
+++ b/src/test/ui/rmeta/emit-artifact-notifications.stderr
@ -0,0 +1 @@
+{"artifact":"$TEST_BUILD_DIR/rmeta/emit-artifact-notifications/libemit_artifact_notifications.rmeta","emit":"metadata"}
--- a/src/test/ui/rmeta/emit-metadata-obj.rs
+++ b/src/test/ui/rmeta/emit-metadata-obj.rs
--- a/src/test/ui/structs-enums/type-sizes.rs
+++ b/src/test/ui/structs-enums/type-sizes.rs
--- a/src/test/ui/tuple/one-tuple.rs
+++ b/src/test/ui/tuple/one-tuple.rs
--- a/src/test/ui/unboxed-closures/type-id-higher-rank.rs
+++ b/src/test/ui/unboxed-closures/type-id-higher-rank.rs
--- 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 = 1459;
-const ISSUES_ENTRY_LIMIT: usize = 2615;
+const ROOT_ENTRY_LIMIT: usize = 1418;
+const ISSUES_ENTRY_LIMIT: usize = 2582;

 fn check_entries(path: &Path, bad: &mut bool) {
    let dirs = walkdir::WalkDir::new(&path.join("test/ui"))
				`@ -1 +0,0 @@`
				`{"artifact":"$TEST_BUILD_DIR/emit-artifact-notifications.nll/libemit_artifact_notifications.rmeta","emit":"metadata"}`
				`@ -0,0 +1 @@`
				`{"artifact":"$TEST_BUILD_DIR/rmeta/emit-artifact-notifications.nll/libemit_artifact_notifications.rmeta","emit":"metadata"}`