Auto merge of #89488 - c410-f3r:testsssssss, r=petrochenkov

Move some tests to more reasonable directories - 8 cc #73494 r? `@petrochenkov`
rust-lang · Nov 8, 2021 · 43192ca · 43192ca
2 parents 5fa94f3 + 7fd15f0
commit 43192ca
Show file tree

Hide file tree

Showing 260 changed files with 3 additions and 117 deletions.
diff --git a/src/test/ui/argument-passing.rs b/src/test/ui/argument-passing.rs
diff --git a/src/test/ui/mut-vstore-expr.rs → ...est/ui/array-slice-vec/mut-vstore-expr.rs b/src/test/ui/mut-vstore-expr.rs → ...est/ui/array-slice-vec/mut-vstore-expr.rs
diff --git a/src/test/ui/issues/issue-22066.rs → src/test/ui/associated-types/issue-22066.rs b/src/test/ui/issues/issue-22066.rs → src/test/ui/associated-types/issue-22066.rs
diff --git a/src/test/ui/issues/issue-22828.rs → src/test/ui/associated-types/issue-22828.rs b/src/test/ui/issues/issue-22828.rs → src/test/ui/associated-types/issue-22828.rs
diff --git a/src/test/ui/issues/issue-28871.rs → src/test/ui/associated-types/issue-28871.rs b/src/test/ui/issues/issue-28871.rs → src/test/ui/associated-types/issue-28871.rs
diff --git a/src/test/ui/issues/issue-47139-1.rs → ...test/ui/associated-types/issue-47139-1.rs b/src/test/ui/issues/issue-47139-1.rs → ...test/ui/associated-types/issue-47139-1.rs
diff --git a/src/test/ui/issues/issue-54467.rs → src/test/ui/associated-types/issue-54467.rs b/src/test/ui/issues/issue-54467.rs → src/test/ui/associated-types/issue-54467.rs
diff --git a/src/test/ui/issues/issue-73541-1.rs → src/test/ui/async-await/issue-73541-1.rs b/src/test/ui/issues/issue-73541-1.rs → src/test/ui/async-await/issue-73541-1.rs
diff --git a/src/test/ui/issues/issue-73541-1.stderr → src/test/ui/async-await/issue-73541-1.stderr b/src/test/ui/issues/issue-73541-1.stderr → src/test/ui/async-await/issue-73541-1.stderr
diff --git a/src/test/ui/issues/issue-40962.rs → src/test/ui/attributes/issue-40962.rs b/src/test/ui/issues/issue-40962.rs → src/test/ui/attributes/issue-40962.rs
diff --git a/src/test/ui/unrestricted-attribute-tokens.rs → ...tributes/unrestricted-attribute-tokens.rs b/src/test/ui/unrestricted-attribute-tokens.rs → ...tributes/unrestricted-attribute-tokens.rs
diff --git a/src/test/ui/structured-compare.rs → src/test/ui/binop/structured-compare.rs b/src/test/ui/structured-compare.rs → src/test/ui/binop/structured-compare.rs
diff --git a/src/test/ui/issues/issue-46095.rs → src/test/ui/borrowck/issue-46095.rs b/src/test/ui/issues/issue-46095.rs → src/test/ui/borrowck/issue-46095.rs
diff --git a/src/test/ui/new-box.rs → src/test/ui/box/new-box.rs b/src/test/ui/new-box.rs → src/test/ui/box/new-box.rs
diff --git a/src/test/ui/issues/issue-32201.rs → src/test/ui/c-variadic/issue-32201.rs b/src/test/ui/issues/issue-32201.rs → src/test/ui/c-variadic/issue-32201.rs
diff --git a/src/test/ui/issues/issue-32201.stderr → src/test/ui/c-variadic/issue-32201.stderr b/src/test/ui/issues/issue-32201.stderr → src/test/ui/c-variadic/issue-32201.stderr
diff --git a/src/test/ui/supported-cast.rs → src/test/ui/cast/supported-cast.rs b/src/test/ui/supported-cast.rs → src/test/ui/cast/supported-cast.rs
diff --git a/src/test/ui/issues/issue-10398.rs → src/test/ui/closures/issue-10398.rs b/src/test/ui/issues/issue-10398.rs → src/test/ui/closures/issue-10398.rs
diff --git a/src/test/ui/issues/issue-10398.stderr → src/test/ui/closures/issue-10398.stderr b/src/test/ui/issues/issue-10398.stderr → src/test/ui/closures/issue-10398.stderr
diff --git a/src/test/ui/issues/issue-42463.rs → src/test/ui/closures/issue-42463.rs b/src/test/ui/issues/issue-42463.rs → src/test/ui/closures/issue-42463.rs
diff --git a/src/test/ui/issues/auxiliary/issue-39823.rs → ...test/ui/coercion/auxiliary/issue-39823.rs b/src/test/ui/issues/auxiliary/issue-39823.rs → ...test/ui/coercion/auxiliary/issue-39823.rs
diff --git a/src/test/ui/issues/issue-14589.rs → src/test/ui/coercion/issue-14589.rs b/src/test/ui/issues/issue-14589.rs → src/test/ui/coercion/issue-14589.rs
diff --git a/src/test/ui/issues/issue-39823.rs → src/test/ui/coercion/issue-39823.rs b/src/test/ui/issues/issue-39823.rs → src/test/ui/coercion/issue-39823.rs
diff --git a/src/test/ui/issues/issue-73886.rs → src/test/ui/coercion/issue-73886.rs b/src/test/ui/issues/issue-73886.rs → src/test/ui/coercion/issue-73886.rs
diff --git a/src/test/ui/issues/issue-73886.stderr → src/test/ui/coercion/issue-73886.stderr b/src/test/ui/issues/issue-73886.stderr → src/test/ui/coercion/issue-73886.stderr
diff --git a/src/test/ui/issues/issue-34028.rs → ...ui/conditional-compilation/issue-34028.rs b/src/test/ui/issues/issue-34028.rs → ...ui/conditional-compilation/issue-34028.rs
diff --git a/...est/ui/auxiliary/legacy-const-generics.rs → ...nerics/auxiliary/legacy-const-generics.rs b/...est/ui/auxiliary/legacy-const-generics.rs → ...nerics/auxiliary/legacy-const-generics.rs
diff --git a/src/test/ui/legacy-const-generics-bad.rs → ...nst-generics/legacy-const-generics-bad.rs b/src/test/ui/legacy-const-generics-bad.rs → ...nst-generics/legacy-const-generics-bad.rs
diff --git a/src/test/ui/legacy-const-generics-bad.stderr → ...generics/legacy-const-generics-bad.stderr b/src/test/ui/legacy-const-generics-bad.stderr → ...generics/legacy-const-generics-bad.stderr
diff --git a/src/test/ui/legacy-const-generics.rs → ...i/const-generics/legacy-const-generics.rs b/src/test/ui/legacy-const-generics.rs → ...i/const-generics/legacy-const-generics.rs
diff --git a/src/test/ui/issues/issue-13902.rs → src/test/ui/consts/issue-13902.rs b/src/test/ui/issues/issue-13902.rs → src/test/ui/consts/issue-13902.rs
diff --git a/src/test/ui/issues/issue-17074.rs → src/test/ui/consts/issue-17074.rs b/src/test/ui/issues/issue-17074.rs → src/test/ui/consts/issue-17074.rs
diff --git a/src/test/ui/issues/issue-18294.rs → src/test/ui/consts/issue-18294.rs b/src/test/ui/issues/issue-18294.rs → src/test/ui/consts/issue-18294.rs
diff --git a/src/test/ui/issues/issue-18294.stderr → src/test/ui/consts/issue-18294.stderr b/src/test/ui/issues/issue-18294.stderr → src/test/ui/consts/issue-18294.stderr
diff --git a/.../issues/issue-23968-const-not-overflow.rs → .../consts/issue-23968-const-not-overflow.rs b/.../issues/issue-23968-const-not-overflow.rs → .../consts/issue-23968-const-not-overflow.rs
diff --git a/src/test/ui/issues/issue-37550.rs → src/test/ui/consts/issue-37550-1.rs b/src/test/ui/issues/issue-37550.rs → src/test/ui/consts/issue-37550-1.rs
diff --git a/src/test/ui/issues/issue-37550.stderr → src/test/ui/consts/issue-37550-1.stderr b/src/test/ui/issues/issue-37550.stderr → src/test/ui/consts/issue-37550-1.stderr
@@ -1,5 +1,5 @@
 error[E0658]: function pointers cannot appear in constant functions
