Rollup merge of #125310 - workingjubilee:muck-out-the-test-stables, r…

…=Nilstrieb Move ~100 tests from tests/ui to subdirs new dirs for some, the rest in old sweep tests up before they turn cold to stop our code from growing mold
rust-lang · May 21, 2024 · 1b57ef3 · 1b57ef3
2 parents bfa98d3 + d895008
commit 1b57ef3
Show file tree

Hide file tree

Showing 127 changed files with 42 additions and 45 deletions.
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
@@ -16,7 +16,7 @@ const ENTRY_LIMIT: usize = 900;
 // FIXME: The following limits should be reduced eventually.
 
 const ISSUES_ENTRY_LIMIT: usize = 1676;
-const ROOT_ENTRY_LIMIT: usize = 859;
+const ROOT_ENTRY_LIMIT: usize = 757;
 
 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
     "rs",     // test source files

diff --git a/tests/ui/empty_global_asm.rs → tests/ui/asm/empty_global_asm.rs b/tests/ui/empty_global_asm.rs → tests/ui/asm/empty_global_asm.rs
diff --git a/tests/ui/simple_global_asm.rs → tests/ui/asm/simple_global_asm.rs b/tests/ui/simple_global_asm.rs → tests/ui/asm/simple_global_asm.rs
diff --git a/tests/ui/backtrace-apple-no-dsymutil.rs → tests/ui/backtrace/apple-no-dsymutil.rs b/tests/ui/backtrace-apple-no-dsymutil.rs → tests/ui/backtrace/apple-no-dsymutil.rs
diff --git a/...buginfo/auxiliary/dylib-dep-helper-aux.rs → ...cktrace/auxiliary/dylib-dep-helper-aux.rs b/...buginfo/auxiliary/dylib-dep-helper-aux.rs → ...cktrace/auxiliary/dylib-dep-helper-aux.rs
diff --git a/...i/debuginfo/auxiliary/dylib-dep-helper.rs → ...i/backtrace/auxiliary/dylib-dep-helper.rs b/...i/debuginfo/auxiliary/dylib-dep-helper.rs → ...i/backtrace/auxiliary/dylib-dep-helper.rs
diff --git a/...info/auxiliary/line-tables-only-helper.rs → ...race/auxiliary/line-tables-only-helper.rs b/...info/auxiliary/line-tables-only-helper.rs → ...race/auxiliary/line-tables-only-helper.rs
diff --git a/tests/ui/backtrace.rs → tests/ui/backtrace/backtrace.rs b/tests/ui/backtrace.rs → tests/ui/backtrace/backtrace.rs
diff --git a/tests/ui/debuginfo/backtrace-dylib-dep.rs → tests/ui/backtrace/dylib-dep.rs b/tests/ui/debuginfo/backtrace-dylib-dep.rs → tests/ui/backtrace/dylib-dep.rs
diff --git a/...i/debuginfo/backtrace-line-tables-only.rs → tests/ui/backtrace/line-tables-only.rs b/...i/debuginfo/backtrace-line-tables-only.rs → tests/ui/backtrace/line-tables-only.rs
diff --git a/tests/ui/std-backtrace.rs → tests/ui/backtrace/std-backtrace.rs b/tests/ui/std-backtrace.rs → tests/ui/backtrace/std-backtrace.rs
diff --git a/.../ui/auxiliary/orphan-check-diagnostics.rs → ...nce/auxiliary/orphan-check-diagnostics.rs b/.../ui/auxiliary/orphan-check-diagnostics.rs → ...nce/auxiliary/orphan-check-diagnostics.rs
diff --git a/tests/ui/orphan-check-diagnostics.rs → .../ui/coherence/orphan-check-diagnostics.rs b/tests/ui/orphan-check-diagnostics.rs → .../ui/coherence/orphan-check-diagnostics.rs
diff --git a/tests/ui/orphan-check-diagnostics.stderr → ...coherence/orphan-check-diagnostics.stderr b/tests/ui/orphan-check-diagnostics.stderr → ...coherence/orphan-check-diagnostics.stderr
diff --git a/...oss-crate/xcrate-address-insignificant.rs → ...s/ui/cross-crate/address-insignificant.rs b/...oss-crate/xcrate-address-insignificant.rs → ...s/ui/cross-crate/address-insignificant.rs
diff --git a/...-crate/xcrate-associated-type-defaults.rs → ...i/cross-crate/associated-type-defaults.rs b/...-crate/xcrate-associated-type-defaults.rs → ...i/cross-crate/associated-type-defaults.rs
diff --git a/...crate/auxiliary/static_priv_by_default.rs → ...crate/auxiliary/static_priv_by_default.rs b/...crate/auxiliary/static_priv_by_default.rs → ...crate/auxiliary/static_priv_by_default.rs
diff --git a/...ui/xcrate/auxiliary/xcrate_unit_struct.rs → ...oss-crate/auxiliary/xcrate_unit_struct.rs b/...ui/xcrate/auxiliary/xcrate_unit_struct.rs → ...oss-crate/auxiliary/xcrate_unit_struct.rs
diff --git a/...-crate/xcrate_generic_fn_nested_return.rs → ...i/cross-crate/generic_fn_nested_return.rs b/...-crate/xcrate_generic_fn_nested_return.rs → ...i/cross-crate/generic_fn_nested_return.rs
diff --git a/tests/ui/xcrate/xcrate-private-by-default.rs → tests/ui/cross-crate/private-by-default.rs b/tests/ui/xcrate/xcrate-private-by-default.rs → tests/ui/cross-crate/private-by-default.rs
diff --git a/...i/xcrate/xcrate-private-by-default.stderr → .../ui/cross-crate/private-by-default.stderr b/...i/xcrate/xcrate-private-by-default.stderr → .../ui/cross-crate/private-by-default.stderr
@@ -1,5 +1,5 @@
 error[E0603]: static `j` is private
