From 1b0186e9ecdaa6fd00f1beea7d877b5a4fbd762d Mon Sep 17 00:00:00 2001 From: Caio Date: Wed, 15 Sep 2021 14:03:27 -0300 Subject: [PATCH] Move some tests to more reasonable directories --- .../issue-19883.rs | 0 .../issue-19883.stderr | 0 .../issue-21363.rs | 0 .../auxiliary/issue-72470-lib.rs | 0 .../issue-72470-llvm-dominate.rs | 0 .../ui/{issues => closures}/issue-78720.rs | 0 .../{issues => closures}/issue-78720.stderr | 0 src/test/ui/{issues => consts}/issue-23833.rs | 0 src/test/ui/{issues => consts}/issue-34784.rs | 0 .../ui/{issues => deriving}/issue-3935.rs | 0 .../ui/{ => generics}/mid-path-type-params.rs | 0 .../type-arg-mismatch-due-to-impl-trait.rs | 0 ...type-arg-mismatch-due-to-impl-trait.stderr | 0 src/test/ui/issues/issue-5791.rs | 14 ------------- src/test/ui/issues/issue-5791.stderr | 21 ------------------- .../{ => lint}/enable-unstable-lib-feature.rs | 0 .../enable-unstable-lib-feature.stderr | 0 src/test/ui/{issues => lint}/issue-57410.rs | 0 src/test/ui/{issues => lint}/issue-79744.rs | 0 .../ui/{issues => lint}/issue-79744.stderr | 0 .../ui/{issues => llvm-asm}/issue-37433.rs | 0 .../{issues => llvm-asm}/issue-37433.stderr | 0 .../ui/{ => macros}/auxiliary/define-macro.rs | 0 .../ui/{ => macros}/out-of-order-shadowing.rs | 0 .../out-of-order-shadowing.stderr | 0 src/test/ui/{ => match}/guards.rs | 0 src/test/ui/{issues => match}/issue-33498.rs | 0 src/test/ui/{issues => match}/issue-41255.rs | 0 .../ui/{issues => match}/issue-41255.stderr | 0 src/test/ui/{issues => match}/issue-56685.rs | 0 .../ui/{issues => match}/issue-56685.stderr | 0 .../ui/{ => never_type}/expr-empty-ret.rs | 0 .../issue-74614.rs | 0 .../ui/{issues => privacy}/issue-79593.rs | 0 .../ui/{issues => privacy}/issue-79593.stderr | 0 .../ui/{issues => resolve}/issue-42944.rs | 0 .../ui/{issues => resolve}/issue-42944.stderr | 0 .../ui/{ => resolve}/use-self-in-inner-fn.rs | 0 .../{ => resolve}/use-self-in-inner-fn.stderr | 0 .../{issues => specialization}/issue-35376.rs | 0 .../issue-35376.stderr | 0 src/test/ui/{issues => static}/issue-34194.rs | 0 .../{issues => structs-enums}/issue-38002.rs | 0 .../{issues => symbol-names}/issue-53912.rs | 0 .../ui/{issues => test-attrs}/issue-36768.rs | 0 src/test/ui/{ => thread-local}/tls.rs | 0 src/test/ui/{ => traits}/bug-7183-generics.rs | 0 src/test/ui/{issues => traits}/issue-20692.rs | 0 .../ui/{issues => traits}/issue-20692.stderr | 0 src/test/ui/{issues => traits}/issue-23825.rs | 0 ...7-unnecessary-unsafe-in-closure.mir.stderr | 0 ...sue-45107-unnecessary-unsafe-in-closure.rs | 0 ...-unnecessary-unsafe-in-closure.thir.stderr | 0 src/tools/tidy/src/ui_tests.rs | 4 ++-- 54 files changed, 2 insertions(+), 37 deletions(-) rename src/test/ui/{issues => associated-types}/issue-19883.rs (100%) rename src/test/ui/{issues => associated-types}/issue-19883.stderr (100%) rename src/test/ui/{issues => associated-types}/issue-21363.rs (100%) rename src/test/ui/{ => async-await}/auxiliary/issue-72470-lib.rs (100%) rename src/test/ui/{ => async-await}/issue-72470-llvm-dominate.rs (100%) rename src/test/ui/{issues => closures}/issue-78720.rs (100%) rename src/test/ui/{issues => closures}/issue-78720.stderr (100%) rename src/test/ui/{issues => consts}/issue-23833.rs (100%) rename src/test/ui/{issues => consts}/issue-34784.rs (100%) rename src/test/ui/{issues => deriving}/issue-3935.rs (100%) rename src/test/ui/{ => generics}/mid-path-type-params.rs (100%) rename src/test/ui/{issues => impl-trait}/type-arg-mismatch-due-to-impl-trait.rs (100%) rename src/test/ui/{issues => impl-trait}/type-arg-mismatch-due-to-impl-trait.stderr (100%) delete mode 100644 src/test/ui/issues/issue-5791.rs delete mode 100644 src/test/ui/issues/issue-5791.stderr rename src/test/ui/{ => lint}/enable-unstable-lib-feature.rs (100%) rename src/test/ui/{ => lint}/enable-unstable-lib-feature.stderr (100%) rename src/test/ui/{issues => lint}/issue-57410.rs (100%) rename src/test/ui/{issues => lint}/issue-79744.rs (100%) rename src/test/ui/{issues => lint}/issue-79744.stderr (100%) rename src/test/ui/{issues => llvm-asm}/issue-37433.rs (100%) rename src/test/ui/{issues => llvm-asm}/issue-37433.stderr (100%) rename src/test/ui/{ => macros}/auxiliary/define-macro.rs (100%) rename src/test/ui/{ => macros}/out-of-order-shadowing.rs (100%) rename src/test/ui/{ => macros}/out-of-order-shadowing.stderr (100%) rename src/test/ui/{ => match}/guards.rs (100%) rename src/test/ui/{issues => match}/issue-33498.rs (100%) rename src/test/ui/{issues => match}/issue-41255.rs (100%) rename src/test/ui/{issues => match}/issue-41255.stderr (100%) rename src/test/ui/{issues => match}/issue-56685.rs (100%) rename src/test/ui/{issues => match}/issue-56685.stderr (100%) rename src/test/ui/{ => never_type}/expr-empty-ret.rs (100%) rename src/test/ui/{issues => polymorphization}/issue-74614.rs (100%) rename src/test/ui/{issues => privacy}/issue-79593.rs (100%) rename src/test/ui/{issues => privacy}/issue-79593.stderr (100%) rename src/test/ui/{issues => resolve}/issue-42944.rs (100%) rename src/test/ui/{issues => resolve}/issue-42944.stderr (100%) rename src/test/ui/{ => resolve}/use-self-in-inner-fn.rs (100%) rename src/test/ui/{ => resolve}/use-self-in-inner-fn.stderr (100%) rename src/test/ui/{issues => specialization}/issue-35376.rs (100%) rename src/test/ui/{issues => specialization}/issue-35376.stderr (100%) rename src/test/ui/{issues => static}/issue-34194.rs (100%) rename src/test/ui/{issues => structs-enums}/issue-38002.rs (100%) rename src/test/ui/{issues => symbol-names}/issue-53912.rs (100%) rename src/test/ui/{issues => test-attrs}/issue-36768.rs (100%) rename src/test/ui/{ => thread-local}/tls.rs (100%) rename src/test/ui/{ => traits}/bug-7183-generics.rs (100%) rename src/test/ui/{issues => traits}/issue-20692.rs (100%) rename src/test/ui/{issues => traits}/issue-20692.stderr (100%) rename src/test/ui/{issues => traits}/issue-23825.rs (100%) rename src/test/ui/{issues => unsafe}/issue-45107-unnecessary-unsafe-in-closure.mir.stderr (100%) rename src/test/ui/{issues => unsafe}/issue-45107-unnecessary-unsafe-in-closure.rs (100%) rename src/test/ui/{issues => unsafe}/issue-45107-unnecessary-unsafe-in-closure.thir.stderr (100%) diff --git a/src/test/ui/issues/issue-19883.rs b/src/test/ui/associated-types/issue-19883.rs similarity index 100% rename from src/test/ui/issues/issue-19883.rs rename to src/test/ui/associated-types/issue-19883.rs diff --git a/src/test/ui/issues/issue-19883.stderr b/src/test/ui/associated-types/issue-19883.stderr similarity index 100% rename from src/test/ui/issues/issue-19883.stderr rename to src/test/ui/associated-types/issue-19883.stderr diff --git a/src/test/ui/issues/issue-21363.rs b/src/test/ui/associated-types/issue-21363.rs similarity index 100% rename from src/test/ui/issues/issue-21363.rs rename to src/test/ui/associated-types/issue-21363.rs diff --git a/src/test/ui/auxiliary/issue-72470-lib.rs b/src/test/ui/async-await/auxiliary/issue-72470-lib.rs similarity index 100% rename from src/test/ui/auxiliary/issue-72470-lib.rs rename to src/test/ui/async-await/auxiliary/issue-72470-lib.rs diff --git a/src/test/ui/issue-72470-llvm-dominate.rs b/src/test/ui/async-await/issue-72470-llvm-dominate.rs similarity index 100% rename from src/test/ui/issue-72470-llvm-dominate.rs rename to src/test/ui/async-await/issue-72470-llvm-dominate.rs diff --git a/src/test/ui/issues/issue-78720.rs b/src/test/ui/closures/issue-78720.rs similarity index 100% rename from src/test/ui/issues/issue-78720.rs rename to src/test/ui/closures/issue-78720.rs diff --git a/src/test/ui/issues/issue-78720.stderr b/src/test/ui/closures/issue-78720.stderr similarity index 100% rename from src/test/ui/issues/issue-78720.stderr rename to src/test/ui/closures/issue-78720.stderr diff --git a/src/test/ui/issues/issue-23833.rs b/src/test/ui/consts/issue-23833.rs similarity index 100% rename from src/test/ui/issues/issue-23833.rs rename to src/test/ui/consts/issue-23833.rs diff --git a/src/test/ui/issues/issue-34784.rs b/src/test/ui/consts/issue-34784.rs similarity index 100% rename from src/test/ui/issues/issue-34784.rs rename to src/test/ui/consts/issue-34784.rs diff --git a/src/test/ui/issues/issue-3935.rs b/src/test/ui/deriving/issue-3935.rs similarity index 100% rename from src/test/ui/issues/issue-3935.rs rename to src/test/ui/deriving/issue-3935.rs diff --git a/src/test/ui/mid-path-type-params.rs b/src/test/ui/generics/mid-path-type-params.rs similarity index 100% rename from src/test/ui/mid-path-type-params.rs rename to src/test/ui/generics/mid-path-type-params.rs diff --git a/src/test/ui/issues/type-arg-mismatch-due-to-impl-trait.rs b/src/test/ui/impl-trait/type-arg-mismatch-due-to-impl-trait.rs similarity index 100% rename from src/test/ui/issues/type-arg-mismatch-due-to-impl-trait.rs rename to src/test/ui/impl-trait/type-arg-mismatch-due-to-impl-trait.rs diff --git a/src/test/ui/issues/type-arg-mismatch-due-to-impl-trait.stderr b/src/test/ui/impl-trait/type-arg-mismatch-due-to-impl-trait.stderr similarity index 100% rename from src/test/ui/issues/type-arg-mismatch-due-to-impl-trait.stderr rename to src/test/ui/impl-trait/type-arg-mismatch-due-to-impl-trait.stderr diff --git a/src/test/ui/issues/issue-5791.rs b/src/test/ui/issues/issue-5791.rs deleted file mode 100644 index 3544160f094e5..0000000000000 --- a/src/test/ui/issues/issue-5791.rs +++ /dev/null @@ -1,14 +0,0 @@ -// run-pass -#![allow(dead_code)] -#![warn(clashing_extern_declarations)] -// pretty-expanded FIXME #23616 - -extern "C" { - #[link_name = "malloc"] - fn malloc1(len: i32) -> *const u8; - #[link_name = "malloc"] - //~^ WARN `malloc2` redeclares `malloc` with a different signature - fn malloc2(len: i32, foo: i32) -> *const u8; -} - -pub fn main() {} diff --git a/src/test/ui/issues/issue-5791.stderr b/src/test/ui/issues/issue-5791.stderr deleted file mode 100644 index cf60e609deb31..0000000000000 --- a/src/test/ui/issues/issue-5791.stderr +++ /dev/null @@ -1,21 +0,0 @@ -warning: `malloc2` redeclares `malloc` with a different signature - --> $DIR/issue-5791.rs:9:5 - | -LL | / #[link_name = "malloc"] -LL | | fn malloc1(len: i32) -> *const u8; - | |______________________________________- `malloc` previously declared here -LL | / #[link_name = "malloc"] -LL | | -LL | | fn malloc2(len: i32, foo: i32) -> *const u8; - | |________________________________________________^ this signature doesn't match the previous declaration - | -note: the lint level is defined here - --> $DIR/issue-5791.rs:3:9 - | -LL | #![warn(clashing_extern_declarations)] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - = note: expected `unsafe extern "C" fn(i32) -> *const u8` - found `unsafe extern "C" fn(i32, i32) -> *const u8` - -warning: 1 warning emitted - diff --git a/src/test/ui/enable-unstable-lib-feature.rs b/src/test/ui/lint/enable-unstable-lib-feature.rs similarity index 100% rename from src/test/ui/enable-unstable-lib-feature.rs rename to src/test/ui/lint/enable-unstable-lib-feature.rs diff --git a/src/test/ui/enable-unstable-lib-feature.stderr b/src/test/ui/lint/enable-unstable-lib-feature.stderr similarity index 100% rename from src/test/ui/enable-unstable-lib-feature.stderr rename to src/test/ui/lint/enable-unstable-lib-feature.stderr diff --git a/src/test/ui/issues/issue-57410.rs b/src/test/ui/lint/issue-57410.rs similarity index 100% rename from src/test/ui/issues/issue-57410.rs rename to src/test/ui/lint/issue-57410.rs diff --git a/src/test/ui/issues/issue-79744.rs b/src/test/ui/lint/issue-79744.rs similarity index 100% rename from src/test/ui/issues/issue-79744.rs rename to src/test/ui/lint/issue-79744.rs diff --git a/src/test/ui/issues/issue-79744.stderr b/src/test/ui/lint/issue-79744.stderr similarity index 100% rename from src/test/ui/issues/issue-79744.stderr rename to src/test/ui/lint/issue-79744.stderr diff --git a/src/test/ui/issues/issue-37433.rs b/src/test/ui/llvm-asm/issue-37433.rs similarity index 100% rename from src/test/ui/issues/issue-37433.rs rename to src/test/ui/llvm-asm/issue-37433.rs diff --git a/src/test/ui/issues/issue-37433.stderr b/src/test/ui/llvm-asm/issue-37433.stderr similarity index 100% rename from src/test/ui/issues/issue-37433.stderr rename to src/test/ui/llvm-asm/issue-37433.stderr diff --git a/src/test/ui/auxiliary/define-macro.rs b/src/test/ui/macros/auxiliary/define-macro.rs similarity index 100% rename from src/test/ui/auxiliary/define-macro.rs rename to src/test/ui/macros/auxiliary/define-macro.rs diff --git a/src/test/ui/out-of-order-shadowing.rs b/src/test/ui/macros/out-of-order-shadowing.rs similarity index 100% rename from src/test/ui/out-of-order-shadowing.rs rename to src/test/ui/macros/out-of-order-shadowing.rs diff --git a/src/test/ui/out-of-order-shadowing.stderr b/src/test/ui/macros/out-of-order-shadowing.stderr similarity index 100% rename from src/test/ui/out-of-order-shadowing.stderr rename to src/test/ui/macros/out-of-order-shadowing.stderr diff --git a/src/test/ui/guards.rs b/src/test/ui/match/guards.rs similarity index 100% rename from src/test/ui/guards.rs rename to src/test/ui/match/guards.rs diff --git a/src/test/ui/issues/issue-33498.rs b/src/test/ui/match/issue-33498.rs similarity index 100% rename from src/test/ui/issues/issue-33498.rs rename to src/test/ui/match/issue-33498.rs diff --git a/src/test/ui/issues/issue-41255.rs b/src/test/ui/match/issue-41255.rs similarity index 100% rename from src/test/ui/issues/issue-41255.rs rename to src/test/ui/match/issue-41255.rs diff --git a/src/test/ui/issues/issue-41255.stderr b/src/test/ui/match/issue-41255.stderr similarity index 100% rename from src/test/ui/issues/issue-41255.stderr rename to src/test/ui/match/issue-41255.stderr diff --git a/src/test/ui/issues/issue-56685.rs b/src/test/ui/match/issue-56685.rs similarity index 100% rename from src/test/ui/issues/issue-56685.rs rename to src/test/ui/match/issue-56685.rs diff --git a/src/test/ui/issues/issue-56685.stderr b/src/test/ui/match/issue-56685.stderr similarity index 100% rename from src/test/ui/issues/issue-56685.stderr rename to src/test/ui/match/issue-56685.stderr diff --git a/src/test/ui/expr-empty-ret.rs b/src/test/ui/never_type/expr-empty-ret.rs similarity index 100% rename from src/test/ui/expr-empty-ret.rs rename to src/test/ui/never_type/expr-empty-ret.rs diff --git a/src/test/ui/issues/issue-74614.rs b/src/test/ui/polymorphization/issue-74614.rs similarity index 100% rename from src/test/ui/issues/issue-74614.rs rename to src/test/ui/polymorphization/issue-74614.rs diff --git a/src/test/ui/issues/issue-79593.rs b/src/test/ui/privacy/issue-79593.rs similarity index 100% rename from src/test/ui/issues/issue-79593.rs rename to src/test/ui/privacy/issue-79593.rs diff --git a/src/test/ui/issues/issue-79593.stderr b/src/test/ui/privacy/issue-79593.stderr similarity index 100% rename from src/test/ui/issues/issue-79593.stderr rename to src/test/ui/privacy/issue-79593.stderr diff --git a/src/test/ui/issues/issue-42944.rs b/src/test/ui/resolve/issue-42944.rs similarity index 100% rename from src/test/ui/issues/issue-42944.rs rename to src/test/ui/resolve/issue-42944.rs diff --git a/src/test/ui/issues/issue-42944.stderr b/src/test/ui/resolve/issue-42944.stderr similarity index 100% rename from src/test/ui/issues/issue-42944.stderr rename to src/test/ui/resolve/issue-42944.stderr diff --git a/src/test/ui/use-self-in-inner-fn.rs b/src/test/ui/resolve/use-self-in-inner-fn.rs similarity index 100% rename from src/test/ui/use-self-in-inner-fn.rs rename to src/test/ui/resolve/use-self-in-inner-fn.rs diff --git a/src/test/ui/use-self-in-inner-fn.stderr b/src/test/ui/resolve/use-self-in-inner-fn.stderr similarity index 100% rename from src/test/ui/use-self-in-inner-fn.stderr rename to src/test/ui/resolve/use-self-in-inner-fn.stderr diff --git a/src/test/ui/issues/issue-35376.rs b/src/test/ui/specialization/issue-35376.rs similarity index 100% rename from src/test/ui/issues/issue-35376.rs rename to src/test/ui/specialization/issue-35376.rs diff --git a/src/test/ui/issues/issue-35376.stderr b/src/test/ui/specialization/issue-35376.stderr similarity index 100% rename from src/test/ui/issues/issue-35376.stderr rename to src/test/ui/specialization/issue-35376.stderr diff --git a/src/test/ui/issues/issue-34194.rs b/src/test/ui/static/issue-34194.rs similarity index 100% rename from src/test/ui/issues/issue-34194.rs rename to src/test/ui/static/issue-34194.rs diff --git a/src/test/ui/issues/issue-38002.rs b/src/test/ui/structs-enums/issue-38002.rs similarity index 100% rename from src/test/ui/issues/issue-38002.rs rename to src/test/ui/structs-enums/issue-38002.rs diff --git a/src/test/ui/issues/issue-53912.rs b/src/test/ui/symbol-names/issue-53912.rs similarity index 100% rename from src/test/ui/issues/issue-53912.rs rename to src/test/ui/symbol-names/issue-53912.rs diff --git a/src/test/ui/issues/issue-36768.rs b/src/test/ui/test-attrs/issue-36768.rs similarity index 100% rename from src/test/ui/issues/issue-36768.rs rename to src/test/ui/test-attrs/issue-36768.rs diff --git a/src/test/ui/tls.rs b/src/test/ui/thread-local/tls.rs similarity index 100% rename from src/test/ui/tls.rs rename to src/test/ui/thread-local/tls.rs diff --git a/src/test/ui/bug-7183-generics.rs b/src/test/ui/traits/bug-7183-generics.rs similarity index 100% rename from src/test/ui/bug-7183-generics.rs rename to src/test/ui/traits/bug-7183-generics.rs diff --git a/src/test/ui/issues/issue-20692.rs b/src/test/ui/traits/issue-20692.rs similarity index 100% rename from src/test/ui/issues/issue-20692.rs rename to src/test/ui/traits/issue-20692.rs diff --git a/src/test/ui/issues/issue-20692.stderr b/src/test/ui/traits/issue-20692.stderr similarity index 100% rename from src/test/ui/issues/issue-20692.stderr rename to src/test/ui/traits/issue-20692.stderr diff --git a/src/test/ui/issues/issue-23825.rs b/src/test/ui/traits/issue-23825.rs similarity index 100% rename from src/test/ui/issues/issue-23825.rs rename to src/test/ui/traits/issue-23825.rs diff --git a/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.mir.stderr b/src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.mir.stderr similarity index 100% rename from src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.mir.stderr rename to src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.mir.stderr diff --git a/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.rs b/src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.rs similarity index 100% rename from src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.rs rename to src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.rs diff --git a/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.thir.stderr b/src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.thir.stderr similarity index 100% rename from src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.thir.stderr rename to src/test/ui/unsafe/issue-45107-unnecessary-unsafe-in-closure.thir.stderr diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index 46b5b877b4c26..a341527c84cf0 100644 --- 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 = 1345; -const ISSUES_ENTRY_LIMIT: usize = 2525; +const ROOT_ENTRY_LIMIT: usize = 1330; +const ISSUES_ENTRY_LIMIT: usize = 2488; fn check_entries(path: &Path, bad: &mut bool) { let dirs = walkdir::WalkDir::new(&path.join("test/ui"))