Rollup merge of rust-lang#81941 - c410-f3r:tests-tests-tests, r=petro…

…chenkov Move some tests to more reasonable directories - 4 cc rust-lang#73494 r? `@petrochenkov` - [issues/issue-4201.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-4201.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/4201)</sup>: expr 1.000 - [old-suffixes-are-really-forbidden.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/old-suffixes-are-really-forbidden.rs) <sup>unknown</sup>: parser 1.031 - [typeclasses-eq-example-static.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/typeclasses-eq-example-static.rs) <sup>unknown</sup>: binding 1.033 - [issues/issue-33537.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-33537.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/33537)</sup>: consts 1.036 - [issues/issue-31924-non-snake-ffi.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-31924-non-snake-ffi.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/31924)</sup>: lint 1.046 - [issues/issue-44406.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-44406.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/44406)</sup>: parser 1.051 - [type-id-higher-rank.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/type-id-higher-rank.rs) <sup>unknown</sup>: unboxed-closures 1.074 - [issues/issue-20616-3.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-20616-3.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/20616)</sup>: parser 1.077 - [html-literals.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/html-literals.rs) <sup>unknown</sup>: macros 1.083 - [issues/issue-13837.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-13837.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/13837)</sup>: consts 1.089 - [issues/issue-21726.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-21726.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/21726)</sup>: associated-types 1.095 - [one-tuple.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/one-tuple.rs) <sup>unknown</sup>: binding 1.107 - [issues/issue-43784-associated-type.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-43784-associated-type.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/43784)</sup>: associated-types 1.108 - [project-defer-unification.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/project-defer-unification.rs) <sup>unknown</sup>: associated-types 1.109 - [struct-literal-variant-in-if.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/struct-literal-variant-in-if.rs) <sup>unknown</sup>: parser 1.110 - [rvalue-static-promotion.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/rvalue-static-promotion.rs) <sup>unknown</sup>: consts 1.114 - [nullable-pointer-ffi-compat.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/nullable-pointer-ffi-compat.rs) <sup>unknown</sup>: regions 1.129 - [range_inclusive_gate.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/range_inclusive_gate.rs) <sup>unknown</sup>: for-loop-while 1.174 - [simd-type-generic-monomorphisation.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/simd-type-generic-monomorphisation.rs) <sup>unknown</sup>: simd 1.175 - [issues/issue-77993-2.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-77993-2.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/77993)</sup>: async-await 1.183 - [issues/issue-23595-2.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-23595-2.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/23595)</sup>: associated-types 1.194 - [issues/issue-40847.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-40847.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/40847)</sup>: macros 1.194 - [issues/issue-6157.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-6157.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/6157)</sup>: regions 1.195 - [issues/issue-32829.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-32829.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/32829)</sup>: consts 1.241 - [type-sizes.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/type-sizes.rs) <sup>unknown</sup>: structs-enums 1.281 - [issues/issue-24204.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-24204.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/24204)</sup>: associated-types 1.305 - [issues/issue-22560.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-22560.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/22560)</sup>: associated-types 1.354 - [emit-artifact-notifications.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/emit-artifact-notifications.rs) <sup>unknown</sup>: rmeta 1.368 - [repeat_count_const_in_async_fn.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/repeat_count_const_in_async_fn.rs) <sup>unknown</sup>: async-await 1.370 - [expr-if-panic.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/expr-if-panic.rs) <sup>unknown</sup>: expr 1.371 - [cleanup-rvalue-during-if-and-while.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/cleanup-rvalue-during-if-and-while.rs) <sup>unknown</sup>: for-loop-while 1.378 - [write-to-static-mut-in-static.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/write-to-static-mut-in-static.rs) <sup>unknown</sup>: consts 1.381 - [issues/issue-17718-references.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-17718-references.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/17718)</sup>: consts 1.404 - [dotdotdot-expr.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/dotdotdot-expr.rs) <sup>unknown</sup>: parser 1.784 - [regions-fn-subtyping-return-static-fail.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/regions-fn-subtyping-return-static-fail.rs) <sup>unknown</sup>: regions 1.959
Dylan-DPC-zz · Feb 16, 2021 · 5734d13 · 5734d13
2 parents 359bd0e + c914952
commit 5734d13
Show file tree

