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

…chenkov Move some tests to more reasonable directories - 5 cc rust-lang#73494 Threshold is 0.95. Next time I promise I will take a look into the special/misclassified directories. - [issues/issue-23208.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-23208.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/23208)</sup>: associated-types 0.951 - [weird-exprs.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/weird-exprs.rs) <sup>unknown</sup>: destructuring-assignment 0.958 - [issues/issue-1701.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-1701.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/1701)</sup>: structs-enums 0.974 - [issues/issue-48508-aux.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-48508-aux.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/48508)</sup>: numbers-arithmetic 0.991 - [fn_must_use.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/fn_must_use.rs) <sup>unknown</sup>: lint 1.000 - [mir_check_nonconst.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/mir_check_nonconst.rs) <sup>unknown</sup>: consts 1.002 - [issues/issue-52060.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-52060.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/52060)</sup>: consts 1.017 - [issues/issue-45729-unsafe-in-generator.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-45729-unsafe-in-generator.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/45729)</sup>: generator 1.024 - [issues/issue-10392.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-10392.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/10392)</sup>: pattern 1.039 - [no-implicit-prelude.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/no-implicit-prelude.rs) <sup>unknown</sup>: resolve 1.071 - [issues/issue-68000-unicode-ident-after-missing-comma.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-68000-unicode-ident-after-missing-comma.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/68000)</sup>: parser 1.079 - [shadow.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/shadow.rs) <sup>unknown</sup>: binding 1.099 - [issues/issue-65611.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-65611.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/65611)</sup>: consts 1.139 - [concat-rpass.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/concat-rpass.rs) <sup>unknown</sup>: macros 1.194 - [issues/issue-31597.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-31597.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/31597)</sup>: associated-types 1.195 - [issues/issue-78372.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-78372.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/78372)</sup>: resolve 1.426 - [impl-trait-in-bindings-issue-73003.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/impl-trait-in-bindings-issue-73003.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/73003)</sup>: impl-trait 1.471 - [impl-trait-in-bindings.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/impl-trait-in-bindings.rs) <sup>unknown</sup>: impl-trait 2.500 r? `@petrochenkov`
Dylan-DPC-zz · Mar 21, 2021 · d778a80 · d778a80
2 parents 0fa6831 + 3490170
commit d778a80
Show file tree

Hide file tree