-  --> $DIR/xcrate-private-by-default.rs:23:29
+  --> $DIR/private-by-default.rs:23:29
    |
 LL |     static_priv_by_default::j;
    |                             ^ private static
@@ -11,7 +11,7 @@ LL | static j: isize = 0;
    | ^^^^^^^^^^^^^^^
 
 error[E0603]: function `k` is private
-  --> $DIR/xcrate-private-by-default.rs:25:29
+  --> $DIR/private-by-default.rs:25:29
    |
 LL |     static_priv_by_default::k;
    |                             ^ private function
@@ -23,7 +23,7 @@ LL | fn k() {}
    | ^^^^^^
 
 error[E0603]: unit struct `l` is private
-  --> $DIR/xcrate-private-by-default.rs:27:29
+  --> $DIR/private-by-default.rs:27:29
    |
 LL |     static_priv_by_default::l;
    |                             ^ private unit struct
@@ -35,7 +35,7 @@ LL | struct l;
    | ^^^^^^^^
 
 error[E0603]: enum `m` is private
-  --> $DIR/xcrate-private-by-default.rs:29:35
+  --> $DIR/private-by-default.rs:29:35
    |
 LL |     foo::<static_priv_by_default::m>();
    |                                   ^ private enum
@@ -47,7 +47,7 @@ LL | enum m {}
    | ^^^^^^
 
 error[E0603]: type alias `n` is private
-  --> $DIR/xcrate-private-by-default.rs:31:35
+  --> $DIR/private-by-default.rs:31:35
    |
 LL |     foo::<static_priv_by_default::n>();
    |                                   ^ private type alias
@@ -59,7 +59,7 @@ LL | type n = isize;
    | ^^^^^^
 
 error[E0603]: module `foo` is private
-  --> $DIR/xcrate-private-by-default.rs:35:29
+  --> $DIR/private-by-default.rs:35:29
    |
 LL |     static_priv_by_default::foo::a;
    |                             ^^^  - static `a` is not publicly re-exported