Hide file tree

Showing 55 changed files with 5 additions and 19 deletions.
diff --git a/src/test/ui/issues/issue-21726.rs → src/test/ui/associated-types/issue-21726.rs b/src/test/ui/issues/issue-21726.rs → src/test/ui/associated-types/issue-21726.rs
diff --git a/src/test/ui/issues/issue-22560.rs → src/test/ui/associated-types/issue-22560.rs b/src/test/ui/issues/issue-22560.rs → src/test/ui/associated-types/issue-22560.rs
diff --git a/src/test/ui/issues/issue-22560.stderr → ...st/ui/associated-types/issue-22560.stderr b/src/test/ui/issues/issue-22560.stderr → ...st/ui/associated-types/issue-22560.stderr
diff --git a/src/test/ui/issues/issue-23595-2.rs → ...test/ui/associated-types/issue-23595-2.rs b/src/test/ui/issues/issue-23595-2.rs → ...test/ui/associated-types/issue-23595-2.rs
diff --git a/src/test/ui/issues/issue-23595-2.stderr → .../ui/associated-types/issue-23595-2.stderr b/src/test/ui/issues/issue-23595-2.stderr → .../ui/associated-types/issue-23595-2.stderr
diff --git a/src/test/ui/issues/issue-24204.rs → src/test/ui/associated-types/issue-24204.rs b/src/test/ui/issues/issue-24204.rs → src/test/ui/associated-types/issue-24204.rs
diff --git a/.../ui/issues/issue-43784-associated-type.rs → ...ated-types/issue-43784-associated-type.rs b/.../ui/issues/issue-43784-associated-type.rs → ...ated-types/issue-43784-associated-type.rs
diff --git a/...issues/issue-43784-associated-type.stderr → ...-types/issue-43784-associated-type.stderr b/...issues/issue-43784-associated-type.stderr → ...-types/issue-43784-associated-type.stderr
diff --git a/src/test/ui/project-defer-unification.rs → ...ciated-types/project-defer-unification.rs b/src/test/ui/project-defer-unification.rs → ...ciated-types/project-defer-unification.rs
diff --git a/src/test/ui/issues/issue-77993-2.rs → src/test/ui/async-await/issue-77993-2.rs b/src/test/ui/issues/issue-77993-2.rs → src/test/ui/async-await/issue-77993-2.rs
diff --git a/src/test/ui/issues/issue-77993-2.stderr → src/test/ui/async-await/issue-77993-2.stderr b/src/test/ui/issues/issue-77993-2.stderr → src/test/ui/async-await/issue-77993-2.stderr
diff --git a/...test/ui/repeat_count_const_in_async_fn.rs → ...c-await/repeat_count_const_in_async_fn.rs b/...test/ui/repeat_count_const_in_async_fn.rs → ...c-await/repeat_count_const_in_async_fn.rs
diff --git a/src/test/ui/issues/issue-13837.rs → src/test/ui/consts/issue-13837.rs b/src/test/ui/issues/issue-13837.rs → src/test/ui/consts/issue-13837.rs
diff --git a/src/test/ui/issues/issue-17718-references.rs → src/test/ui/consts/issue-17718-references.rs b/src/test/ui/issues/issue-17718-references.rs → src/test/ui/consts/issue-17718-references.rs
diff --git a/...t/ui/issues/issue-17718-references.stderr → ...t/ui/consts/issue-17718-references.stderr b/...t/ui/issues/issue-17718-references.stderr → ...t/ui/consts/issue-17718-references.stderr
diff --git a/src/test/ui/issues/issue-32829.rs → src/test/ui/consts/issue-32829.rs b/src/test/ui/issues/issue-32829.rs → src/test/ui/consts/issue-32829.rs
diff --git a/src/test/ui/issues/issue-32829.stderr → src/test/ui/consts/issue-32829.stderr b/src/test/ui/issues/issue-32829.stderr → src/test/ui/consts/issue-32829.stderr
diff --git a/src/test/ui/issues/issue-33537.rs → src/test/ui/consts/issue-33537.rs b/src/test/ui/issues/issue-33537.rs → src/test/ui/consts/issue-33537.rs
diff --git a/src/test/ui/rvalue-static-promotion.rs → ...test/ui/consts/rvalue-static-promotion.rs b/src/test/ui/rvalue-static-promotion.rs → ...test/ui/consts/rvalue-static-promotion.rs
diff --git a/src/test/ui/write-to-static-mut-in-static.rs → ...i/consts/write-to-static-mut-in-static.rs b/src/test/ui/write-to-static-mut-in-static.rs → ...i/consts/write-to-static-mut-in-static.rs
diff --git a/...t/ui/write-to-static-mut-in-static.stderr → ...nsts/write-to-static-mut-in-static.stderr b/...t/ui/write-to-static-mut-in-static.stderr → ...nsts/write-to-static-mut-in-static.stderr
diff --git a/src/test/ui/emit-artifact-notifications.nll.stderr b/src/test/ui/emit-artifact-notifications.nll.stderr
diff --git a/src/test/ui/emit-artifact-notifications.polonius.stderr b/src/test/ui/emit-artifact-notifications.polonius.stderr
diff --git a/src/test/ui/emit-artifact-notifications.stderr b/src/test/ui/emit-artifact-notifications.stderr
diff --git a/src/test/ui/expr-if-panic.rs → src/test/ui/expr/if/expr-if-panic-pass.rs b/src/test/ui/expr-if-panic.rs → src/test/ui/expr/if/expr-if-panic-pass.rs
diff --git a/src/test/ui/issues/issue-4201.rs → src/test/ui/expr/if/issue-4201.rs b/src/test/ui/issues/issue-4201.rs → src/test/ui/expr/if/issue-4201.rs
diff --git a/src/test/ui/issues/issue-4201.stderr → src/test/ui/expr/if/issue-4201.stderr b/src/test/ui/issues/issue-4201.stderr → src/test/ui/expr/if/issue-4201.stderr
diff --git a/.../ui/cleanup-rvalue-during-if-and-while.rs → ...ile/cleanup-rvalue-during-if-and-while.rs b/.../ui/cleanup-rvalue-during-if-and-while.rs → ...ile/cleanup-rvalue-during-if-and-while.rs
diff --git a/src/test/ui/issues/issue-40847.rs → src/test/ui/hygiene/issue-40847.rs b/src/test/ui/issues/issue-40847.rs → src/test/ui/hygiene/issue-40847.rs
diff --git a/src/test/ui/issues/issue-6157.rs → src/test/ui/issue-6157.rs b/src/test/ui/issues/issue-6157.rs → src/test/ui/issue-6157.rs
diff --git a/...st/ui/issues/issue-31924-non-snake-ffi.rs → ...test/ui/lint/issue-31924-non-snake-ffi.rs b/...st/ui/issues/issue-31924-non-snake-ffi.rs → ...test/ui/lint/issue-31924-non-snake-ffi.rs
diff --git a/src/test/ui/html-literals.rs → src/test/ui/macros/html-literals.rs b/src/test/ui/html-literals.rs → src/test/ui/macros/html-literals.rs
diff --git a/src/test/ui/dotdotdot-expr.rs → src/test/ui/parser/dotdotdot-expr.rs b/src/test/ui/dotdotdot-expr.rs → src/test/ui/parser/dotdotdot-expr.rs
diff --git a/src/test/ui/dotdotdot-expr.stderr → src/test/ui/parser/dotdotdot-expr.stderr b/src/test/ui/dotdotdot-expr.stderr → src/test/ui/parser/dotdotdot-expr.stderr
diff --git a/src/test/ui/issues/issue-20616-3.rs → src/test/ui/parser/issue-20616-3.rs b/src/test/ui/issues/issue-20616-3.rs → src/test/ui/parser/issue-20616-3.rs
diff --git a/src/test/ui/issues/issue-20616-3.stderr → src/test/ui/parser/issue-20616-3.stderr b/src/test/ui/issues/issue-20616-3.stderr → src/test/ui/parser/issue-20616-3.stderr
diff --git a/src/test/ui/issues/issue-44406.rs → src/test/ui/parser/issue-44406.rs b/src/test/ui/issues/issue-44406.rs → src/test/ui/parser/issue-44406.rs
diff --git a/src/test/ui/issues/issue-44406.stderr → src/test/ui/parser/issue-44406.stderr b/src/test/ui/issues/issue-44406.stderr → src/test/ui/parser/issue-44406.stderr
diff --git a/...t/ui/old-suffixes-are-really-forbidden.rs → ...rser/old-suffixes-are-really-forbidden.rs b/...t/ui/old-suffixes-are-really-forbidden.rs → ...rser/old-suffixes-are-really-forbidden.rs
diff --git a/.../old-suffixes-are-really-forbidden.stderr → .../old-suffixes-are-really-forbidden.stderr b/.../old-suffixes-are-really-forbidden.stderr → .../old-suffixes-are-really-forbidden.stderr
diff --git a/src/test/ui/struct-literal-variant-in-if.rs → ...ui/parser/struct-literal-variant-in-if.rs b/src/test/ui/struct-literal-variant-in-if.rs → ...ui/parser/struct-literal-variant-in-if.rs
diff --git a/...st/ui/struct-literal-variant-in-if.stderr → ...arser/struct-literal-variant-in-if.stderr b/...st/ui/struct-literal-variant-in-if.stderr → ...arser/struct-literal-variant-in-if.stderr
diff --git a/src/test/ui/range_inclusive_gate.rs b/src/test/ui/range_inclusive_gate.rs
diff --git a/...n-subtyping-return-static-fail.nll.stderr → ...n-subtyping-return-static-fail.nll.stderr b/...n-subtyping-return-static-fail.nll.stderr → ...n-subtyping-return-static-fail.nll.stderr
diff --git a/...egions-fn-subtyping-return-static-fail.rs → ...egions-fn-subtyping-return-static-fail.rs b/...egions-fn-subtyping-return-static-fail.rs → ...egions-fn-subtyping-return-static-fail.rs
diff --git a/...ns-fn-subtyping-return-static-fail.stderr → ...ns-fn-subtyping-return-static-fail.stderr b/...ns-fn-subtyping-return-static-fail.stderr → ...ns-fn-subtyping-return-static-fail.stderr
diff --git 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"}
diff --git 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"}
diff --git a/src/test/ui/emit-artifact-notifications.rs → ...t/ui/rmeta/emit-artifact-notifications.rs b/src/test/ui/emit-artifact-notifications.rs → ...t/ui/rmeta/emit-artifact-notifications.rs
diff --git 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"}
diff --git a/src/test/ui/emit-metadata-obj.rs → src/test/ui/rmeta/emit-metadata-obj.rs b/src/test/ui/emit-metadata-obj.rs → src/test/ui/rmeta/emit-metadata-obj.rs
diff --git a/src/test/ui/type-sizes.rs → src/test/ui/structs-enums/type-sizes.rs b/src/test/ui/type-sizes.rs → src/test/ui/structs-enums/type-sizes.rs
diff --git a/src/test/ui/one-tuple.rs → src/test/ui/tuple/one-tuple.rs b/src/test/ui/one-tuple.rs → src/test/ui/tuple/one-tuple.rs
diff --git a/src/test/ui/type-id-higher-rank.rs → ...i/unboxed-closures/type-id-higher-rank.rs b/src/test/ui/type-id-higher-rank.rs → ...i/unboxed-closures/type-id-higher-rank.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 = 1459;
-const ISSUES_ENTRY_LIMIT: usize = 2615;
+const ROOT_ENTRY_LIMIT: usize = 1418;
+const ISSUES_ENTRY_LIMIT: usize = 2576;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))