Rollup merge of rust-lang#82793 - JohnTitor:move-ui-tests, r=petroche…

…nkov Move some tests to more suitable subdirs ## The results from classifui (The full results can be found here: https://gist.github.com/JohnTitor/c9e00840990b5e4a8fc562ec3571e427) - [lint-expr-stmt-attrs-for-early-lints.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/lint-expr-stmt-attrs-for-early-lints.rs) <sup>unknown</sup>: lint (1.566), feature-gates (-0.632), numbers-arithmetic (-0.955) - [try-block.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/try-block.rs) <sup>unknown</sup>: binding (1.385), try-block (-0.097), lint (-0.932) - [backtrace-debuginfo.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/backtrace-debuginfo.rs) <sup>unknown</sup>: macros (1.365), cfg (-0.279), drop (-0.291) - [issues/issue-3521.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-3521.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/3521)</sup>: consts (1.298), enum (-0.872), in-band-lifetimes (-0.978) - [impl-bounds-checking.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/impl-bounds-checking.rs) <sup>unknown</sup>: traits (1.243), for (-0.999), shadowed (-0.999) - [issues/issue-17718.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-17718.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/17718)</sup>: binding (1.236), consts (0.315), extern (-0.779) - [issue-6157.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issue-6157.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/6157)</sup>: regions (1.213), unboxed-closures (-0.285), traits (-0.510) - [issues/issue-44373.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-44373.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/44373)</sup>: consts (1.187), nll (0.427), borrowck (-0.704) - [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.184), consts (0.650), traits (-0.571) - [issues/issue-52992.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-52992.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/52992)</sup>: nll (1.132), associated-types (-0.628), parser (-0.893) - [issues/issue-2330.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-2330.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/2330)</sup>: traits (1.116), directory_ownership (-0.691), compare-method (-0.981) - [issue-74047.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issue-74047.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/74047)</sup>: async-await (1.109), impl-trait (-0.629), resolve (-0.781) - [issues/issue-33140.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-33140.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/33140)</sup>: traits (1.063), coherence (-0.832), codemap_tests (-0.944) - [issues/issue-28576.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-28576.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/28576)</sup>: traits (1.062), associated-types (-0.333), impl-trait (-0.697) - [issues/issue-7222.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-7222.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/7222)</sup>: binding (1.062), consts (-0.226), numbers-arithmetic (-0.294) - [tup.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/tup.rs) <sup>unknown</sup>: structs-enums (1.061), threads-sendsync (-0.550), moves (-0.790) - [issues/issue-15261.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-15261.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/15261)</sup>: consts (1.052), where-clauses (-0.833), macros (-0.862) - [issues/issue-76179.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-76179.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/76179)</sup>: associated-types (1.048), process (-0.887), rfc-2457 (-0.984) - [issues/issue-42344.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-42344.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/42344)</sup>: borrowck (1.043), macros (-0.481), specialization (-0.966) - [issues/issue-18661.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-18661.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/18661)</sup>: unboxed-closures (1.038), mir (-0.648), higher-rank-trait-bounds (-0.688) - [issues/issue-2633.rs](https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-2633.rs) <sup>[issue](https://github.com/rust-lang/rust/issues/2633)</sup>: structs-enums (1.020), functions-closures (-0.722), lint (-0.967) Some notes: - If there are related tests (e.g. it's for the same issue), they are moved along with it. - Moved try-block.rs to the `try-block` dir. - Moved tup.rs to the `tuple` dir. - Moved some tests that classified as consts to the `statics` dir, as it seems they have statics actually. - Skipped backtrace-debuginfo.rs because I think classifui overrates their helper macros. cc rust-lang#73494 r? `@petrochenkov`
JohnTitor · Mar 6, 2021 · 069f2f4 · 069f2f4
2 parents 866d5e4 + eb9abea
commit 069f2f4
Show file tree

Hide file tree