-  --> $DIR/issue-37550.rs:3:9
+  --> $DIR/issue-37550-1.rs:3:9
    |
 LL |     let x = || t;
    |         ^

diff --git a/src/test/ui/issues/issue-37991.rs → src/test/ui/consts/issue-37991.rs b/src/test/ui/issues/issue-37991.rs → src/test/ui/consts/issue-37991.rs
diff --git a/src/test/ui/try-macro-suggestion.rs → ...st/ui/deprecation/try-macro-suggestion.rs b/src/test/ui/try-macro-suggestion.rs → ...st/ui/deprecation/try-macro-suggestion.rs
diff --git a/src/test/ui/try-macro-suggestion.stderr → ...i/deprecation/try-macro-suggestion.stderr b/src/test/ui/try-macro-suggestion.stderr → ...i/deprecation/try-macro-suggestion.stderr
diff --git a/src/test/ui/issues/issue-19358.rs → src/test/ui/deriving/issue-19358.rs b/src/test/ui/issues/issue-19358.rs → src/test/ui/deriving/issue-19358.rs
diff --git a/src/test/ui/issues/issue-58319.rs → src/test/ui/deriving/issue-58319.rs b/src/test/ui/issues/issue-58319.rs → src/test/ui/deriving/issue-58319.rs
diff --git a/src/test/ui/issues/issue-35546.rs → src/test/ui/drop/issue-35546.rs b/src/test/ui/issues/issue-35546.rs → src/test/ui/drop/issue-35546.rs
diff --git a/src/test/ui/terminate-in-initializer.rs → src/test/ui/drop/terminate-in-initializer.rs b/src/test/ui/terminate-in-initializer.rs → src/test/ui/drop/terminate-in-initializer.rs
diff --git a/...ues/issue-28498-ugeh-with-passed-to-fn.rs → ...pck/issue-28498-ugeh-with-passed-to-fn.rs b/...ues/issue-28498-ugeh-with-passed-to-fn.rs → ...pck/issue-28498-ugeh-with-passed-to-fn.rs
diff --git a/src/test/ui/epoch-gate-feature.rs → src/test/ui/editions/epoch-gate-feature.rs b/src/test/ui/epoch-gate-feature.rs → src/test/ui/editions/epoch-gate-feature.rs
diff --git a/src/test/ui/issues/issue-51582.rs → src/test/ui/enum-discriminant/issue-51582.rs b/src/test/ui/issues/issue-51582.rs → src/test/ui/enum-discriminant/issue-51582.rs
diff --git a/src/test/ui/issues/issue-42747.rs → src/test/ui/enum/issue-42747.rs b/src/test/ui/issues/issue-42747.rs → src/test/ui/enum/issue-42747.rs
diff --git a/src/test/ui/issues/issue-28324.mir.stderr → src/test/ui/extern/issue-28324.mir.stderr b/src/test/ui/issues/issue-28324.mir.stderr → src/test/ui/extern/issue-28324.mir.stderr
diff --git a/src/test/ui/issues/issue-28324.rs → src/test/ui/extern/issue-28324.rs b/src/test/ui/issues/issue-28324.rs → src/test/ui/extern/issue-28324.rs
diff --git a/src/test/ui/issues/issue-28324.thir.stderr → src/test/ui/extern/issue-28324.thir.stderr b/src/test/ui/issues/issue-28324.thir.stderr → src/test/ui/extern/issue-28324.thir.stderr
diff --git a/src/test/ui/issues/issue-51345.rs → src/test/ui/for-loop-while/issue-51345.rs b/src/test/ui/issues/issue-51345.rs → src/test/ui/for-loop-while/issue-51345.rs
diff --git a/src/test/ui/long-while.rs → src/test/ui/for-loop-while/long-while.rs b/src/test/ui/long-while.rs → src/test/ui/for-loop-while/long-while.rs
diff --git a/src/test/ui/nil-decl-in-foreign.rs → src/test/ui/foreign/nil-decl-in-foreign.rs b/src/test/ui/nil-decl-in-foreign.rs → src/test/ui/foreign/nil-decl-in-foreign.rs
diff --git a/src/test/ui/issues/issue-1112.rs → src/test/ui/generics/issue-1112.rs b/src/test/ui/issues/issue-1112.rs → src/test/ui/generics/issue-1112.rs
diff --git a/src/test/ui/issues/issue-333.rs → src/test/ui/generics/issue-333.rs b/src/test/ui/issues/issue-333.rs → src/test/ui/generics/issue-333.rs
diff --git a/src/test/ui/issues/issue-59508-1.rs → src/test/ui/generics/issue-59508-1.rs b/src/test/ui/issues/issue-59508-1.rs → src/test/ui/generics/issue-59508-1.rs
diff --git a/src/test/ui/issues/issue-59508-1.stderr → src/test/ui/generics/issue-59508-1.stderr b/src/test/ui/issues/issue-59508-1.stderr → src/test/ui/generics/issue-59508-1.stderr
diff --git a/src/test/ui/issues/issue-59508.fixed → src/test/ui/generics/issue-59508.fixed b/src/test/ui/issues/issue-59508.fixed → src/test/ui/generics/issue-59508.fixed
diff --git a/src/test/ui/issues/issue-59508.rs → src/test/ui/generics/issue-59508.rs b/src/test/ui/issues/issue-59508.rs → src/test/ui/generics/issue-59508.rs
diff --git a/src/test/ui/issues/issue-59508.stderr → src/test/ui/generics/issue-59508.stderr b/src/test/ui/issues/issue-59508.stderr → src/test/ui/generics/issue-59508.stderr
diff --git a/src/test/ui/issues/issue-60283.rs → ...i/higher-rank-trait-bounds/issue-60283.rs b/src/test/ui/issues/issue-60283.rs → ...i/higher-rank-trait-bounds/issue-60283.rs
diff --git a/src/test/ui/issues/issue-60283.stderr → ...gher-rank-trait-bounds/issue-60283.stderr b/src/test/ui/issues/issue-60283.stderr → ...gher-rank-trait-bounds/issue-60283.stderr
diff --git a/src/test/ui/lambda-var-hygiene.rs → src/test/ui/hygiene/lambda-var-hygiene.rs b/src/test/ui/lambda-var-hygiene.rs → src/test/ui/hygiene/lambda-var-hygiene.rs
diff --git a/src/test/ui/issues/issue-49579.rs → src/test/ui/impl-trait/issue-49579.rs b/src/test/ui/issues/issue-49579.rs → src/test/ui/impl-trait/issue-49579.rs
diff --git a/src/test/ui/issues/issue-49685.rs → src/test/ui/impl-trait/issue-49685.rs b/src/test/ui/issues/issue-49685.rs → src/test/ui/impl-trait/issue-49685.rs
diff --git a/src/test/ui/issues/issue-51185.rs → src/test/ui/impl-trait/issue-51185.rs b/src/test/ui/issues/issue-51185.rs → src/test/ui/impl-trait/issue-51185.rs
diff --git a/src/test/ui/in-band-lifetimes.rs → ...ui/in-band-lifetimes/in-band-lifetimes.rs b/src/test/ui/in-band-lifetimes.rs → ...ui/in-band-lifetimes/in-band-lifetimes.rs
diff --git a/...test/ui/lub-glb-with-unbound-infer-var.rs → ...ference/lub-glb-with-unbound-infer-var.rs b/...test/ui/lub-glb-with-unbound-infer-var.rs → ...ference/lub-glb-with-unbound-infer-var.rs
diff --git a/src/test/ui/issues/issue-2444.rs b/src/test/ui/issues/issue-2444.rs
diff --git a/src/test/ui/issues/issue-2748-b.rs b/src/test/ui/issues/issue-2748-b.rs
diff --git a/src/test/ui/issues/issue-3211.rs b/src/test/ui/issues/issue-3211.rs
diff --git a/src/test/ui/issues/issue-4401.rs b/src/test/ui/issues/issue-4401.rs
diff --git a/src/test/ui/issues/issue-50993.rs b/src/test/ui/issues/issue-50993.rs
diff --git a/src/test/ui/issues/issue-50993.stderr b/src/test/ui/issues/issue-50993.stderr
diff --git a/src/test/ui/issues/issue-811.rs b/src/test/ui/issues/issue-811.rs
diff --git a/src/test/ui/issues/issue-19660.rs → src/test/ui/lang-items/issue-19660.rs b/src/test/ui/issues/issue-19660.rs → src/test/ui/lang-items/issue-19660.rs
diff --git a/src/test/ui/issues/issue-19660.stderr → src/test/ui/lang-items/issue-19660.stderr b/src/test/ui/issues/issue-19660.stderr → src/test/ui/lang-items/issue-19660.stderr
diff --git a/src/test/ui/issues/issue-31076.rs → src/test/ui/lang-items/issue-31076.rs b/src/test/ui/issues/issue-31076.rs → src/test/ui/lang-items/issue-31076.rs
diff --git a/src/test/ui/issues/issue-31076.stderr → src/test/ui/lang-items/issue-31076.stderr b/src/test/ui/issues/issue-31076.stderr → src/test/ui/lang-items/issue-31076.stderr
diff --git a/src/test/ui/required-lang-item.rs → src/test/ui/lang-items/required-lang-item.rs b/src/test/ui/required-lang-item.rs → src/test/ui/lang-items/required-lang-item.rs
diff --git a/src/test/ui/required-lang-item.stderr → ...t/ui/lang-items/required-lang-item.stderr b/src/test/ui/required-lang-item.stderr → ...t/ui/lang-items/required-lang-item.stderr
diff --git a/src/test/ui/issues/issue-26638.rs → src/test/ui/lifetimes/issue-26638.rs b/src/test/ui/issues/issue-26638.rs → src/test/ui/lifetimes/issue-26638.rs
diff --git a/src/test/ui/issues/issue-26638.stderr → src/test/ui/lifetimes/issue-26638.stderr b/src/test/ui/issues/issue-26638.stderr → src/test/ui/lifetimes/issue-26638.stderr
diff --git a/src/test/ui/issues/issue-14837.rs → src/test/ui/lint/issue-14837.rs b/src/test/ui/issues/issue-14837.rs → src/test/ui/lint/issue-14837.rs
diff --git a/src/test/ui/issues/issue-57410-1.rs → src/test/ui/lint/issue-57410-1.rs b/src/test/ui/issues/issue-57410-1.rs → src/test/ui/lint/issue-57410-1.rs
diff --git a/src/test/ui/issues/issue-63364.rs → src/test/ui/lint/issue-63364.rs b/src/test/ui/issues/issue-63364.rs → src/test/ui/lint/issue-63364.rs
diff --git a/src/test/ui/issues/issue-63364.stderr → src/test/ui/lint/issue-63364.stderr b/src/test/ui/issues/issue-63364.stderr → src/test/ui/lint/issue-63364.stderr
diff --git a/src/test/ui/unnecessary-extern-crate.rs → src/test/ui/lint/unnecessary-extern-crate.rs b/src/test/ui/unnecessary-extern-crate.rs → src/test/ui/lint/unnecessary-extern-crate.rs
diff --git a/src/test/ui/unnecessary-extern-crate.stderr → ...t/ui/lint/unnecessary-extern-crate.stderr b/src/test/ui/unnecessary-extern-crate.stderr → ...t/ui/lint/unnecessary-extern-crate.stderr
diff --git a/src/test/ui/warn-ctypes-inhibit.rs → src/test/ui/lint/warn-ctypes-inhibit.rs b/src/test/ui/warn-ctypes-inhibit.rs → src/test/ui/lint/warn-ctypes-inhibit.rs
diff --git a/src/test/ui/issues/issue-23458.rs → src/test/ui/llvm-asm/issue-23458.rs b/src/test/ui/issues/issue-23458.rs → src/test/ui/llvm-asm/issue-23458.rs
diff --git a/src/test/ui/issues/issue-23458.stderr → src/test/ui/llvm-asm/issue-23458.stderr b/src/test/ui/issues/issue-23458.stderr → src/test/ui/llvm-asm/issue-23458.stderr
diff --git a/src/test/ui/issues/issue-37366.rs → src/test/ui/llvm-asm/issue-37366.rs b/src/test/ui/issues/issue-37366.rs → src/test/ui/llvm-asm/issue-37366.rs
diff --git a/...ues/issue-53787-inline-assembler-macro.rs → ...asm/issue-53787-inline-assembler-macro.rs b/...ues/issue-53787-inline-assembler-macro.rs → ...asm/issue-53787-inline-assembler-macro.rs
diff --git a/...issue-53787-inline-assembler-macro.stderr → ...issue-53787-inline-assembler-macro.stderr b/...issue-53787-inline-assembler-macro.stderr → ...issue-53787-inline-assembler-macro.stderr
diff --git a/src/test/ui/thinlto/all-crates.rs → src/test/ui/lto/all-crates.rs b/src/test/ui/thinlto/all-crates.rs → src/test/ui/lto/all-crates.rs
diff --git a/src/test/ui/thinlto/auxiliary/dylib.rs → src/test/ui/lto/auxiliary/dylib.rs b/src/test/ui/thinlto/auxiliary/dylib.rs → src/test/ui/lto/auxiliary/dylib.rs
diff --git a/...st/ui/auxiliary/lto-duplicate-symbols1.rs → ...i/lto/auxiliary/lto-duplicate-symbols1.rs b/...st/ui/auxiliary/lto-duplicate-symbols1.rs → ...i/lto/auxiliary/lto-duplicate-symbols1.rs
diff --git a/...st/ui/auxiliary/lto-duplicate-symbols2.rs → ...i/lto/auxiliary/lto-duplicate-symbols2.rs b/...st/ui/auxiliary/lto-duplicate-symbols2.rs → ...i/lto/auxiliary/lto-duplicate-symbols2.rs
diff --git a/...uxiliary/lto-rustc-loads-linker-plugin.rs → ...uxiliary/lto-rustc-loads-linker-plugin.rs b/...uxiliary/lto-rustc-loads-linker-plugin.rs → ...uxiliary/lto-rustc-loads-linker-plugin.rs
diff --git a/.../ui/thinlto/auxiliary/msvc-imp-present.rs → ...test/ui/lto/auxiliary/msvc-imp-present.rs b/.../ui/thinlto/auxiliary/msvc-imp-present.rs → ...test/ui/lto/auxiliary/msvc-imp-present.rs
diff --git a/...thinlto/auxiliary/thin-lto-inlines-aux.rs → .../ui/lto/auxiliary/thin-lto-inlines-aux.rs b/...thinlto/auxiliary/thin-lto-inlines-aux.rs → .../ui/lto/auxiliary/thin-lto-inlines-aux.rs
diff --git a/src/test/ui/thinlto/dylib-works.rs → src/test/ui/lto/dylib-works.rs b/src/test/ui/thinlto/dylib-works.rs → src/test/ui/lto/dylib-works.rs
diff --git a/src/test/ui/lto-and-no-bitcode-in-rlib.rs → ...test/ui/lto/lto-and-no-bitcode-in-rlib.rs b/src/test/ui/lto-and-no-bitcode-in-rlib.rs → ...test/ui/lto/lto-and-no-bitcode-in-rlib.rs
diff --git a/...test/ui/lto-and-no-bitcode-in-rlib.stderr → .../ui/lto/lto-and-no-bitcode-in-rlib.stderr b/...test/ui/lto-and-no-bitcode-in-rlib.stderr → .../ui/lto/lto-and-no-bitcode-in-rlib.stderr
diff --git a/src/test/ui/lto-duplicate-symbols.rs → src/test/ui/lto/lto-duplicate-symbols.rs b/src/test/ui/lto-duplicate-symbols.rs → src/test/ui/lto/lto-duplicate-symbols.rs
diff --git a/src/test/ui/lto-duplicate-symbols.stderr → src/test/ui/lto/lto-duplicate-symbols.stderr b/src/test/ui/lto-duplicate-symbols.stderr → src/test/ui/lto/lto-duplicate-symbols.stderr
diff --git a/src/test/ui/lto-many-codegen-units.rs → src/test/ui/lto/lto-many-codegen-units.rs b/src/test/ui/lto-many-codegen-units.rs → src/test/ui/lto/lto-many-codegen-units.rs
diff --git a/src/test/ui/lto-opt-level-s.rs → src/test/ui/lto/lto-opt-level-s.rs b/src/test/ui/lto-opt-level-s.rs → src/test/ui/lto/lto-opt-level-s.rs
diff --git a/src/test/ui/lto-opt-level-z.rs → src/test/ui/lto/lto-opt-level-z.rs b/src/test/ui/lto-opt-level-z.rs → src/test/ui/lto/lto-opt-level-z.rs
diff --git a/src/test/ui/lto-rustc-loads-linker-plugin.rs → ...t/ui/lto/lto-rustc-loads-linker-plugin.rs b/src/test/ui/lto-rustc-loads-linker-plugin.rs → ...t/ui/lto/lto-rustc-loads-linker-plugin.rs
diff --git a/src/test/ui/lto-still-runs-thread-dtors.rs → ...est/ui/lto/lto-still-runs-thread-dtors.rs b/src/test/ui/lto-still-runs-thread-dtors.rs → ...est/ui/lto/lto-still-runs-thread-dtors.rs
diff --git a/.../ui/lto-thin-rustc-loads-linker-plugin.rs → ...lto/lto-thin-rustc-loads-linker-plugin.rs b/.../ui/lto-thin-rustc-loads-linker-plugin.rs → ...lto/lto-thin-rustc-loads-linker-plugin.rs
diff --git a/src/test/ui/thinlto/msvc-imp-present.rs → src/test/ui/lto/msvc-imp-present.rs b/src/test/ui/thinlto/msvc-imp-present.rs → src/test/ui/lto/msvc-imp-present.rs
diff --git a/src/test/ui/thin-lto-global-allocator.rs → src/test/ui/lto/thin-lto-global-allocator.rs b/src/test/ui/thin-lto-global-allocator.rs → src/test/ui/lto/thin-lto-global-allocator.rs
diff --git a/src/test/ui/thinlto/thin-lto-inlines.rs → src/test/ui/lto/thin-lto-inlines.rs b/src/test/ui/thinlto/thin-lto-inlines.rs → src/test/ui/lto/thin-lto-inlines.rs
diff --git a/src/test/ui/thinlto/thin-lto-inlines2.rs → src/test/ui/lto/thin-lto-inlines2.rs b/src/test/ui/thinlto/thin-lto-inlines2.rs → src/test/ui/lto/thin-lto-inlines2.rs
diff --git a/src/test/ui/thinlto/weak-works.rs → src/test/ui/lto/weak-works.rs b/src/test/ui/thinlto/weak-works.rs → src/test/ui/lto/weak-works.rs
diff --git a/src/test/ui/issues/auxiliary/issue-19163.rs → src/test/ui/macros/auxiliary/issue-19163.rs b/src/test/ui/issues/auxiliary/issue-19163.rs → src/test/ui/macros/auxiliary/issue-19163.rs
diff --git a/src/test/ui/issues/issue-16098.rs → src/test/ui/macros/issue-16098.rs b/src/test/ui/issues/issue-16098.rs → src/test/ui/macros/issue-16098.rs
diff --git a/src/test/ui/issues/issue-16098.stderr → src/test/ui/macros/issue-16098.stderr b/src/test/ui/issues/issue-16098.stderr → src/test/ui/macros/issue-16098.stderr
diff --git a/src/test/ui/issues/issue-19163.rs → src/test/ui/macros/issue-19163.rs b/src/test/ui/issues/issue-19163.rs → src/test/ui/macros/issue-19163.rs
diff --git a/src/test/ui/issues/issue-19163.stderr → src/test/ui/macros/issue-19163.stderr b/src/test/ui/issues/issue-19163.stderr → src/test/ui/macros/issue-19163.stderr
diff --git a/src/test/ui/issues/issue-21356.rs → src/test/ui/macros/issue-21356.rs b/src/test/ui/issues/issue-21356.rs → src/test/ui/macros/issue-21356.rs
diff --git a/src/test/ui/issues/issue-21356.stderr → src/test/ui/macros/issue-21356.stderr b/src/test/ui/issues/issue-21356.stderr → src/test/ui/macros/issue-21356.stderr
diff --git a/src/test/ui/issues/issue-22463.rs → src/test/ui/macros/issue-22463.rs b/src/test/ui/issues/issue-22463.rs → src/test/ui/macros/issue-22463.rs
diff --git a/src/test/ui/issues/issue-29084.rs → src/test/ui/macros/issue-29084.rs b/src/test/ui/issues/issue-29084.rs → src/test/ui/macros/issue-29084.rs
diff --git a/src/test/ui/issues/issue-29084.stderr → src/test/ui/macros/issue-29084.stderr b/src/test/ui/issues/issue-29084.stderr → src/test/ui/macros/issue-29084.stderr
diff --git a/src/test/ui/issues/issue-34171.rs → src/test/ui/macros/issue-34171.rs b/src/test/ui/issues/issue-34171.rs → src/test/ui/macros/issue-34171.rs
diff --git a/src/test/ui/issues/issue-37175.rs → src/test/ui/macros/issue-37175.rs b/src/test/ui/issues/issue-37175.rs → src/test/ui/macros/issue-37175.rs
diff --git a/src/test/ui/issues/issue-39388.rs → src/test/ui/macros/issue-39388.rs b/src/test/ui/issues/issue-39388.rs → src/test/ui/macros/issue-39388.rs
diff --git a/src/test/ui/issues/issue-39388.stderr → src/test/ui/macros/issue-39388.stderr b/src/test/ui/issues/issue-39388.stderr → src/test/ui/macros/issue-39388.stderr
diff --git a/src/test/ui/issues/issue-40770.rs → src/test/ui/macros/issue-40770.rs b/src/test/ui/issues/issue-40770.rs → src/test/ui/macros/issue-40770.rs
diff --git a/src/test/ui/issues/issue-57597.rs → src/test/ui/macros/issue-57597.rs b/src/test/ui/issues/issue-57597.rs → src/test/ui/macros/issue-57597.rs
diff --git a/src/test/ui/issues/issue-57597.stderr → src/test/ui/macros/issue-57597.stderr b/src/test/ui/issues/issue-57597.stderr → src/test/ui/macros/issue-57597.stderr
diff --git a/src/test/ui/issues/issue-6596-1.rs → src/test/ui/macros/issue-6596-1.rs b/src/test/ui/issues/issue-6596-1.rs → src/test/ui/macros/issue-6596-1.rs
diff --git a/src/test/ui/issues/issue-6596-1.stderr → src/test/ui/macros/issue-6596-1.stderr b/src/test/ui/issues/issue-6596-1.stderr → src/test/ui/macros/issue-6596-1.stderr
diff --git a/src/test/ui/issues/issue-86865.rs → src/test/ui/macros/issue-86865.rs b/src/test/ui/issues/issue-86865.rs → src/test/ui/macros/issue-86865.rs
diff --git a/src/test/ui/issues/issue-86865.stderr → src/test/ui/macros/issue-86865.stderr b/src/test/ui/issues/issue-86865.stderr → src/test/ui/macros/issue-86865.stderr
diff --git a/src/test/ui/trace_macros-format.rs → src/test/ui/macros/trace_macros-format.rs b/src/test/ui/trace_macros-format.rs → src/test/ui/macros/trace_macros-format.rs
diff --git a/src/test/ui/trace_macros-format.stderr → ...test/ui/macros/trace_macros-format.stderr b/src/test/ui/trace_macros-format.stderr → ...test/ui/macros/trace_macros-format.stderr
diff --git a/...ap-doesnt-conflict-with-specialization.rs → ...ap-doesnt-conflict-with-specialization.rs b/...ap-doesnt-conflict-with-specialization.rs → ...ap-doesnt-conflict-with-specialization.rs
diff --git a/...oesnt-conflict-with-specialization.stderr → ...oesnt-conflict-with-specialization.stderr b/...oesnt-conflict-with-specialization.stderr → ...oesnt-conflict-with-specialization.stderr
diff --git a/...-permitted-for-annotated-marker-traits.rs → ...-permitted-for-annotated-marker-traits.rs b/...-permitted-for-annotated-marker-traits.rs → ...-permitted-for-annotated-marker-traits.rs
diff --git a/src/test/ui/issues/issue-11940.rs → src/test/ui/match/issue-11940.rs b/src/test/ui/issues/issue-11940.rs → src/test/ui/match/issue-11940.rs
diff --git a/src/test/ui/issues/issue-18060.rs → src/test/ui/match/issue-18060.rs b/src/test/ui/issues/issue-18060.rs → src/test/ui/match/issue-18060.rs
diff --git a/src/test/ui/issues/issue-26251.rs → src/test/ui/match/issue-26251.rs b/src/test/ui/issues/issue-26251.rs → src/test/ui/match/issue-26251.rs
diff --git a/src/test/ui/issues/issue-26996.rs → src/test/ui/match/issue-26996.rs b/src/test/ui/issues/issue-26996.rs → src/test/ui/match/issue-26996.rs
diff --git a/src/test/ui/issues/issue-42679.rs → src/test/ui/match/issue-42679.rs b/src/test/ui/issues/issue-42679.rs → src/test/ui/match/issue-42679.rs
diff --git a/src/test/ui/issues/issue-74739.rs → src/test/ui/mir/issue-74739.rs b/src/test/ui/issues/issue-74739.rs → src/test/ui/mir/issue-74739.rs
diff --git a/src/test/ui/negative.rs b/src/test/ui/negative.rs
diff --git a/src/test/ui/diverging-tuple-parts-39485.rs → ...never_type/diverging-tuple-parts-39485.rs b/src/test/ui/diverging-tuple-parts-39485.rs → ...never_type/diverging-tuple-parts-39485.rs
diff --git a/...est/ui/diverging-tuple-parts-39485.stderr → ...r_type/diverging-tuple-parts-39485.stderr b/...est/ui/diverging-tuple-parts-39485.stderr → ...r_type/diverging-tuple-parts-39485.stderr
diff --git a/src/test/ui/unary-minus-suffix-inference.rs → ...rithmetic/unary-minus-suffix-inference.rs b/src/test/ui/unary-minus-suffix-inference.rs → ...rithmetic/unary-minus-suffix-inference.rs
diff --git a/src/test/ui/issues/issue-45152.rs → src/test/ui/packed/issue-46152.rs b/src/test/ui/issues/issue-45152.rs → src/test/ui/packed/issue-46152.rs
diff --git a/src/test/ui/bastion-of-the-turbofish.rs → ...est/ui/parser/bastion-of-the-turbofish.rs b/src/test/ui/bastion-of-the-turbofish.rs → ...est/ui/parser/bastion-of-the-turbofish.rs
diff --git a/src/test/ui/issues/issue-13483.rs → src/test/ui/parser/issue-13483.rs b/src/test/ui/issues/issue-13483.rs → src/test/ui/parser/issue-13483.rs
diff --git a/src/test/ui/issues/issue-13483.stderr → src/test/ui/parser/issue-13483.stderr b/src/test/ui/issues/issue-13483.stderr → src/test/ui/parser/issue-13483.stderr
diff --git a/src/test/ui/issues/issue-20616-4.rs → src/test/ui/parser/issue-20616-4.rs b/src/test/ui/issues/issue-20616-4.rs → src/test/ui/parser/issue-20616-4.rs
diff --git a/src/test/ui/issues/issue-20616-4.stderr → src/test/ui/parser/issue-20616-4.stderr b/src/test/ui/issues/issue-20616-4.stderr → src/test/ui/parser/issue-20616-4.stderr
diff --git a/src/test/ui/issues/issue-20616-5.rs → src/test/ui/parser/issue-20616-5.rs b/src/test/ui/issues/issue-20616-5.rs → src/test/ui/parser/issue-20616-5.rs
diff --git a/src/test/ui/issues/issue-20616-5.stderr → src/test/ui/parser/issue-20616-5.stderr b/src/test/ui/issues/issue-20616-5.stderr → src/test/ui/parser/issue-20616-5.stderr
diff --git a/src/test/ui/issues/issue-20616-6.rs → src/test/ui/parser/issue-20616-6.rs b/src/test/ui/issues/issue-20616-6.rs → src/test/ui/parser/issue-20616-6.rs
diff --git a/src/test/ui/issues/issue-20616-6.stderr → src/test/ui/parser/issue-20616-6.stderr b/src/test/ui/issues/issue-20616-6.stderr → src/test/ui/parser/issue-20616-6.stderr
diff --git a/src/test/ui/issues/issue-20616-7.rs → src/test/ui/parser/issue-20616-7.rs b/src/test/ui/issues/issue-20616-7.rs → src/test/ui/parser/issue-20616-7.rs
diff --git a/src/test/ui/issues/issue-20616-7.stderr → src/test/ui/parser/issue-20616-7.stderr b/src/test/ui/issues/issue-20616-7.stderr → src/test/ui/parser/issue-20616-7.stderr
diff --git a/src/test/ui/issues/issue-21475.rs → src/test/ui/parser/issue-21475.rs b/src/test/ui/issues/issue-21475.rs → src/test/ui/parser/issue-21475.rs
diff --git a/src/test/ui/issues/issue-31804.rs → src/test/ui/parser/issue-31804.rs b/src/test/ui/issues/issue-31804.rs → src/test/ui/parser/issue-31804.rs
diff --git a/src/test/ui/issues/issue-31804.stderr → src/test/ui/parser/issue-31804.stderr b/src/test/ui/issues/issue-31804.stderr → src/test/ui/parser/issue-31804.stderr
diff --git a/src/test/ui/issues/issue-34255-1.rs → src/test/ui/parser/issue-34255-1.rs b/src/test/ui/issues/issue-34255-1.rs → src/test/ui/parser/issue-34255-1.rs
diff --git a/src/test/ui/issues/issue-34255-1.stderr → src/test/ui/parser/issue-34255-1.stderr b/src/test/ui/issues/issue-34255-1.stderr → src/test/ui/parser/issue-34255-1.stderr
diff --git a/src/test/ui/issues/issue-49040.rs → src/test/ui/parser/issue-49040.rs b/src/test/ui/issues/issue-49040.rs → src/test/ui/parser/issue-49040.rs
diff --git a/src/test/ui/issues/issue-49040.stderr → src/test/ui/parser/issue-49040.stderr b/src/test/ui/issues/issue-49040.stderr → src/test/ui/parser/issue-49040.stderr
diff --git a/src/test/ui/issues/issue-56031.rs → src/test/ui/parser/issue-56031.rs b/src/test/ui/issues/issue-56031.rs → src/test/ui/parser/issue-56031.rs
diff --git a/src/test/ui/issues/issue-56031.stderr → src/test/ui/parser/issue-56031.stderr b/src/test/ui/issues/issue-56031.stderr → src/test/ui/parser/issue-56031.stderr
diff --git a/src/test/ui/issues/issue-11577.rs → src/test/ui/pattern/issue-11577.rs b/src/test/ui/issues/issue-11577.rs → src/test/ui/pattern/issue-11577.rs
diff --git a/src/test/ui/issues/issue-15080.rs → src/test/ui/pattern/issue-15080.rs b/src/test/ui/issues/issue-15080.rs → src/test/ui/pattern/issue-15080.rs
diff --git a/src/test/ui/issues/issue-72574-2.rs → src/test/ui/pattern/issue-72574-2.rs b/src/test/ui/issues/issue-72574-2.rs → src/test/ui/pattern/issue-72574-2.rs
diff --git a/src/test/ui/issues/issue-72574-2.stderr → src/test/ui/pattern/issue-72574-2.stderr b/src/test/ui/issues/issue-72574-2.stderr → src/test/ui/pattern/issue-72574-2.stderr
diff --git a/src/test/ui/issues/issue-8351-1.rs → src/test/ui/pattern/issue-8351-1.rs b/src/test/ui/issues/issue-8351-1.rs → src/test/ui/pattern/issue-8351-1.rs
diff --git a/src/test/ui/issues/issue-8351-2.rs → src/test/ui/pattern/issue-8351-2.rs b/src/test/ui/issues/issue-8351-2.rs → src/test/ui/pattern/issue-8351-2.rs
diff --git a/src/test/ui/issues/issue-14456.rs → src/test/ui/process/issue-14456.rs b/src/test/ui/issues/issue-14456.rs → src/test/ui/process/issue-14456.rs
diff --git a/src/test/ui/issues/issue-16272.rs → src/test/ui/process/issue-16272.rs b/src/test/ui/issues/issue-16272.rs → src/test/ui/process/issue-16272.rs
diff --git a/src/test/ui/issues/issue-20091.rs → src/test/ui/process/issue-20091.rs b/src/test/ui/issues/issue-20091.rs → src/test/ui/process/issue-20091.rs
diff --git a/src/test/ui/signal-exit-status.rs → src/test/ui/process/signal-exit-status.rs b/src/test/ui/signal-exit-status.rs → src/test/ui/process/signal-exit-status.rs
diff --git a/src/test/ui/issues/issue-21520.rs → src/test/ui/regions/issue-21520.rs b/src/test/ui/issues/issue-21520.rs → src/test/ui/regions/issue-21520.rs
diff --git a/src/test/ui/issues/issue-26448-1.rs → src/test/ui/regions/issue-26448-1.rs b/src/test/ui/issues/issue-26448-1.rs → src/test/ui/regions/issue-26448-1.rs
diff --git a/src/test/ui/issues/issue-26448-2.rs → src/test/ui/regions/issue-26448-2.rs b/src/test/ui/issues/issue-26448-2.rs → src/test/ui/regions/issue-26448-2.rs
diff --git a/src/test/ui/issues/issue-26448-3.rs → src/test/ui/regions/issue-26448-3.rs b/src/test/ui/issues/issue-26448-3.rs → src/test/ui/regions/issue-26448-3.rs
diff --git a/src/test/ui/editions-crate-root-2015.rs → ...st/ui/resolve/editions-crate-root-2015.rs b/src/test/ui/editions-crate-root-2015.rs → ...st/ui/resolve/editions-crate-root-2015.rs
diff --git a/src/test/ui/editions-crate-root-2015.stderr → ...i/resolve/editions-crate-root-2015.stderr b/src/test/ui/editions-crate-root-2015.stderr → ...i/resolve/editions-crate-root-2015.stderr
diff --git a/src/test/ui/issues/issue-12796.rs → src/test/ui/resolve/issue-12796.rs b/src/test/ui/issues/issue-12796.rs → src/test/ui/resolve/issue-12796.rs
diff --git a/src/test/ui/issues/issue-12796.stderr → src/test/ui/resolve/issue-12796.stderr b/src/test/ui/issues/issue-12796.stderr → src/test/ui/resolve/issue-12796.stderr
diff --git a/src/test/ui/issues/issue-23716.rs → src/test/ui/resolve/issue-23716.rs b/src/test/ui/issues/issue-23716.rs → src/test/ui/resolve/issue-23716.rs
diff --git a/src/test/ui/issues/issue-23716.stderr → src/test/ui/resolve/issue-23716.stderr b/src/test/ui/issues/issue-23716.stderr → src/test/ui/resolve/issue-23716.stderr
diff --git a/src/test/ui/issues/issue-3021-c.rs → src/test/ui/resolve/issue-3021-c.rs b/src/test/ui/issues/issue-3021-c.rs → src/test/ui/resolve/issue-3021-c.rs
diff --git a/src/test/ui/issues/issue-3021-c.stderr → src/test/ui/resolve/issue-3021-c.stderr b/src/test/ui/issues/issue-3021-c.stderr → src/test/ui/resolve/issue-3021-c.stderr
diff --git a/src/test/ui/issues/issue-3021.rs → src/test/ui/resolve/issue-3021.rs b/src/test/ui/issues/issue-3021.rs → src/test/ui/resolve/issue-3021.rs
diff --git a/src/test/ui/issues/issue-3021.stderr → src/test/ui/resolve/issue-3021.stderr b/src/test/ui/issues/issue-3021.stderr → src/test/ui/resolve/issue-3021.stderr
diff --git a/src/test/ui/issues/issue-31845.rs → src/test/ui/resolve/issue-31845.rs b/src/test/ui/issues/issue-31845.rs → src/test/ui/resolve/issue-31845.rs
diff --git a/src/test/ui/issues/issue-31845.stderr → src/test/ui/resolve/issue-31845.stderr b/src/test/ui/issues/issue-31845.stderr → src/test/ui/resolve/issue-31845.stderr
diff --git a/src/test/ui/issues/issue-5099.rs → src/test/ui/resolve/issue-5099.rs b/src/test/ui/issues/issue-5099.rs → src/test/ui/resolve/issue-5099.rs
diff --git a/src/test/ui/issues/issue-5099.stderr → src/test/ui/resolve/issue-5099.stderr b/src/test/ui/issues/issue-5099.stderr → src/test/ui/resolve/issue-5099.stderr
diff --git a/src/test/ui/issues/issue-6804.rs → ...trict-constants-in-patterns/issue-6804.rs b/src/test/ui/issues/issue-6804.rs → ...trict-constants-in-patterns/issue-6804.rs
diff --git a/src/test/ui/issues/issue-6804.stderr → ...t-constants-in-patterns/issue-6804.stderr b/src/test/ui/issues/issue-6804.stderr → ...t-constants-in-patterns/issue-6804.stderr
diff --git a/src/test/ui/issues/issue-61882-2.rs → src/test/ui/self/issue-61882-2.rs b/src/test/ui/issues/issue-61882-2.rs → src/test/ui/self/issue-61882-2.rs
diff --git a/src/test/ui/issues/issue-61882-2.stderr → src/test/ui/self/issue-61882-2.stderr b/src/test/ui/issues/issue-61882-2.stderr → src/test/ui/self/issue-61882-2.stderr
diff --git a/src/test/ui/issues/issue-61882.rs → src/test/ui/self/issue-61882.rs b/src/test/ui/issues/issue-61882.rs → src/test/ui/self/issue-61882.rs
diff --git a/src/test/ui/issues/issue-61882.stderr → src/test/ui/self/issue-61882.stderr b/src/test/ui/issues/issue-61882.stderr → src/test/ui/self/issue-61882.stderr
diff --git a/src/test/ui/transmute-specialization.rs → ...pecialization/transmute-specialization.rs b/src/test/ui/transmute-specialization.rs → ...pecialization/transmute-specialization.rs
diff --git a/src/test/ui/transmute-specialization.stderr → ...alization/transmute-specialization.stderr b/src/test/ui/transmute-specialization.stderr → ...alization/transmute-specialization.stderr
diff --git a/src/test/ui/auxiliary/nested_item.rs → src/test/ui/static/auxiliary/nested_item.rs b/src/test/ui/auxiliary/nested_item.rs → src/test/ui/static/auxiliary/nested_item.rs
diff --git a/src/test/ui/nested_item_main.rs → src/test/ui/static/nested_item_main.rs b/src/test/ui/nested_item_main.rs → src/test/ui/static/nested_item_main.rs
diff --git a/src/test/ui/issues/issue-14227.mir.stderr → src/test/ui/statics/issue-14227.mir.stderr b/src/test/ui/issues/issue-14227.mir.stderr → src/test/ui/statics/issue-14227.mir.stderr
diff --git a/src/test/ui/issues/issue-14227.rs → src/test/ui/statics/issue-14227.rs b/src/test/ui/issues/issue-14227.rs → src/test/ui/statics/issue-14227.rs
diff --git a/src/test/ui/issues/issue-14227.thir.stderr → src/test/ui/statics/issue-14227.thir.stderr b/src/test/ui/issues/issue-14227.thir.stderr → src/test/ui/statics/issue-14227.thir.stderr
diff --git a/src/test/ui/issues/issue-50731.rs → src/test/ui/structs-enums/issue-50731.rs b/src/test/ui/issues/issue-50731.rs → src/test/ui/structs-enums/issue-50731.rs
diff --git a/src/test/ui/auxiliary/changing-crates-a1.rs → ...st/ui/svh/auxiliary/changing-crates-a1.rs b/src/test/ui/auxiliary/changing-crates-a1.rs → ...st/ui/svh/auxiliary/changing-crates-a1.rs
diff --git a/src/test/ui/auxiliary/changing-crates-a2.rs → ...st/ui/svh/auxiliary/changing-crates-a2.rs b/src/test/ui/auxiliary/changing-crates-a2.rs → ...st/ui/svh/auxiliary/changing-crates-a2.rs
diff --git a/src/test/ui/auxiliary/changing-crates-b.rs → ...est/ui/svh/auxiliary/changing-crates-b.rs b/src/test/ui/auxiliary/changing-crates-b.rs → ...est/ui/svh/auxiliary/changing-crates-b.rs
diff --git a/src/test/ui/changing-crates.rs → src/test/ui/svh/changing-crates.rs b/src/test/ui/changing-crates.rs → src/test/ui/svh/changing-crates.rs
diff --git a/src/test/ui/changing-crates.stderr → src/test/ui/svh/changing-crates.stderr b/src/test/ui/changing-crates.stderr → src/test/ui/svh/changing-crates.stderr
diff --git a/src/test/ui/issues/issue-20823.rs → src/test/ui/test-attrs/issue-20823.rs b/src/test/ui/issues/issue-20823.rs → src/test/ui/test-attrs/issue-20823.rs
diff --git a/src/test/ui/issues/issue-24313.rs → src/test/ui/threads-sendsync/issue-24313.rs b/src/test/ui/issues/issue-24313.rs → src/test/ui/threads-sendsync/issue-24313.rs
diff --git a/src/test/ui/issues/issue-4448.rs → src/test/ui/threads-sendsync/issue-4448.rs b/src/test/ui/issues/issue-4448.rs → src/test/ui/threads-sendsync/issue-4448.rs
diff --git a/src/test/ui/issues/issue-8827.rs → src/test/ui/threads-sendsync/issue-8827.rs b/src/test/ui/issues/issue-8827.rs → src/test/ui/threads-sendsync/issue-8827.rs
diff --git a/src/test/ui/issues/issue-9396.rs → src/test/ui/threads-sendsync/issue-9396.rs b/src/test/ui/issues/issue-9396.rs → src/test/ui/threads-sendsync/issue-9396.rs
diff --git a/src/test/ui/trivial-message.rs → ...st/ui/threads-sendsync/trivial-message.rs b/src/test/ui/trivial-message.rs → ...st/ui/threads-sendsync/trivial-message.rs
diff --git a/src/test/ui/yield2.rs → src/test/ui/threads-sendsync/yield2.rs b/src/test/ui/yield2.rs → src/test/ui/threads-sendsync/yield2.rs
diff --git a/src/test/ui/issues/issue-24010.rs → src/test/ui/traits/issue-24010.rs b/src/test/ui/issues/issue-24010.rs → src/test/ui/traits/issue-24010.rs
diff --git a/src/test/ui/issues/issue-38604.rs → src/test/ui/traits/issue-38604.rs b/src/test/ui/issues/issue-38604.rs → src/test/ui/traits/issue-38604.rs
diff --git a/src/test/ui/issues/issue-38604.stderr → src/test/ui/traits/issue-38604.stderr b/src/test/ui/issues/issue-38604.stderr → src/test/ui/traits/issue-38604.stderr
diff --git a/src/test/ui/issues/issue-3973.rs → src/test/ui/traits/issue-3973.rs b/src/test/ui/issues/issue-3973.rs → src/test/ui/traits/issue-3973.rs
diff --git a/src/test/ui/issues/issue-3973.stderr → src/test/ui/traits/issue-3973.stderr b/src/test/ui/issues/issue-3973.stderr → src/test/ui/traits/issue-3973.stderr
diff --git a/src/test/ui/issues/issue-59029-1.rs → src/test/ui/traits/issue-59029-1.rs b/src/test/ui/issues/issue-59029-1.rs → src/test/ui/traits/issue-59029-1.rs
diff --git a/src/test/ui/issues/issue-59029-1.stderr → src/test/ui/traits/issue-59029-1.stderr b/src/test/ui/issues/issue-59029-1.stderr → src/test/ui/traits/issue-59029-1.stderr
diff --git a/src/test/ui/issues/issue-72455.rs → src/test/ui/traits/issue-72455.rs b/src/test/ui/issues/issue-72455.rs → src/test/ui/traits/issue-72455.rs
diff --git a/src/test/ui/object-does-not-impl-trait.rs → ...t/ui/traits/object-does-not-impl-trait.rs b/src/test/ui/object-does-not-impl-trait.rs → ...t/ui/traits/object-does-not-impl-trait.rs
diff --git a/...test/ui/object-does-not-impl-trait.stderr → .../traits/object-does-not-impl-trait.stderr b/...test/ui/object-does-not-impl-trait.stderr → .../traits/object-does-not-impl-trait.stderr
diff --git a/src/test/ui/syntax-trait-polarity.rs → src/test/ui/traits/syntax-trait-polarity.rs b/src/test/ui/syntax-trait-polarity.rs → src/test/ui/traits/syntax-trait-polarity.rs
diff --git a/src/test/ui/syntax-trait-polarity.stderr → ...st/ui/traits/syntax-trait-polarity.stderr b/src/test/ui/syntax-trait-polarity.stderr → ...st/ui/traits/syntax-trait-polarity.stderr
diff --git a/src/test/ui/issues/issue-45124.rs → src/test/ui/try-block/issue-45124.rs b/src/test/ui/issues/issue-45124.rs → src/test/ui/try-block/issue-45124.rs
diff --git a/src/test/ui/issues/issue-60662.rs → ...t/ui/type-alias-impl-trait/issue-60662.rs b/src/test/ui/issues/issue-60662.rs → ...t/ui/type-alias-impl-trait/issue-60662.rs
diff --git a/src/test/ui/issues/issue-60662.stdout → .../type-alias-impl-trait/issue-60662.stdout b/src/test/ui/issues/issue-60662.stdout → .../type-alias-impl-trait/issue-60662.stdout
diff --git a/src/test/ui/issues/issue-30225.rs → src/test/ui/type-inference/issue-30225.rs b/src/test/ui/issues/issue-30225.rs → src/test/ui/type-inference/issue-30225.rs
diff --git a/src/test/ui/issues/issue-30225.stderr → ...test/ui/type-inference/issue-30225.stderr b/src/test/ui/issues/issue-30225.stderr → ...test/ui/type-inference/issue-30225.stderr
diff --git a/.../issues/auxiliary/xcrate-issue-43189-a.rs → .../typeck/auxiliary/xcrate-issue-43189-a.rs b/.../issues/auxiliary/xcrate-issue-43189-a.rs → .../typeck/auxiliary/xcrate-issue-43189-a.rs
diff --git a/.../issues/auxiliary/xcrate-issue-43189-b.rs → .../typeck/auxiliary/xcrate-issue-43189-b.rs b/.../issues/auxiliary/xcrate-issue-43189-b.rs → .../typeck/auxiliary/xcrate-issue-43189-b.rs
diff --git a/...iliary/xcrate-issue-46112-rexport-core.rs → ...iliary/xcrate-issue-46112-rexport-core.rs b/...iliary/xcrate-issue-46112-rexport-core.rs → ...iliary/xcrate-issue-46112-rexport-core.rs
diff --git a/.../issues/auxiliary/xcrate-issue-61711-b.rs → .../typeck/auxiliary/xcrate-issue-61711-b.rs b/.../issues/auxiliary/xcrate-issue-61711-b.rs → .../typeck/auxiliary/xcrate-issue-61711-b.rs
diff --git a/src/test/ui/issues/issue-43189.rs → src/test/ui/typeck/issue-43189.rs b/src/test/ui/issues/issue-43189.rs → src/test/ui/typeck/issue-43189.rs
diff --git a/src/test/ui/issues/issue-43189.stderr → src/test/ui/typeck/issue-43189.stderr b/src/test/ui/issues/issue-43189.stderr → src/test/ui/typeck/issue-43189.stderr
diff --git a/src/test/ui/issues/issue-46112.rs → src/test/ui/typeck/issue-46112.rs b/src/test/ui/issues/issue-46112.rs → src/test/ui/typeck/issue-46112.rs
diff --git a/src/test/ui/issues/issue-46112.stderr → src/test/ui/typeck/issue-46112.stderr b/src/test/ui/issues/issue-46112.stderr → src/test/ui/typeck/issue-46112.stderr
diff --git a/...issue-61711-once-caused-rustc-inf-loop.rs → ...issue-61711-once-caused-rustc-inf-loop.rs b/...issue-61711-once-caused-rustc-inf-loop.rs → ...issue-61711-once-caused-rustc-inf-loop.rs
diff --git a/src/test/ui/issues/issue-18652.rs → src/test/ui/unboxed-closures/issue-18652.rs b/src/test/ui/issues/issue-18652.rs → src/test/ui/unboxed-closures/issue-18652.rs
diff --git a/src/test/ui/issues/issue-30355.rs → src/test/ui/unsized/issue-30355.rs b/src/test/ui/issues/issue-30355.rs → src/test/ui/unsized/issue-30355.rs
diff --git a/src/test/ui/issues/issue-30355.stderr → src/test/ui/unsized/issue-30355.stderr b/src/test/ui/issues/issue-30355.stderr → src/test/ui/unsized/issue-30355.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 = 1331;
-const ISSUES_ENTRY_LIMIT: usize = 2488;
+const ROOT_ENTRY_LIMIT: usize = 1275;
+const ISSUES_ENTRY_LIMIT: usize = 2310;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))