diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2021-03-07 10:41:17 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-07 10:41:17 +0900 |
| commit | a0dcfdfb7640b0e807e48d8234d41e5a3a0a7e84 (patch) | |
| tree | ee29d069e20ff35a2f50e3c1bad5a1a177ea1f82 | |
| parent | 05a2366e82165a20dd352a62873fab84cd8d97cd (diff) | |
| parent | eb9abea295474d74997cc035d99f33a5249a0400 (diff) | |
| download | rust-a0dcfdfb7640b0e807e48d8234d41e5a3a0a7e84.tar.gz rust-a0dcfdfb7640b0e807e48d8234d41e5a3a0a7e84.zip | |
Rollup merge of #82793 - JohnTitor:move-ui-tests, r=petrochenkov
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 #73494 r? ```@petrochenkov```
| -rw-r--r-- | src/test/ui/abi/nullable-pointer-ffi-compat.rs (renamed from src/test/ui/nullable-pointer-ffi-compat.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/associated-types/issue-76179.rs (renamed from src/test/ui/issues/issue-76179.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/async-await/issue-74047.rs (renamed from src/test/ui/issue-74047.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/async-await/issue-74047.stderr (renamed from src/test/ui/issue-74047.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/borrowck/issue-42344.rs (renamed from src/test/ui/issues/issue-42344.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/borrowck/issue-42344.stderr (renamed from src/test/ui/issues/issue-42344.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/consts/auxiliary/issue-17718-aux.rs (renamed from src/test/ui/issues/auxiliary/issue-17718-aux.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/consts/issue-17718.rs (renamed from src/test/ui/issues/issue-17718.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/consts/issue-3521.fixed (renamed from src/test/ui/issues/issue-3521.fixed) | 0 | ||||
| -rw-r--r-- | src/test/ui/consts/issue-3521.rs (renamed from src/test/ui/issues/issue-3521.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/consts/issue-3521.stderr (renamed from src/test/ui/issues/issue-3521.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/issues/issue-2633-2.rs | 14 | ||||
| -rw-r--r-- | src/test/ui/issues/issue-2633.rs | 31 | ||||
| -rw-r--r-- | src/test/ui/lint/lint-expr-stmt-attrs-for-early-lints.rs (renamed from src/test/ui/lint-expr-stmt-attrs-for-early-lints.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/nll/issue-52992.rs (renamed from src/test/ui/issues/issue-52992.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/parser/issue-7222.rs (renamed from src/test/ui/issues/issue-7222.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/regions/issue-6157.rs (renamed from src/test/ui/issue-6157.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/resolve/issue-2330.rs (renamed from src/test/ui/issues/issue-2330.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/resolve/issue-2330.stderr (renamed from src/test/ui/issues/issue-2330.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/statics/issue-15261.rs (renamed from src/test/ui/issues/issue-15261.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/statics/issue-44373-2.rs (renamed from src/test/ui/issues/issue-44373-2.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/statics/issue-44373.rs (renamed from src/test/ui/issues/issue-44373.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/statics/issue-44373.stderr (renamed from src/test/ui/issues/issue-44373.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/traits/impl-bounds-checking.rs (renamed from src/test/ui/impl-bounds-checking.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/traits/impl-bounds-checking.stderr (renamed from src/test/ui/impl-bounds-checking.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/traits/issue-28576.rs (renamed from src/test/ui/issues/issue-28576.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/traits/issue-28576.stderr (renamed from src/test/ui/issues/issue-28576.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/traits/issue-33140.rs (renamed from src/test/ui/issues/issue-33140.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/traits/issue-33140.stderr (renamed from src/test/ui/issues/issue-33140.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/traits/object/issue-33140-traitobject-crate.rs (renamed from src/test/ui/issues/issue-33140-traitobject-crate.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/traits/object/issue-33140-traitobject-crate.stderr (renamed from src/test/ui/issues/issue-33140-traitobject-crate.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/try-block/try-block.rs (renamed from src/test/ui/try-block.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/tuple/tup.rs (renamed from src/test/ui/tup.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/unboxed-closures/issue-18661.rs (renamed from src/test/ui/issues/issue-18661.rs) | 0 | ||||
| -rw-r--r-- | src/tools/tidy/src/ui_tests.rs | 2 |
35 files changed, 1 insertions, 46 deletions
diff --git a/src/test/ui/nullable-pointer-ffi-compat.rs b/src/test/ui/abi/nullable-pointer-ffi-compat.rs index 0647a18c3c4..0647a18c3c4 100644 --- a/src/test/ui/nullable-pointer-ffi-compat.rs +++ b/src/test/ui/abi/nullable-pointer-ffi-compat.rs diff --git a/src/test/ui/issues/issue-76179.rs b/src/test/ui/associated-types/issue-76179.rs index 0e086968b90..0e086968b90 100644 --- a/src/test/ui/issues/issue-76179.rs +++ b/src/test/ui/associated-types/issue-76179.rs diff --git a/src/test/ui/issue-74047.rs b/src/test/ui/async-await/issue-74047.rs index 2e4f3e675c3..2e4f3e675c3 100644 --- a/src/test/ui/issue-74047.rs +++ b/src/test/ui/async-await/issue-74047.rs diff --git a/src/test/ui/issue-74047.stderr b/src/test/ui/async-await/issue-74047.stderr index 28174825d8b..28174825d8b 100644 --- a/src/test/ui/issue-74047.stderr +++ b/src/test/ui/async-await/issue-74047.stderr diff --git a/src/test/ui/issues/issue-42344.rs b/src/test/ui/borrowck/issue-42344.rs index a7636edf2f8..a7636edf2f8 100644 --- a/src/test/ui/issues/issue-42344.rs +++ b/src/test/ui/borrowck/issue-42344.rs diff --git a/src/test/ui/issues/issue-42344.stderr b/src/test/ui/borrowck/issue-42344.stderr index 5cffa1b5121..5cffa1b5121 100644 --- a/src/test/ui/issues/issue-42344.stderr +++ b/src/test/ui/borrowck/issue-42344.stderr diff --git a/src/test/ui/issues/auxiliary/issue-17718-aux.rs b/src/test/ui/consts/auxiliary/issue-17718-aux.rs index 91abdbff868..91abdbff868 100644 --- a/src/test/ui/issues/auxiliary/issue-17718-aux.rs +++ b/src/test/ui/consts/auxiliary/issue-17718-aux.rs diff --git a/src/test/ui/issues/issue-17718.rs b/src/test/ui/consts/issue-17718.rs index c6341d80844..c6341d80844 100644 --- a/src/test/ui/issues/issue-17718.rs +++ b/src/test/ui/consts/issue-17718.rs diff --git a/src/test/ui/issues/issue-3521.fixed b/src/test/ui/consts/issue-3521.fixed index f76106dfff1..f76106dfff1 100644 --- a/src/test/ui/issues/issue-3521.fixed +++ b/src/test/ui/consts/issue-3521.fixed diff --git a/src/test/ui/issues/issue-3521.rs b/src/test/ui/consts/issue-3521.rs index c425a22df91..c425a22df91 100644 --- a/src/test/ui/issues/issue-3521.rs +++ b/src/test/ui/consts/issue-3521.rs diff --git a/src/test/ui/issues/issue-3521.stderr b/src/test/ui/consts/issue-3521.stderr index aa42772f12d..aa42772f12d 100644 --- a/src/test/ui/issues/issue-3521.stderr +++ b/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 deleted file mode 100644 index 02c1a166301..00000000000 --- a/src/test/ui/issues/issue-2633-2.rs +++ /dev/null @@ -1,14 +0,0 @@ -// run-pass -// pretty-expanded FIXME #23616 - -#![feature(box_syntax)] - - -fn a_val(x: Box<isize>, y: Box<isize>) -> isize { - *x + *y -} - -pub fn main() { - let z: Box<_> = box 22; - a_val(z.clone(), z.clone()); -} diff --git a/src/test/ui/issues/issue-2633.rs b/src/test/ui/issues/issue-2633.rs deleted file mode 100644 index 7e8cea75fc8..00000000000 --- a/src/test/ui/issues/issue-2633.rs +++ /dev/null @@ -1,31 +0,0 @@ -// run-pass -#![allow(dead_code)] -#![allow(non_camel_case_types)] - -#[derive(Copy, Clone)] -struct cat { - meow: extern "Rust" fn(), -} - -fn meow() { - println!("meow") -} - -fn cat() -> cat { - cat { - meow: meow, - } -} - -#[derive(Copy, Clone)] -struct KittyInfo {kitty: cat} - -// Code compiles and runs successfully if we add a + before the first arg -fn nyan(kitty: cat, _kitty_info: KittyInfo) { - (kitty.meow)(); -} - -pub fn main() { - let kitty = cat(); - nyan(kitty, KittyInfo {kitty: kitty}); -} diff --git a/src/test/ui/lint-expr-stmt-attrs-for-early-lints.rs b/src/test/ui/lint/lint-expr-stmt-attrs-for-early-lints.rs index 07a32904a5e..07a32904a5e 100644 --- a/src/test/ui/lint-expr-stmt-attrs-for-early-lints.rs +++ b/src/test/ui/lint/lint-expr-stmt-attrs-for-early-lints.rs diff --git a/src/test/ui/issues/issue-52992.rs b/src/test/ui/nll/issue-52992.rs index 530d1a61b31..530d1a61b31 100644 --- a/src/test/ui/issues/issue-52992.rs +++ b/src/test/ui/nll/issue-52992.rs diff --git a/src/test/ui/issues/issue-7222.rs b/src/test/ui/parser/issue-7222.rs index 64907316626..64907316626 100644 --- a/src/test/ui/issues/issue-7222.rs +++ b/src/test/ui/parser/issue-7222.rs diff --git a/src/test/ui/issue-6157.rs b/src/test/ui/regions/issue-6157.rs index b7a44ed8623..b7a44ed8623 100644 --- a/src/test/ui/issue-6157.rs +++ b/src/test/ui/regions/issue-6157.rs diff --git a/src/test/ui/issues/issue-2330.rs b/src/test/ui/resolve/issue-2330.rs index 4560caba0cf..4560caba0cf 100644 --- a/src/test/ui/issues/issue-2330.rs +++ b/src/test/ui/resolve/issue-2330.rs diff --git a/src/test/ui/issues/issue-2330.stderr b/src/test/ui/resolve/issue-2330.stderr index 877cf68b586..877cf68b586 100644 --- a/src/test/ui/issues/issue-2330.stderr +++ b/src/test/ui/resolve/issue-2330.stderr diff --git a/src/test/ui/issues/issue-15261.rs b/src/test/ui/statics/issue-15261.rs index ec413f6d1d2..ec413f6d1d2 100644 --- a/src/test/ui/issues/issue-15261.rs +++ b/src/test/ui/statics/issue-15261.rs diff --git a/src/test/ui/issues/issue-44373-2.rs b/src/test/ui/statics/issue-44373-2.rs index 194ce1dca77..194ce1dca77 100644 --- a/src/test/ui/issues/issue-44373-2.rs +++ b/src/test/ui/statics/issue-44373-2.rs diff --git a/src/test/ui/issues/issue-44373.rs b/src/test/ui/statics/issue-44373.rs index 0d011d096bd..0d011d096bd 100644 --- a/src/test/ui/issues/issue-44373.rs +++ b/src/test/ui/statics/issue-44373.rs diff --git a/src/test/ui/issues/issue-44373.stderr b/src/test/ui/statics/issue-44373.stderr index 6f92fbb1eb6..6f92fbb1eb6 100644 --- a/src/test/ui/issues/issue-44373.stderr +++ b/src/test/ui/statics/issue-44373.stderr diff --git a/src/test/ui/impl-bounds-checking.rs b/src/test/ui/traits/impl-bounds-checking.rs index 5e65a27bf14..5e65a27bf14 100644 --- a/src/test/ui/impl-bounds-checking.rs +++ b/src/test/ui/traits/impl-bounds-checking.rs diff --git a/src/test/ui/impl-bounds-checking.stderr b/src/test/ui/traits/impl-bounds-checking.stderr index 8698ed6e875..8698ed6e875 100644 --- a/src/test/ui/impl-bounds-checking.stderr +++ b/src/test/ui/traits/impl-bounds-checking.stderr diff --git a/src/test/ui/issues/issue-28576.rs b/src/test/ui/traits/issue-28576.rs index 972c839b648..972c839b648 100644 --- a/src/test/ui/issues/issue-28576.rs +++ b/src/test/ui/traits/issue-28576.rs diff --git a/src/test/ui/issues/issue-28576.stderr b/src/test/ui/traits/issue-28576.stderr index 203cd0630eb..203cd0630eb 100644 --- a/src/test/ui/issues/issue-28576.stderr +++ b/src/test/ui/traits/issue-28576.stderr diff --git a/src/test/ui/issues/issue-33140.rs b/src/test/ui/traits/issue-33140.rs index 9bdac4b8375..9bdac4b8375 100644 --- a/src/test/ui/issues/issue-33140.rs +++ b/src/test/ui/traits/issue-33140.rs diff --git a/src/test/ui/issues/issue-33140.stderr b/src/test/ui/traits/issue-33140.stderr index 9a900d2fc94..9a900d2fc94 100644 --- a/src/test/ui/issues/issue-33140.stderr +++ b/src/test/ui/traits/issue-33140.stderr diff --git a/src/test/ui/issues/issue-33140-traitobject-crate.rs b/src/test/ui/traits/object/issue-33140-traitobject-crate.rs index 46b68f1c9fe..46b68f1c9fe 100644 --- a/src/test/ui/issues/issue-33140-traitobject-crate.rs +++ b/src/test/ui/traits/object/issue-33140-traitobject-crate.rs diff --git a/src/test/ui/issues/issue-33140-traitobject-crate.stderr b/src/test/ui/traits/object/issue-33140-traitobject-crate.stderr index 781decb5ae2..781decb5ae2 100644 --- a/src/test/ui/issues/issue-33140-traitobject-crate.stderr +++ b/src/test/ui/traits/object/issue-33140-traitobject-crate.stderr diff --git a/src/test/ui/try-block.rs b/src/test/ui/try-block/try-block.rs index c29ccc70427..c29ccc70427 100644 --- a/src/test/ui/try-block.rs +++ b/src/test/ui/try-block/try-block.rs diff --git a/src/test/ui/tup.rs b/src/test/ui/tuple/tup.rs index 160477b0b0a..160477b0b0a 100644 --- a/src/test/ui/tup.rs +++ b/src/test/ui/tuple/tup.rs diff --git a/src/test/ui/issues/issue-18661.rs b/src/test/ui/unboxed-closures/issue-18661.rs index e2427243235..e2427243235 100644 --- a/src/test/ui/issues/issue-18661.rs +++ b/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 index 659d5ae03c9..c69bdca7611 100644 --- 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")) |