@@ -73,7 +73,7 @@ LL | mod foo {
    | ^^^^^^^
 
 error[E0603]: module `foo` is private
-  --> $DIR/xcrate-private-by-default.rs:37:29
+  --> $DIR/private-by-default.rs:37:29
    |
 LL |     static_priv_by_default::foo::b;
    |                             ^^^  - function `b` is not publicly re-exported
@@ -87,7 +87,7 @@ LL | mod foo {
    | ^^^^^^^
 
 error[E0603]: module `foo` is private
-  --> $DIR/xcrate-private-by-default.rs:39:29
+  --> $DIR/private-by-default.rs:39:29
    |
 LL |     static_priv_by_default::foo::c;
    |                             ^^^  - unit struct `c` is not publicly re-exported
@@ -101,7 +101,7 @@ LL | mod foo {
    | ^^^^^^^
 
 error[E0603]: module `foo` is private
-  --> $DIR/xcrate-private-by-default.rs:41:35
+  --> $DIR/private-by-default.rs:41:35
    |
 LL |     foo::<static_priv_by_default::foo::d>();
    |                                   ^^^  - enum `d` is not publicly re-exported
@@ -115,7 +115,7 @@ LL | mod foo {
    | ^^^^^^^
 
 error[E0603]: module `foo` is private
-  --> $DIR/xcrate-private-by-default.rs:43:35
+  --> $DIR/private-by-default.rs:43:35
    |
 LL |     foo::<static_priv_by_default::foo::e>();
    |                                   ^^^  - type alias `e` is not publicly re-exported

diff --git a/...ui/cross-crate/xcrate-static-addresses.rs → tests/ui/cross-crate/static-addresses.rs b/...ui/cross-crate/xcrate-static-addresses.rs → tests/ui/cross-crate/static-addresses.rs
diff --git a/...ross-crate/xcrate-trait-lifetime-param.rs → tests/ui/cross-crate/trait-lifetime-param.rs b/...ross-crate/xcrate-trait-lifetime-param.rs → tests/ui/cross-crate/trait-lifetime-param.rs
diff --git a/tests/ui/xcrate/xcrate-unit-struct-2.rs → tests/ui/cross-crate/unit-struct-2.rs b/tests/ui/xcrate/xcrate-unit-struct-2.rs → tests/ui/cross-crate/unit-struct-2.rs
diff --git a/tests/ui/xcrate/xcrate-unit-struct.rs → tests/ui/cross-crate/unit-struct.rs b/tests/ui/xcrate/xcrate-unit-struct.rs → tests/ui/cross-crate/unit-struct.rs
diff --git a/tests/ui/xcrate/xcrate-unit-struct.stderr → tests/ui/cross-crate/unit-struct.stderr b/tests/ui/xcrate/xcrate-unit-struct.stderr → tests/ui/cross-crate/unit-struct.stderr
@@ -1,5 +1,5 @@
 error[E0423]: expected value, found struct `xcrate_unit_struct::StructWithFields`
-  --> $DIR/xcrate-unit-struct.rs:9:13
+  --> $DIR/unit-struct.rs:9:13
    |
 LL |     let _ = xcrate_unit_struct::StructWithFields;
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use struct literal syntax instead: `xcrate_unit_struct::StructWithFields { foo: val }`
@@ -10,7 +10,7 @@ LL | pub struct StructWithFields {
    | --------------------------- `xcrate_unit_struct::StructWithFields` defined here
 
 error[E0423]: expected value, found struct `xcrate_unit_struct::StructWithPrivFields`
-  --> $DIR/xcrate-unit-struct.rs:11:13
+  --> $DIR/unit-struct.rs:11:13
    |
 LL |     let _ = xcrate_unit_struct::StructWithPrivFields;
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/tests/ui/expr-block-fn.rs → tests/ui/expr/block-fn.rs b/tests/ui/expr-block-fn.rs → tests/ui/expr/block-fn.rs
diff --git a/tests/ui/expr-block-generic.rs → tests/ui/expr/block-generic.rs b/tests/ui/expr-block-generic.rs → tests/ui/expr/block-generic.rs
diff --git a/tests/ui/expr-block.rs → tests/ui/expr/block.rs b/tests/ui/expr-block.rs → tests/ui/expr/block.rs
diff --git a/tests/ui/expr-copy.rs → tests/ui/expr/copy.rs b/tests/ui/expr-copy.rs → tests/ui/expr/copy.rs
diff --git a/tests/ui/expr-if-generic.rs → tests/ui/expr/if-generic.rs b/tests/ui/expr-if-generic.rs → tests/ui/expr/if-generic.rs
diff --git a/tests/ui/expr-if-panic-all.rs → tests/ui/expr/if-panic-all.rs b/tests/ui/expr-if-panic-all.rs → tests/ui/expr/if-panic-all.rs
diff --git a/tests/ui/expr-scope.rs → tests/ui/expr/scope.rs b/tests/ui/expr-scope.rs → tests/ui/expr/scope.rs
diff --git a/tests/ui/stmt_expr_attrs_no_feature.rs → ...ature-gates/stmt_expr_attrs_no_feature.rs b/tests/ui/stmt_expr_attrs_no_feature.rs → ...ature-gates/stmt_expr_attrs_no_feature.rs
diff --git a/tests/ui/stmt_expr_attrs_no_feature.stderr → ...e-gates/stmt_expr_attrs_no_feature.stderr b/tests/ui/stmt_expr_attrs_no_feature.stderr → ...e-gates/stmt_expr_attrs_no_feature.stderr
diff --git a/tests/ui/ffi_const.rs → tests/ui/ffi-attrs/ffi_const.rs b/tests/ui/ffi_const.rs → tests/ui/ffi-attrs/ffi_const.rs
diff --git a/tests/ui/ffi_const.stderr → tests/ui/ffi-attrs/ffi_const.stderr b/tests/ui/ffi_const.stderr → tests/ui/ffi-attrs/ffi_const.stderr
diff --git a/tests/ui/ffi_const2.rs → tests/ui/ffi-attrs/ffi_const2.rs b/tests/ui/ffi_const2.rs → tests/ui/ffi-attrs/ffi_const2.rs
diff --git a/tests/ui/ffi_const2.stderr → tests/ui/ffi-attrs/ffi_const2.stderr b/tests/ui/ffi_const2.stderr → tests/ui/ffi-attrs/ffi_const2.stderr
diff --git a/tests/ui/ffi_pure.rs → tests/ui/ffi-attrs/ffi_pure.rs b/tests/ui/ffi_pure.rs → tests/ui/ffi-attrs/ffi_pure.rs
diff --git a/tests/ui/ffi_pure.stderr → tests/ui/ffi-attrs/ffi_pure.stderr b/tests/ui/ffi_pure.stderr → tests/ui/ffi-attrs/ffi_pure.stderr
diff --git a/tests/ui/main-wrong-location.rs → tests/ui/fn-main/wrong-location.rs b/tests/ui/main-wrong-location.rs → tests/ui/fn-main/wrong-location.rs
diff --git a/tests/ui/main-wrong-location.stderr → tests/ui/fn-main/wrong-location.stderr b/tests/ui/main-wrong-location.stderr → tests/ui/fn-main/wrong-location.stderr
@@ -1,11 +1,11 @@
-error[E0601]: `main` function not found in crate `main_wrong_location`
-  --> $DIR/main-wrong-location.rs:5:2
+error[E0601]: `main` function not found in crate `wrong_location`
+  --> $DIR/wrong-location.rs:5:2
    |
 LL | }
-   |  ^ the main function must be defined at the crate level (in `$DIR/main-wrong-location.rs`)
+   |  ^ the main function must be defined at the crate level (in `$DIR/wrong-location.rs`)
    |
 note: here is a function named `main`
-  --> $DIR/main-wrong-location.rs:4:5
+  --> $DIR/wrong-location.rs:4:5
    |
 LL |     fn main() { }
    |     ^^^^^^^^^

diff --git a/tests/ui/main-wrong-type.rs → tests/ui/fn-main/wrong-type.rs b/tests/ui/main-wrong-type.rs → tests/ui/fn-main/wrong-type.rs
diff --git a/tests/ui/main-wrong-type.stderr → tests/ui/fn-main/wrong-type.stderr b/tests/ui/main-wrong-type.stderr → tests/ui/fn-main/wrong-type.stderr
@@ -1,5 +1,5 @@
 error[E0580]: `main` function has wrong type
-  --> $DIR/main-wrong-type.rs:6:1
+  --> $DIR/wrong-type.rs:6:1
    |
 LL | fn main(foo: S) {
    | ^^^^^^^^^^^^^^^ incorrect number of function parameters

diff --git a/tests/ui/foreign-fn-return-lifetime.rs → .../ui/foreign/foreign-fn-return-lifetime.rs b/tests/ui/foreign-fn-return-lifetime.rs → .../ui/foreign/foreign-fn-return-lifetime.rs
diff --git a/tests/ui/foreign-fn-return-lifetime.stderr → ...foreign/foreign-fn-return-lifetime.stderr b/tests/ui/foreign-fn-return-lifetime.stderr → ...foreign/foreign-fn-return-lifetime.stderr
diff --git a/tests/ui/optimization-fuel-0.rs → tests/ui/fuel/optimization-fuel-0.rs b/tests/ui/optimization-fuel-0.rs → tests/ui/fuel/optimization-fuel-0.rs
diff --git a/tests/ui/optimization-fuel-0.stderr → tests/ui/fuel/optimization-fuel-0.stderr b/tests/ui/optimization-fuel-0.stderr → tests/ui/fuel/optimization-fuel-0.stderr
diff --git a/tests/ui/optimization-fuel-1.rs → tests/ui/fuel/optimization-fuel-1.rs b/tests/ui/optimization-fuel-1.rs → tests/ui/fuel/optimization-fuel-1.rs
diff --git a/tests/ui/optimization-fuel-1.stderr → tests/ui/fuel/optimization-fuel-1.stderr b/tests/ui/optimization-fuel-1.stderr → tests/ui/fuel/optimization-fuel-1.stderr
diff --git a/tests/ui/print-fuel/print-fuel.rs → tests/ui/fuel/print-fuel.rs b/tests/ui/print-fuel/print-fuel.rs → tests/ui/fuel/print-fuel.rs
diff --git a/tests/ui/print-fuel/print-fuel.stderr → tests/ui/fuel/print-fuel.stderr b/tests/ui/print-fuel/print-fuel.stderr → tests/ui/fuel/print-fuel.stderr
diff --git a/tests/ui/infer-fn-tail-expr.rs → tests/ui/inference/infer-fn-tail-expr.rs b/tests/ui/infer-fn-tail-expr.rs → tests/ui/inference/infer-fn-tail-expr.rs
diff --git a/tests/ui/lambda-infer-unresolved.rs → ...s/ui/inference/lambda-infer-unresolved.rs b/tests/ui/lambda-infer-unresolved.rs → ...s/ui/inference/lambda-infer-unresolved.rs
diff --git a/tests/ui/order-dependent-cast-inference.rs → ...ference/order-dependent-cast-inference.rs b/tests/ui/order-dependent-cast-inference.rs → ...ference/order-dependent-cast-inference.rs
diff --git a/.../ui/order-dependent-cast-inference.stderr → ...nce/order-dependent-cast-inference.stderr b/.../ui/order-dependent-cast-inference.stderr → ...nce/order-dependent-cast-inference.stderr
diff --git a/tests/ui/intrinsics-always-extern.rs → tests/ui/intrinsics/always-extern.rs b/tests/ui/intrinsics-always-extern.rs → tests/ui/intrinsics/always-extern.rs
diff --git a/tests/ui/intrinsics-always-extern.stderr → tests/ui/intrinsics/always-extern.stderr b/tests/ui/intrinsics-always-extern.stderr → tests/ui/intrinsics/always-extern.stderr
@@ -1,27 +1,27 @@
 error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
-  --> $DIR/intrinsics-always-extern.rs:4:32
+  --> $DIR/always-extern.rs:4:32
    |
 LL |     extern "rust-intrinsic" fn foo(&self);
    |                                ^^^
 
 error[E0093]: unrecognized intrinsic function: `hello`
-  --> $DIR/intrinsics-always-extern.rs:12:28
+  --> $DIR/always-extern.rs:12:28
    |
 LL | extern "rust-intrinsic" fn hello() {
    |                            ^^^^^ unrecognized intrinsic
    |
    = help: if you're adding an intrinsic, be sure to update `check_intrinsic_type`
 
 error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
-  --> $DIR/intrinsics-always-extern.rs:8:43
+  --> $DIR/always-extern.rs:8:43
    |
 LL |       extern "rust-intrinsic" fn foo(&self) {
    |  ___________________________________________^
 LL | |     }
    | |_____^
 
 error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
-  --> $DIR/intrinsics-always-extern.rs:12:36
+  --> $DIR/always-extern.rs:12:36
    |
 LL |   extern "rust-intrinsic" fn hello() {
    |  ____________________________________^

diff --git a/tests/ui/reify-intrinsic.rs → tests/ui/intrinsics/reify-intrinsic.rs b/tests/ui/reify-intrinsic.rs → tests/ui/intrinsics/reify-intrinsic.rs
diff --git a/tests/ui/reify-intrinsic.stderr → tests/ui/intrinsics/reify-intrinsic.stderr b/tests/ui/reify-intrinsic.stderr → tests/ui/intrinsics/reify-intrinsic.stderr
diff --git a/tests/ui/lint-group-denied-lint-allowed.rs → tests/ui/lint/group-denied-lint-allowed.rs b/tests/ui/lint-group-denied-lint-allowed.rs → tests/ui/lint/group-denied-lint-allowed.rs
diff --git a/...ui/lint-group-forbid-always-trumps-cli.rs → ...ui/lint/group-forbid-always-trumps-cli.rs b/...ui/lint-group-forbid-always-trumps-cli.rs → ...ui/lint/group-forbid-always-trumps-cli.rs
diff --git a/...int-group-forbid-always-trumps-cli.stderr → ...int/group-forbid-always-trumps-cli.stderr b/...int-group-forbid-always-trumps-cli.stderr → ...int/group-forbid-always-trumps-cli.stderr
@@ -1,5 +1,5 @@
 error: unused variable: `x`
-  --> $DIR/lint-group-forbid-always-trumps-cli.rs:4:9
+  --> $DIR/group-forbid-always-trumps-cli.rs:4:9
    |
 LL |     let x = 1;
    |         ^ help: if this is intentional, prefix it with an underscore: `_x`

diff --git a/...s/ui/lint-unknown-lints-at-crate-level.rs → ...s/ui/lint/unknown-lints-at-crate-level.rs b/...s/ui/lint-unknown-lints-at-crate-level.rs → ...s/ui/lint/unknown-lints-at-crate-level.rs
diff --git a/tests/ui/compile_error_macro.rs → tests/ui/macros/compile_error_macro.rs b/tests/ui/compile_error_macro.rs → tests/ui/macros/compile_error_macro.rs
diff --git a/tests/ui/compile_error_macro.stderr → tests/ui/macros/compile_error_macro.stderr b/tests/ui/compile_error_macro.stderr → tests/ui/macros/compile_error_macro.stderr
diff --git a/tests/ui/module-macro_use-arguments.rs → ...s/ui/macros/module-macro_use-arguments.rs b/tests/ui/module-macro_use-arguments.rs → ...s/ui/macros/module-macro_use-arguments.rs
diff --git a/tests/ui/module-macro_use-arguments.stderr → .../macros/module-macro_use-arguments.stderr b/tests/ui/module-macro_use-arguments.stderr → .../macros/module-macro_use-arguments.stderr
diff --git a/tests/ui/no-patterns-in-args-macro.rs → tests/ui/macros/no-patterns-in-args-macro.rs b/tests/ui/no-patterns-in-args-macro.rs → tests/ui/macros/no-patterns-in-args-macro.rs
diff --git a/tests/ui/no-patterns-in-args-macro.stderr → ...i/macros/no-patterns-in-args-macro.stderr b/tests/ui/no-patterns-in-args-macro.stderr → ...i/macros/no-patterns-in-args-macro.stderr
diff --git a/tests/ui/super-fast-paren-parsing.rs → tests/ui/parser/super-fast-paren-parsing.rs b/tests/ui/super-fast-paren-parsing.rs → tests/ui/parser/super-fast-paren-parsing.rs
@@ -3,10 +3,7 @@
 #![allow(unused_parens)]
 #![allow(non_upper_case_globals)]
 #![allow(dead_code)]
-//@ exec-env:RUST_MIN_STACK=16000000
-//@ rustc-env:RUST_MIN_STACK=16000000
-//
-// Big stack is needed for pretty printing, a little sad...
+#![cfg_attr(rustfmt, rustfmt::skip)]
 
 static a: isize =
 (((((((((((((((((((((((((((((((((((((((((((((((((((

diff --git a/tests/ui/by-move-pattern-binding.rs → tests/ui/pattern/by-move-pattern-binding.rs b/tests/ui/by-move-pattern-binding.rs → tests/ui/pattern/by-move-pattern-binding.rs
diff --git a/tests/ui/by-move-pattern-binding.stderr → ...ui/pattern/by-move-pattern-binding.stderr b/tests/ui/by-move-pattern-binding.stderr → ...ui/pattern/by-move-pattern-binding.stderr
diff --git a/tests/ui/fn-in-pat.rs → tests/ui/pattern/fn-in-pat.rs b/tests/ui/fn-in-pat.rs → tests/ui/pattern/fn-in-pat.rs
diff --git a/tests/ui/fn-in-pat.stderr → tests/ui/pattern/fn-in-pat.stderr b/tests/ui/fn-in-pat.stderr → tests/ui/pattern/fn-in-pat.stderr
diff --git a/tests/ui/inc-range-pat.rs → tests/ui/pattern/inc-range-pat.rs b/tests/ui/inc-range-pat.rs → tests/ui/pattern/inc-range-pat.rs
diff --git a/tests/ui/no-patterns-in-args-2.rs → tests/ui/pattern/no-patterns-in-args-2.rs b/tests/ui/no-patterns-in-args-2.rs → tests/ui/pattern/no-patterns-in-args-2.rs
diff --git a/tests/ui/no-patterns-in-args-2.stderr → ...s/ui/pattern/no-patterns-in-args-2.stderr b/tests/ui/no-patterns-in-args-2.stderr → ...s/ui/pattern/no-patterns-in-args-2.stderr
diff --git a/tests/ui/no-patterns-in-args.rs → tests/ui/pattern/no-patterns-in-args.rs b/tests/ui/no-patterns-in-args.rs → tests/ui/pattern/no-patterns-in-args.rs
diff --git a/tests/ui/no-patterns-in-args.stderr → tests/ui/pattern/no-patterns-in-args.stderr b/tests/ui/no-patterns-in-args.stderr → tests/ui/pattern/no-patterns-in-args.stderr
diff --git a/tests/ui/env-args-reverse-iterator.rs → ...s/ui/process/env-args-reverse-iterator.rs b/tests/ui/env-args-reverse-iterator.rs → ...s/ui/process/env-args-reverse-iterator.rs
diff --git a/tests/ui/env-funky-keys.rs → tests/ui/process/env-funky-keys.rs b/tests/ui/env-funky-keys.rs → tests/ui/process/env-funky-keys.rs
diff --git a/tests/ui/env-null-vars.rs → tests/ui/process/env-null-vars.rs b/tests/ui/env-null-vars.rs → tests/ui/process/env-null-vars.rs
diff --git a/tests/ui/env-vars.rs → tests/ui/process/env-vars.rs b/tests/ui/env-vars.rs → tests/ui/process/env-vars.rs
diff --git a/tests/ui/exec-env.rs → tests/ui/process/exec-env.rs b/tests/ui/exec-env.rs → tests/ui/process/exec-env.rs
diff --git a/tests/ui/inherit-env.rs → tests/ui/process/inherit-env.rs b/tests/ui/inherit-env.rs → tests/ui/process/inherit-env.rs
diff --git a/tests/ui/impossible_range.fixed → tests/ui/range/impossible_range.fixed b/tests/ui/impossible_range.fixed → tests/ui/range/impossible_range.fixed
diff --git a/tests/ui/impossible_range.rs → tests/ui/range/impossible_range.rs b/tests/ui/impossible_range.rs → tests/ui/range/impossible_range.rs
diff --git a/tests/ui/impossible_range.stderr → tests/ui/range/impossible_range.stderr b/tests/ui/impossible_range.stderr → tests/ui/range/impossible_range.stderr
diff --git a/tests/ui/range_inclusive.rs → tests/ui/range/range_inclusive.rs b/tests/ui/range_inclusive.rs → tests/ui/range/range_inclusive.rs
diff --git a/tests/ui/conflicting-repr-hints.rs → tests/ui/repr/conflicting-repr-hints.rs b/tests/ui/conflicting-repr-hints.rs → tests/ui/repr/conflicting-repr-hints.rs
diff --git a/tests/ui/conflicting-repr-hints.stderr → tests/ui/repr/conflicting-repr-hints.stderr b/tests/ui/conflicting-repr-hints.stderr → tests/ui/repr/conflicting-repr-hints.stderr
diff --git a/tests/ui/ret-bang.rs → tests/ui/return/ret-bang.rs b/tests/ui/ret-bang.rs → tests/ui/return/ret-bang.rs
diff --git a/tests/ui/ret-non-nil.rs → tests/ui/return/ret-non-nil.rs b/tests/ui/ret-non-nil.rs → tests/ui/return/ret-non-nil.rs
diff --git a/tests/ui/ret-non-nil.stderr → tests/ui/return/ret-non-nil.stderr b/tests/ui/ret-non-nil.stderr → tests/ui/return/ret-non-nil.stderr
diff --git a/tests/ui/return-disjoint-regions.rs → tests/ui/return/return-disjoint-regions.rs b/tests/ui/return-disjoint-regions.rs → tests/ui/return/return-disjoint-regions.rs
diff --git a/tests/ui/return-disjoint-regions.stderr → .../ui/return/return-disjoint-regions.stderr b/tests/ui/return-disjoint-regions.stderr → .../ui/return/return-disjoint-regions.stderr
diff --git a/tests/ui/return-nil.rs → tests/ui/return/return-nil.rs b/tests/ui/return-nil.rs → tests/ui/return/return-nil.rs
diff --git a/.../check_static_recursion_foreign_helper.rs → .../check_static_recursion_foreign_helper.rs b/.../check_static_recursion_foreign_helper.rs → .../check_static_recursion_foreign_helper.rs
diff --git a/...s/ui/check-static-immutable-mut-slices.rs → .../ui/statics/check-immutable-mut-slices.rs b/...s/ui/check-static-immutable-mut-slices.rs → .../ui/statics/check-immutable-mut-slices.rs
diff --git a/.../check-static-immutable-mut-slices.stderr → ...statics/check-immutable-mut-slices.stderr b/.../check-static-immutable-mut-slices.stderr → ...statics/check-immutable-mut-slices.stderr
@@ -1,5 +1,5 @@
 error[E0764]: mutable references are not allowed in the final value of statics
-  --> $DIR/check-static-immutable-mut-slices.rs:3:37
+  --> $DIR/check-immutable-mut-slices.rs:3:37
    |
 LL | static TEST: &'static mut [isize] = &mut [];
    |                                     ^^^^^^^

diff --git a/tests/ui/check-static-recursion-foreign.rs → tests/ui/statics/check-recursion-foreign.rs b/tests/ui/check-static-recursion-foreign.rs → tests/ui/statics/check-recursion-foreign.rs
diff --git a/tests/ui/check-static-values-constraints.rs → tests/ui/statics/check-values-constraints.rs b/tests/ui/check-static-values-constraints.rs → tests/ui/statics/check-values-constraints.rs
diff --git a/...ui/check-static-values-constraints.stderr → ...i/statics/check-values-constraints.stderr b/...ui/check-static-values-constraints.stderr → ...i/statics/check-values-constraints.stderr
@@ -1,5 +1,5 @@
 error[E0493]: destructor of `SafeStruct` cannot be evaluated at compile-time
-  --> $DIR/check-static-values-constraints.rs:64:7
+  --> $DIR/check-values-constraints.rs:64:7
    |
 LL |       ..SafeStruct {
    |  _______^
@@ -12,15 +12,15 @@ LL |   };
    |   - value is dropped here
 
 error[E0010]: allocations are not allowed in statics
-  --> $DIR/check-static-values-constraints.rs:81:33
+  --> $DIR/check-values-constraints.rs:81:33
    |
 LL | static STATIC11: Vec<MyOwned> = vec![MyOwned];
    |                                 ^^^^^^^^^^^^^ allocation not allowed in statics
    |
    = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0015]: cannot call non-const fn `slice::<impl [MyOwned]>::into_vec::<std::alloc::Global>` in statics
-  --> $DIR/check-static-values-constraints.rs:81:33
+  --> $DIR/check-values-constraints.rs:81:33
    |
 LL | static STATIC11: Vec<MyOwned> = vec![MyOwned];
    |                                 ^^^^^^^^^^^^^
@@ -30,7 +30,7 @@ LL | static STATIC11: Vec<MyOwned> = vec![MyOwned];
    = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0015]: cannot call non-const fn `<str as ToString>::to_string` in statics
-  --> $DIR/check-static-values-constraints.rs:92:38
+  --> $DIR/check-values-constraints.rs:92:38
    |
 LL |     field2: SafeEnum::Variant4("str".to_string()),
    |                                      ^^^^^^^^^^^
@@ -43,15 +43,15 @@ LL + #![feature(const_trait_impl)]
    |
 
 error[E0010]: allocations are not allowed in statics
-  --> $DIR/check-static-values-constraints.rs:96:5
+  --> $DIR/check-values-constraints.rs:96:5
    |
 LL |     vec![MyOwned],
    |     ^^^^^^^^^^^^^ allocation not allowed in statics
    |
    = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0015]: cannot call non-const fn `slice::<impl [MyOwned]>::into_vec::<std::alloc::Global>` in statics
-  --> $DIR/check-static-values-constraints.rs:96:5
+  --> $DIR/check-values-constraints.rs:96:5
    |
 LL |     vec![MyOwned],
    |     ^^^^^^^^^^^^^
@@ -61,15 +61,15 @@ LL |     vec![MyOwned],
    = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0010]: allocations are not allowed in statics
-  --> $DIR/check-static-values-constraints.rs:98:5
+  --> $DIR/check-values-constraints.rs:98:5
    |
 LL |     vec![MyOwned],
    |     ^^^^^^^^^^^^^ allocation not allowed in statics
    |
    = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0015]: cannot call non-const fn `slice::<impl [MyOwned]>::into_vec::<std::alloc::Global>` in statics
-  --> $DIR/check-static-values-constraints.rs:98:5
+  --> $DIR/check-values-constraints.rs:98:5
    |
 LL |     vec![MyOwned],
    |     ^^^^^^^^^^^^^
@@ -79,15 +79,15 @@ LL |     vec![MyOwned],
    = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0010]: allocations are not allowed in statics
-  --> $DIR/check-static-values-constraints.rs:103:6
+  --> $DIR/check-values-constraints.rs:103:6
    |
 LL |     &vec![MyOwned],
    |      ^^^^^^^^^^^^^ allocation not allowed in statics
    |
    = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0015]: cannot call non-const fn `slice::<impl [MyOwned]>::into_vec::<std::alloc::Global>` in statics
-  --> $DIR/check-static-values-constraints.rs:103:6
+  --> $DIR/check-values-constraints.rs:103:6
    |
 LL |     &vec![MyOwned],
    |      ^^^^^^^^^^^^^
@@ -97,15 +97,15 @@ LL |     &vec![MyOwned],
    = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0010]: allocations are not allowed in statics
-  --> $DIR/check-static-values-constraints.rs:105:6
+  --> $DIR/check-values-constraints.rs:105:6
    |
 LL |     &vec![MyOwned],
    |      ^^^^^^^^^^^^^ allocation not allowed in statics
    |
    = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0015]: cannot call non-const fn `slice::<impl [MyOwned]>::into_vec::<std::alloc::Global>` in statics
-  --> $DIR/check-static-values-constraints.rs:105:6
+  --> $DIR/check-values-constraints.rs:105:6
    |
 LL |     &vec![MyOwned],
    |      ^^^^^^^^^^^^^
@@ -115,15 +115,15 @@ LL |     &vec![MyOwned],
    = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0010]: allocations are not allowed in statics
-  --> $DIR/check-static-values-constraints.rs:111:31
+  --> $DIR/check-values-constraints.rs:111:31
    |
 LL | static STATIC19: Vec<isize> = vec![3];
    |                               ^^^^^^^ allocation not allowed in statics
    |
    = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0015]: cannot call non-const fn `slice::<impl [isize]>::into_vec::<std::alloc::Global>` in statics
-  --> $DIR/check-static-values-constraints.rs:111:31
+  --> $DIR/check-values-constraints.rs:111:31
    |
 LL | static STATIC19: Vec<isize> = vec![3];
    |                               ^^^^^^^
@@ -133,15 +133,15 @@ LL | static STATIC19: Vec<isize> = vec![3];
    = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0010]: allocations are not allowed in statics
-  --> $DIR/check-static-values-constraints.rs:117:32
+  --> $DIR/check-values-constraints.rs:117:32
    |
 LL |         static x: Vec<isize> = vec![3];
    |                                ^^^^^^^ allocation not allowed in statics
    |
    = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0015]: cannot call non-const fn `slice::<impl [isize]>::into_vec::<std::alloc::Global>` in statics
-  --> $DIR/check-static-values-constraints.rs:117:32
+  --> $DIR/check-values-constraints.rs:117:32
    |
 LL |         static x: Vec<isize> = vec![3];
    |                                ^^^^^^^
@@ -151,7 +151,7 @@ LL |         static x: Vec<isize> = vec![3];
    = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0507]: cannot move out of static item `x`
-  --> $DIR/check-static-values-constraints.rs:119:9
+  --> $DIR/check-values-constraints.rs:119:9
    |
 LL |         x
    |         ^ move occurs because `x` has type `Vec<isize>`, which does not implement the `Copy` trait

diff --git a/...s/ui/dont-suggest-private-trait-method.rs → ...ions/dont-suggest-private-trait-method.rs b/...s/ui/dont-suggest-private-trait-method.rs → ...ions/dont-suggest-private-trait-method.rs
diff --git a/.../dont-suggest-private-trait-method.stderr → .../dont-suggest-private-trait-method.stderr b/.../dont-suggest-private-trait-method.stderr → .../dont-suggest-private-trait-method.stderr
diff --git a/tests/ui/suggest-null-ptr.fixed → tests/ui/suggestions/suggest-null-ptr.fixed b/tests/ui/suggest-null-ptr.fixed → tests/ui/suggestions/suggest-null-ptr.fixed
diff --git a/tests/ui/suggest-null-ptr.rs → tests/ui/suggestions/suggest-null-ptr.rs b/tests/ui/suggest-null-ptr.rs → tests/ui/suggestions/suggest-null-ptr.rs
diff --git a/tests/ui/suggest-null-ptr.stderr → tests/ui/suggestions/suggest-null-ptr.stderr b/tests/ui/suggest-null-ptr.stderr → tests/ui/suggestions/suggest-null-ptr.stderr
diff --git a/tests/ui/trait-impl-bound-suggestions.fixed → ...stions/trait-impl-bound-suggestions.fixed b/tests/ui/trait-impl-bound-suggestions.fixed → ...stions/trait-impl-bound-suggestions.fixed
diff --git a/tests/ui/trait-impl-bound-suggestions.rs → ...ggestions/trait-impl-bound-suggestions.rs b/tests/ui/trait-impl-bound-suggestions.rs → ...ggestions/trait-impl-bound-suggestions.rs
diff --git a/tests/ui/trait-impl-bound-suggestions.stderr → ...tions/trait-impl-bound-suggestions.stderr b/tests/ui/trait-impl-bound-suggestions.stderr → ...tions/trait-impl-bound-suggestions.stderr
diff --git a/tests/ui/tool_lints-fail.rs → tests/ui/tool-attributes/tool_lints-fail.rs b/tests/ui/tool_lints-fail.rs → tests/ui/tool-attributes/tool_lints-fail.rs
diff --git a/tests/ui/tool_lints-fail.stderr → ...ui/tool-attributes/tool_lints-fail.stderr b/tests/ui/tool_lints-fail.stderr → ...ui/tool-attributes/tool_lints-fail.stderr
diff --git a/tests/ui/tool_lints-rpass.rs → tests/ui/tool-attributes/tool_lints-rpass.rs b/tests/ui/tool_lints-rpass.rs → tests/ui/tool-attributes/tool_lints-rpass.rs
diff --git a/tests/ui/tool_lints.rs → tests/ui/tool-attributes/tool_lints.rs b/tests/ui/tool_lints.rs → tests/ui/tool-attributes/tool_lints.rs
diff --git a/tests/ui/tool_lints.stderr → tests/ui/tool-attributes/tool_lints.stderr b/tests/ui/tool_lints.stderr → tests/ui/tool-attributes/tool_lints.stderr
diff --git a/tests/ui/tool_lints_2018_preview.rs → ...ool-attributes/tool_lints_2018_preview.rs b/tests/ui/tool_lints_2018_preview.rs → ...ool-attributes/tool_lints_2018_preview.rs
diff --git a/tests/ui/unknown-lint-tool-name.rs → ...tool-attributes/unknown-lint-tool-name.rs b/tests/ui/unknown-lint-tool-name.rs → ...tool-attributes/unknown-lint-tool-name.rs
diff --git a/tests/ui/unknown-lint-tool-name.stderr → ...-attributes/unknown-lint-tool-name.stderr b/tests/ui/unknown-lint-tool-name.stderr → ...-attributes/unknown-lint-tool-name.stderr
diff --git a/tests/ui/unknown-tool-name.rs → ...s/ui/tool-attributes/unknown-tool-name.rs b/tests/ui/unknown-tool-name.rs → ...s/ui/tool-attributes/unknown-tool-name.rs
diff --git a/tests/ui/unknown-tool-name.stderr → .../tool-attributes/unknown-tool-name.stderr b/tests/ui/unknown-tool-name.stderr → .../tool-attributes/unknown-tool-name.stderr
diff --git a/tests/ui/unop-move-semantics.rs → tests/ui/unop/unop-move-semantics.rs b/tests/ui/unop-move-semantics.rs → tests/ui/unop/unop-move-semantics.rs
diff --git a/tests/ui/unop-move-semantics.stderr → tests/ui/unop/unop-move-semantics.stderr b/tests/ui/unop-move-semantics.stderr → tests/ui/unop/unop-move-semantics.stderr
diff --git a/tests/ui/unop-neg-bool.rs → tests/ui/unop/unop-neg-bool.rs b/tests/ui/unop-neg-bool.rs → tests/ui/unop/unop-neg-bool.rs
diff --git a/tests/ui/unop-neg-bool.stderr → tests/ui/unop/unop-neg-bool.stderr b/tests/ui/unop-neg-bool.stderr → tests/ui/unop/unop-neg-bool.stderr