Showing 35 changed files with 1 addition and 46 deletions.
diff --git a/src/test/ui/nullable-pointer-ffi-compat.rs → ...est/ui/abi/nullable-pointer-ffi-compat.rs b/src/test/ui/nullable-pointer-ffi-compat.rs → ...est/ui/abi/nullable-pointer-ffi-compat.rs
diff --git a/src/test/ui/issues/issue-76179.rs → src/test/ui/associated-types/issue-76179.rs b/src/test/ui/issues/issue-76179.rs → src/test/ui/associated-types/issue-76179.rs
diff --git a/src/test/ui/issue-74047.rs → src/test/ui/async-await/issue-74047.rs b/src/test/ui/issue-74047.rs → src/test/ui/async-await/issue-74047.rs
diff --git a/src/test/ui/issue-74047.stderr → src/test/ui/async-await/issue-74047.stderr b/src/test/ui/issue-74047.stderr → src/test/ui/async-await/issue-74047.stderr
diff --git a/src/test/ui/issues/issue-42344.rs → src/test/ui/borrowck/issue-42344.rs b/src/test/ui/issues/issue-42344.rs → src/test/ui/borrowck/issue-42344.rs
diff --git a/src/test/ui/issues/issue-42344.stderr → src/test/ui/borrowck/issue-42344.stderr b/src/test/ui/issues/issue-42344.stderr → src/test/ui/borrowck/issue-42344.stderr
diff --git a/...st/ui/issues/auxiliary/issue-17718-aux.rs → ...st/ui/consts/auxiliary/issue-17718-aux.rs b/...st/ui/issues/auxiliary/issue-17718-aux.rs → ...st/ui/consts/auxiliary/issue-17718-aux.rs
diff --git a/src/test/ui/issues/issue-17718.rs → src/test/ui/consts/issue-17718.rs b/src/test/ui/issues/issue-17718.rs → src/test/ui/consts/issue-17718.rs
diff --git a/src/test/ui/issues/issue-3521.fixed → src/test/ui/consts/issue-3521.fixed b/src/test/ui/issues/issue-3521.fixed → src/test/ui/consts/issue-3521.fixed
diff --git a/src/test/ui/issues/issue-3521.rs → src/test/ui/consts/issue-3521.rs b/src/test/ui/issues/issue-3521.rs → src/test/ui/consts/issue-3521.rs
diff --git a/src/test/ui/issues/issue-3521.stderr → src/test/ui/consts/issue-3521.stderr b/src/test/ui/issues/issue-3521.stderr → src/test/ui/consts/issue-3521.stderr
diff --git a/src/test/ui/issues/issue-2633-2.rs b/src/test/ui/issues/issue-2633-2.rs
diff --git a/src/test/ui/issues/issue-2633.rs b/src/test/ui/issues/issue-2633.rs
diff --git a/...i/lint-expr-stmt-attrs-for-early-lints.rs → ...t/lint-expr-stmt-attrs-for-early-lints.rs b/...i/lint-expr-stmt-attrs-for-early-lints.rs → ...t/lint-expr-stmt-attrs-for-early-lints.rs
diff --git a/src/test/ui/issues/issue-52992.rs → src/test/ui/nll/issue-52992.rs b/src/test/ui/issues/issue-52992.rs → src/test/ui/nll/issue-52992.rs
diff --git a/src/test/ui/issues/issue-7222.rs → src/test/ui/parser/issue-7222.rs b/src/test/ui/issues/issue-7222.rs → src/test/ui/parser/issue-7222.rs
diff --git a/src/test/ui/issue-6157.rs → src/test/ui/regions/issue-6157.rs b/src/test/ui/issue-6157.rs → src/test/ui/regions/issue-6157.rs
diff --git a/src/test/ui/issues/issue-2330.rs → src/test/ui/resolve/issue-2330.rs b/src/test/ui/issues/issue-2330.rs → src/test/ui/resolve/issue-2330.rs
diff --git a/src/test/ui/issues/issue-2330.stderr → src/test/ui/resolve/issue-2330.stderr b/src/test/ui/issues/issue-2330.stderr → src/test/ui/resolve/issue-2330.stderr
diff --git a/src/test/ui/issues/issue-15261.rs → src/test/ui/statics/issue-15261.rs b/src/test/ui/issues/issue-15261.rs → src/test/ui/statics/issue-15261.rs
diff --git a/src/test/ui/issues/issue-44373-2.rs → src/test/ui/statics/issue-44373-2.rs b/src/test/ui/issues/issue-44373-2.rs → src/test/ui/statics/issue-44373-2.rs
diff --git a/src/test/ui/issues/issue-44373.rs → src/test/ui/statics/issue-44373.rs b/src/test/ui/issues/issue-44373.rs → src/test/ui/statics/issue-44373.rs
diff --git a/src/test/ui/issues/issue-44373.stderr → src/test/ui/statics/issue-44373.stderr b/src/test/ui/issues/issue-44373.stderr → src/test/ui/statics/issue-44373.stderr
diff --git a/src/test/ui/impl-bounds-checking.rs → src/test/ui/traits/impl-bounds-checking.rs b/src/test/ui/impl-bounds-checking.rs → src/test/ui/traits/impl-bounds-checking.rs
diff --git a/src/test/ui/impl-bounds-checking.stderr → ...est/ui/traits/impl-bounds-checking.stderr b/src/test/ui/impl-bounds-checking.stderr → ...est/ui/traits/impl-bounds-checking.stderr
diff --git a/src/test/ui/issues/issue-28576.rs → src/test/ui/traits/issue-28576.rs b/src/test/ui/issues/issue-28576.rs → src/test/ui/traits/issue-28576.rs
diff --git a/src/test/ui/issues/issue-28576.stderr → src/test/ui/traits/issue-28576.stderr b/src/test/ui/issues/issue-28576.stderr → src/test/ui/traits/issue-28576.stderr
diff --git a/src/test/ui/issues/issue-33140.rs → src/test/ui/traits/issue-33140.rs b/src/test/ui/issues/issue-33140.rs → src/test/ui/traits/issue-33140.rs
diff --git a/src/test/ui/issues/issue-33140.stderr → src/test/ui/traits/issue-33140.stderr b/src/test/ui/issues/issue-33140.stderr → src/test/ui/traits/issue-33140.stderr
diff --git a/...i/issues/issue-33140-traitobject-crate.rs → ...s/object/issue-33140-traitobject-crate.rs b/...i/issues/issue-33140-traitobject-crate.rs → ...s/object/issue-33140-traitobject-crate.rs
diff --git a/...sues/issue-33140-traitobject-crate.stderr → ...ject/issue-33140-traitobject-crate.stderr b/...sues/issue-33140-traitobject-crate.stderr → ...ject/issue-33140-traitobject-crate.stderr
diff --git a/src/test/ui/try-block.rs → src/test/ui/try-block/try-block.rs b/src/test/ui/try-block.rs → src/test/ui/try-block/try-block.rs
diff --git a/src/test/ui/tup.rs → src/test/ui/tuple/tup.rs b/src/test/ui/tup.rs → src/test/ui/tuple/tup.rs
diff --git a/src/test/ui/issues/issue-18661.rs → src/test/ui/unboxed-closures/issue-18661.rs b/src/test/ui/issues/issue-18661.rs → src/test/ui/unboxed-closures/issue-18661.rs
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
@@ -8,7 +8,7 @@ use std::path::Path;
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
 const ROOT_ENTRY_LIMIT: usize = 1418;
-const ISSUES_ENTRY_LIMIT: usize = 2582;
+const ISSUES_ENTRY_LIMIT: usize = 2565;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))