Showing 29 changed files with 2 additions and 2 deletions.
diff --git a/src/test/ui/issues/issue-23208.rs → src/test/ui/associated-types/issue-23208.rs b/src/test/ui/issues/issue-23208.rs → src/test/ui/associated-types/issue-23208.rs
diff --git a/src/test/ui/issues/issue-31597.rs → src/test/ui/associated-types/issue-31597.rs b/src/test/ui/issues/issue-31597.rs → src/test/ui/associated-types/issue-31597.rs
diff --git a/src/test/ui/shadow.rs → src/test/ui/binding/shadow.rs b/src/test/ui/shadow.rs → src/test/ui/binding/shadow.rs
diff --git a/src/test/ui/issues/issue-52060.rs → src/test/ui/consts/issue-52060.rs b/src/test/ui/issues/issue-52060.rs → src/test/ui/consts/issue-52060.rs
diff --git a/src/test/ui/issues/issue-52060.stderr → src/test/ui/consts/issue-52060.stderr b/src/test/ui/issues/issue-52060.stderr → src/test/ui/consts/issue-52060.stderr
diff --git a/src/test/ui/mir_check_nonconst.rs → src/test/ui/consts/mir_check_nonconst.rs b/src/test/ui/mir_check_nonconst.rs → src/test/ui/consts/mir_check_nonconst.rs
diff --git a/src/test/ui/mir_check_nonconst.stderr → src/test/ui/consts/mir_check_nonconst.stderr b/src/test/ui/mir_check_nonconst.stderr → src/test/ui/consts/mir_check_nonconst.stderr
diff --git a/...issues/issue-45729-unsafe-in-generator.rs → ...erator/issue-45729-unsafe-in-generator.rs b/...issues/issue-45729-unsafe-in-generator.rs → ...erator/issue-45729-unsafe-in-generator.rs
diff --git a/...es/issue-45729-unsafe-in-generator.stderr → ...or/issue-45729-unsafe-in-generator.stderr b/...es/issue-45729-unsafe-in-generator.stderr → ...or/issue-45729-unsafe-in-generator.stderr
diff --git a/.../ui/impl-trait-in-bindings-issue-73003.rs → ...ait/impl-trait-in-bindings-issue-73003.rs b/.../ui/impl-trait-in-bindings-issue-73003.rs → ...ait/impl-trait-in-bindings-issue-73003.rs
diff --git a/...impl-trait-in-bindings-issue-73003.stderr → ...impl-trait-in-bindings-issue-73003.stderr b/...impl-trait-in-bindings-issue-73003.stderr → ...impl-trait-in-bindings-issue-73003.stderr
diff --git a/src/test/ui/impl-trait-in-bindings.rs → ...t/ui/impl-trait/impl-trait-in-bindings.rs b/src/test/ui/impl-trait-in-bindings.rs → ...t/ui/impl-trait/impl-trait-in-bindings.rs
diff --git a/src/test/ui/impl-trait-in-bindings.stderr → .../impl-trait/impl-trait-in-bindings.stderr b/src/test/ui/impl-trait-in-bindings.stderr → .../impl-trait/impl-trait-in-bindings.stderr
diff --git a/src/test/ui/fn_must_use.rs → src/test/ui/lint/fn_must_use.rs b/src/test/ui/fn_must_use.rs → src/test/ui/lint/fn_must_use.rs
diff --git a/src/test/ui/fn_must_use.stderr → src/test/ui/lint/fn_must_use.stderr b/src/test/ui/fn_must_use.stderr → src/test/ui/lint/fn_must_use.stderr
diff --git a/src/test/ui/concat-rpass.rs → src/test/ui/macros/concat-rpass.rs b/src/test/ui/concat-rpass.rs → src/test/ui/macros/concat-rpass.rs
diff --git a/src/test/ui/issues/issue-48508-aux.rs → src/test/ui/parser/issue-48508-aux.rs b/src/test/ui/issues/issue-48508-aux.rs → src/test/ui/parser/issue-48508-aux.rs
diff --git a/src/test/ui/issues/issue-48508.rs → src/test/ui/parser/issue-48508.rs b/src/test/ui/issues/issue-48508.rs → src/test/ui/parser/issue-48508.rs
diff --git a/...8000-unicode-ident-after-missing-comma.rs → ...8000-unicode-ident-after-missing-comma.rs b/...8000-unicode-ident-after-missing-comma.rs → ...8000-unicode-ident-after-missing-comma.rs
diff --git a/...-unicode-ident-after-missing-comma.stderr → ...-unicode-ident-after-missing-comma.stderr b/...-unicode-ident-after-missing-comma.stderr → ...-unicode-ident-after-missing-comma.stderr
diff --git a/src/test/ui/issues/issue-10392.rs → src/test/ui/pattern/issue-10392.rs b/src/test/ui/issues/issue-10392.rs → src/test/ui/pattern/issue-10392.rs
diff --git a/src/test/ui/no-implicit-prelude.rs → src/test/ui/resolve/no-implicit-prelude.rs b/src/test/ui/no-implicit-prelude.rs → src/test/ui/resolve/no-implicit-prelude.rs
diff --git a/src/test/ui/no-implicit-prelude.stderr → ...est/ui/resolve/no-implicit-prelude.stderr b/src/test/ui/no-implicit-prelude.stderr → ...est/ui/resolve/no-implicit-prelude.stderr
diff --git a/src/test/ui/issues/issue-1701.rs → src/test/ui/structs-enums/issue-1701.rs b/src/test/ui/issues/issue-1701.rs → src/test/ui/structs-enums/issue-1701.rs
diff --git a/src/test/ui/issues/issue-78372.rs → src/test/ui/traits/issue-78372.rs b/src/test/ui/issues/issue-78372.rs → src/test/ui/traits/issue-78372.rs
diff --git a/src/test/ui/issues/issue-78372.stderr → src/test/ui/traits/issue-78372.stderr b/src/test/ui/issues/issue-78372.stderr → src/test/ui/traits/issue-78372.stderr
diff --git a/src/test/ui/issues/issue-65611.rs → src/test/ui/typeck/issue-65611.rs b/src/test/ui/issues/issue-65611.rs → src/test/ui/typeck/issue-65611.rs
diff --git a/src/test/ui/issues/issue-65611.stderr → src/test/ui/typeck/issue-65611.stderr b/src/test/ui/issues/issue-65611.stderr → src/test/ui/typeck/issue-65611.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 = 1408;
-const ISSUES_ENTRY_LIMIT: usize = 2565;
+const ROOT_ENTRY_LIMIT: usize = 1390;
+const ISSUES_ENTRY_LIMIT: usize = 2551;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))