diff --git a/src/test/run-pass/allocator/auxiliary/custom-as-global.rs b/src/test/ui/run-pass/allocator/auxiliary/custom-as-global.rs
similarity index 100%
rename from src/test/run-pass/allocator/auxiliary/custom-as-global.rs
rename to src/test/ui/run-pass/allocator/auxiliary/custom-as-global.rs
diff --git a/src/test/run-pass/allocator/auxiliary/custom.rs b/src/test/ui/run-pass/allocator/auxiliary/custom.rs
similarity index 100%
rename from src/test/run-pass/allocator/auxiliary/custom.rs
rename to src/test/ui/run-pass/allocator/auxiliary/custom.rs
diff --git a/src/test/run-pass/allocator/auxiliary/helper.rs b/src/test/ui/run-pass/allocator/auxiliary/helper.rs
similarity index 100%
rename from src/test/run-pass/allocator/auxiliary/helper.rs
rename to src/test/ui/run-pass/allocator/auxiliary/helper.rs
diff --git a/src/test/run-pass/allocator/custom.rs b/src/test/ui/run-pass/allocator/custom.rs
similarity index 100%
rename from src/test/run-pass/allocator/custom.rs
rename to src/test/ui/run-pass/allocator/custom.rs
diff --git a/src/test/run-pass/allocator/xcrate-use.rs b/src/test/ui/run-pass/allocator/xcrate-use.rs
similarity index 100%
rename from src/test/run-pass/allocator/xcrate-use.rs
rename to src/test/ui/run-pass/allocator/xcrate-use.rs
diff --git a/src/test/run-pass/allocator/xcrate-use2.rs b/src/test/ui/run-pass/allocator/xcrate-use2.rs
similarity index 100%
rename from src/test/run-pass/allocator/xcrate-use2.rs
rename to src/test/ui/run-pass/allocator/xcrate-use2.rs
diff --git a/src/test/run-pass/bench/issue-32062.rs b/src/test/ui/run-pass/bench/issue-32062.rs
similarity index 100%
rename from src/test/run-pass/bench/issue-32062.rs
rename to src/test/ui/run-pass/bench/issue-32062.rs
diff --git a/src/test/run-pass/ctfe/assoc-const.rs b/src/test/ui/run-pass/ctfe/assoc-const.rs
similarity index 100%
rename from src/test/run-pass/ctfe/assoc-const.rs
rename to src/test/ui/run-pass/ctfe/assoc-const.rs
diff --git a/src/test/run-pass/ctfe/bswap-const.rs b/src/test/ui/run-pass/ctfe/bswap-const.rs
similarity index 100%
rename from src/test/run-pass/ctfe/bswap-const.rs
rename to src/test/ui/run-pass/ctfe/bswap-const.rs
diff --git a/src/test/run-pass/ctfe/chained-constants-stackoverflow.rs b/src/test/ui/run-pass/ctfe/chained-constants-stackoverflow.rs
similarity index 100%
rename from src/test/run-pass/ctfe/chained-constants-stackoverflow.rs
rename to src/test/ui/run-pass/ctfe/chained-constants-stackoverflow.rs
diff --git a/src/test/run-pass/ctfe/const-block-non-item-statement-3.rs b/src/test/ui/run-pass/ctfe/const-block-non-item-statement-3.rs
similarity index 100%
rename from src/test/run-pass/ctfe/const-block-non-item-statement-3.rs
rename to src/test/ui/run-pass/ctfe/const-block-non-item-statement-3.rs
diff --git a/src/test/run-pass/ctfe/const-block-non-item-statement.rs b/src/test/ui/run-pass/ctfe/const-block-non-item-statement.rs
similarity index 100%
rename from src/test/run-pass/ctfe/const-block-non-item-statement.rs
rename to src/test/ui/run-pass/ctfe/const-block-non-item-statement.rs
diff --git a/src/test/run-pass/ctfe/const-fn-destructuring-arg.rs b/src/test/ui/run-pass/ctfe/const-fn-destructuring-arg.rs
similarity index 100%
rename from src/test/run-pass/ctfe/const-fn-destructuring-arg.rs
rename to src/test/ui/run-pass/ctfe/const-fn-destructuring-arg.rs
diff --git a/src/test/run-pass/ctfe/deref_in_pattern.rs b/src/test/ui/run-pass/ctfe/deref_in_pattern.rs
similarity index 100%
rename from src/test/run-pass/ctfe/deref_in_pattern.rs
rename to src/test/ui/run-pass/ctfe/deref_in_pattern.rs
diff --git a/src/test/run-pass/ctfe/ice-48279.rs b/src/test/ui/run-pass/ctfe/ice-48279.rs
similarity index 100%
rename from src/test/run-pass/ctfe/ice-48279.rs
rename to src/test/ui/run-pass/ctfe/ice-48279.rs
diff --git a/src/test/run-pass/ctfe/issue-37550.rs b/src/test/ui/run-pass/ctfe/issue-37550.rs
similarity index 100%
rename from src/test/run-pass/ctfe/issue-37550.rs
rename to src/test/ui/run-pass/ctfe/issue-37550.rs
diff --git a/src/test/run-pass/ctfe/issue-broken-mir.rs b/src/test/ui/run-pass/ctfe/issue-broken-mir.rs
similarity index 100%
rename from src/test/run-pass/ctfe/issue-broken-mir.rs
rename to src/test/ui/run-pass/ctfe/issue-broken-mir.rs
diff --git a/src/test/run-pass/ctfe/locals-in-const-fn.rs b/src/test/ui/run-pass/ctfe/locals-in-const-fn.rs
similarity index 100%
rename from src/test/run-pass/ctfe/locals-in-const-fn.rs
rename to src/test/ui/run-pass/ctfe/locals-in-const-fn.rs
diff --git a/src/test/run-pass/ctfe/match-const-fn-structs.rs b/src/test/ui/run-pass/ctfe/match-const-fn-structs.rs
similarity index 100%
rename from src/test/run-pass/ctfe/match-const-fn-structs.rs
rename to src/test/ui/run-pass/ctfe/match-const-fn-structs.rs
diff --git a/src/test/run-pass/ctfe/mozjs-error.rs b/src/test/ui/run-pass/ctfe/mozjs-error.rs
similarity index 100%
rename from src/test/run-pass/ctfe/mozjs-error.rs
rename to src/test/ui/run-pass/ctfe/mozjs-error.rs
diff --git a/src/test/run-pass/ctfe/non-scalar-cast.rs b/src/test/ui/run-pass/ctfe/non-scalar-cast.rs
similarity index 100%
rename from src/test/run-pass/ctfe/non-scalar-cast.rs
rename to src/test/ui/run-pass/ctfe/non-scalar-cast.rs
diff --git a/src/test/run-pass/ctfe/promotion.rs b/src/test/ui/run-pass/ctfe/promotion.rs
similarity index 100%
rename from src/test/run-pass/ctfe/promotion.rs
rename to src/test/ui/run-pass/ctfe/promotion.rs
diff --git a/src/test/run-pass/ctfe/references.rs b/src/test/ui/run-pass/ctfe/references.rs
similarity index 100%
rename from src/test/run-pass/ctfe/references.rs
rename to src/test/ui/run-pass/ctfe/references.rs
diff --git a/src/test/run-pass/ctfe/repeat_match.rs b/src/test/ui/run-pass/ctfe/repeat_match.rs
similarity index 100%
rename from src/test/run-pass/ctfe/repeat_match.rs
rename to src/test/ui/run-pass/ctfe/repeat_match.rs
diff --git a/src/test/run-pass/ctfe/return-in-const-fn.rs b/src/test/ui/run-pass/ctfe/return-in-const-fn.rs
similarity index 100%
rename from src/test/run-pass/ctfe/return-in-const-fn.rs
rename to src/test/ui/run-pass/ctfe/return-in-const-fn.rs
diff --git a/src/test/run-pass/ctfe/signed_enum_discr.rs b/src/test/ui/run-pass/ctfe/signed_enum_discr.rs
similarity index 100%
rename from src/test/run-pass/ctfe/signed_enum_discr.rs
rename to src/test/ui/run-pass/ctfe/signed_enum_discr.rs
diff --git a/src/test/run-pass/ctfe/transmute-const.rs b/src/test/ui/run-pass/ctfe/transmute-const.rs
similarity index 100%
rename from src/test/run-pass/ctfe/transmute-const.rs
rename to src/test/ui/run-pass/ctfe/transmute-const.rs
diff --git a/src/test/run-pass/ctfe/tuple-struct-constructors.rs b/src/test/ui/run-pass/ctfe/tuple-struct-constructors.rs
similarity index 100%
rename from src/test/run-pass/ctfe/tuple-struct-constructors.rs
rename to src/test/ui/run-pass/ctfe/tuple-struct-constructors.rs
diff --git a/src/test/run-pass/generator/auxiliary/xcrate-reachable.rs b/src/test/ui/run-pass/generator/auxiliary/xcrate-reachable.rs
similarity index 100%
rename from src/test/run-pass/generator/auxiliary/xcrate-reachable.rs
rename to src/test/ui/run-pass/generator/auxiliary/xcrate-reachable.rs
diff --git a/src/test/run-pass/generator/auxiliary/xcrate.rs b/src/test/ui/run-pass/generator/auxiliary/xcrate.rs
similarity index 100%
rename from src/test/run-pass/generator/auxiliary/xcrate.rs
rename to src/test/ui/run-pass/generator/auxiliary/xcrate.rs
diff --git a/src/test/run-pass/generator/borrow-in-tail-expr.rs b/src/test/ui/run-pass/generator/borrow-in-tail-expr.rs
similarity index 100%
rename from src/test/run-pass/generator/borrow-in-tail-expr.rs
rename to src/test/ui/run-pass/generator/borrow-in-tail-expr.rs
diff --git a/src/test/run-pass/generator/conditional-drop.rs b/src/test/ui/run-pass/generator/conditional-drop.rs
similarity index 100%
rename from src/test/run-pass/generator/conditional-drop.rs
rename to src/test/ui/run-pass/generator/conditional-drop.rs
diff --git a/src/test/run-pass/generator/control-flow.rs b/src/test/ui/run-pass/generator/control-flow.rs
similarity index 100%
rename from src/test/run-pass/generator/control-flow.rs
rename to src/test/ui/run-pass/generator/control-flow.rs
diff --git a/src/test/run-pass/generator/drop-env.rs b/src/test/ui/run-pass/generator/drop-env.rs
similarity index 100%
rename from src/test/run-pass/generator/drop-env.rs
rename to src/test/ui/run-pass/generator/drop-env.rs
diff --git a/src/test/run-pass/generator/issue-44197.rs b/src/test/ui/run-pass/generator/issue-44197.rs
similarity index 100%
rename from src/test/run-pass/generator/issue-44197.rs
rename to src/test/ui/run-pass/generator/issue-44197.rs
diff --git a/src/test/run-pass/generator/issue-52398.rs b/src/test/ui/run-pass/generator/issue-52398.rs
similarity index 100%
rename from src/test/run-pass/generator/issue-52398.rs
rename to src/test/ui/run-pass/generator/issue-52398.rs
diff --git a/src/test/run-pass/generator/iterator-count.rs b/src/test/ui/run-pass/generator/iterator-count.rs
similarity index 100%
rename from src/test/run-pass/generator/iterator-count.rs
rename to src/test/ui/run-pass/generator/iterator-count.rs
diff --git a/src/test/run-pass/generator/live-upvar-across-yield.rs b/src/test/ui/run-pass/generator/live-upvar-across-yield.rs
similarity index 100%
rename from src/test/run-pass/generator/live-upvar-across-yield.rs
rename to src/test/ui/run-pass/generator/live-upvar-across-yield.rs
diff --git a/src/test/run-pass/generator/match-bindings.rs b/src/test/ui/run-pass/generator/match-bindings.rs
similarity index 100%
rename from src/test/run-pass/generator/match-bindings.rs
rename to src/test/ui/run-pass/generator/match-bindings.rs
diff --git a/src/test/run-pass/generator/nested_generators.rs b/src/test/ui/run-pass/generator/nested_generators.rs
similarity index 100%
rename from src/test/run-pass/generator/nested_generators.rs
rename to src/test/ui/run-pass/generator/nested_generators.rs
diff --git a/src/test/run-pass/generator/panic-drops.rs b/src/test/ui/run-pass/generator/panic-drops.rs
similarity index 100%
rename from src/test/run-pass/generator/panic-drops.rs
rename to src/test/ui/run-pass/generator/panic-drops.rs
diff --git a/src/test/run-pass/generator/panic-safe.rs b/src/test/ui/run-pass/generator/panic-safe.rs
similarity index 100%
rename from src/test/run-pass/generator/panic-safe.rs
rename to src/test/ui/run-pass/generator/panic-safe.rs
diff --git a/src/test/run-pass/generator/reborrow-mut-upvar.rs b/src/test/ui/run-pass/generator/reborrow-mut-upvar.rs
similarity index 100%
rename from src/test/run-pass/generator/reborrow-mut-upvar.rs
rename to src/test/ui/run-pass/generator/reborrow-mut-upvar.rs
diff --git a/src/test/run-pass/generator/resume-after-return.rs b/src/test/ui/run-pass/generator/resume-after-return.rs
similarity index 100%
rename from src/test/run-pass/generator/resume-after-return.rs
rename to src/test/ui/run-pass/generator/resume-after-return.rs
diff --git a/src/test/run-pass/generator/smoke.rs b/src/test/ui/run-pass/generator/smoke.rs
similarity index 100%
rename from src/test/run-pass/generator/smoke.rs
rename to src/test/ui/run-pass/generator/smoke.rs
diff --git a/src/test/run-pass/generator/static-generators.rs b/src/test/ui/run-pass/generator/static-generators.rs
similarity index 100%
rename from src/test/run-pass/generator/static-generators.rs
rename to src/test/ui/run-pass/generator/static-generators.rs
diff --git a/src/test/run-pass/generator/too-live-local-in-immovable-gen.rs b/src/test/ui/run-pass/generator/too-live-local-in-immovable-gen.rs
similarity index 100%
rename from src/test/run-pass/generator/too-live-local-in-immovable-gen.rs
rename to src/test/ui/run-pass/generator/too-live-local-in-immovable-gen.rs
diff --git a/src/test/run-pass/generator/xcrate-reachable.rs b/src/test/ui/run-pass/generator/xcrate-reachable.rs
similarity index 100%
rename from src/test/run-pass/generator/xcrate-reachable.rs
rename to src/test/ui/run-pass/generator/xcrate-reachable.rs
diff --git a/src/test/run-pass/generator/xcrate.rs b/src/test/ui/run-pass/generator/xcrate.rs
similarity index 100%
rename from src/test/run-pass/generator/xcrate.rs
rename to src/test/ui/run-pass/generator/xcrate.rs
diff --git a/src/test/run-pass/generator/yield-in-args-rev.rs b/src/test/ui/run-pass/generator/yield-in-args-rev.rs
similarity index 100%
rename from src/test/run-pass/generator/yield-in-args-rev.rs
rename to src/test/ui/run-pass/generator/yield-in-args-rev.rs
diff --git a/src/test/run-pass/generator/yield-in-box.rs b/src/test/ui/run-pass/generator/yield-in-box.rs
similarity index 100%
rename from src/test/run-pass/generator/yield-in-box.rs
rename to src/test/ui/run-pass/generator/yield-in-box.rs
diff --git a/src/test/run-pass/generator/yield-in-initializer.rs b/src/test/ui/run-pass/generator/yield-in-initializer.rs
similarity index 100%
rename from src/test/run-pass/generator/yield-in-initializer.rs
rename to src/test/ui/run-pass/generator/yield-in-initializer.rs
diff --git a/src/test/run-pass/generator/yield-subtype.rs b/src/test/ui/run-pass/generator/yield-subtype.rs
similarity index 100%
rename from src/test/run-pass/generator/yield-subtype.rs
rename to src/test/ui/run-pass/generator/yield-subtype.rs
diff --git a/src/test/run-pass/impl-trait/auto-trait-leak.rs b/src/test/ui/run-pass/impl-trait/auto-trait-leak.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/auto-trait-leak.rs
rename to src/test/ui/run-pass/impl-trait/auto-trait-leak.rs
diff --git a/src/test/run-pass/impl-trait/auxiliary/xcrate.rs b/src/test/ui/run-pass/impl-trait/auxiliary/xcrate.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/auxiliary/xcrate.rs
rename to src/test/ui/run-pass/impl-trait/auxiliary/xcrate.rs
diff --git a/src/test/run-pass/impl-trait/bounds_regression.rs b/src/test/ui/run-pass/impl-trait/bounds_regression.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/bounds_regression.rs
rename to src/test/ui/run-pass/impl-trait/bounds_regression.rs
diff --git a/src/test/run-pass/impl-trait/equality.rs b/src/test/ui/run-pass/impl-trait/equality.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/equality.rs
rename to src/test/ui/run-pass/impl-trait/equality.rs
diff --git a/src/test/run-pass/impl-trait/example-calendar.rs b/src/test/ui/run-pass/impl-trait/example-calendar.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/example-calendar.rs
rename to src/test/ui/run-pass/impl-trait/example-calendar.rs
diff --git a/src/test/run-pass/impl-trait/example-st.rs b/src/test/ui/run-pass/impl-trait/example-st.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/example-st.rs
rename to src/test/ui/run-pass/impl-trait/example-st.rs
diff --git a/src/test/run-pass/impl-trait/existential-minimal.rs b/src/test/ui/run-pass/impl-trait/existential-minimal.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/existential-minimal.rs
rename to src/test/ui/run-pass/impl-trait/existential-minimal.rs
diff --git a/src/test/run-pass/impl-trait/issue-42479.rs b/src/test/ui/run-pass/impl-trait/issue-42479.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/issue-42479.rs
rename to src/test/ui/run-pass/impl-trait/issue-42479.rs
diff --git a/src/test/run-pass/impl-trait/issue-49376.rs b/src/test/ui/run-pass/impl-trait/issue-49376.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/issue-49376.rs
rename to src/test/ui/run-pass/impl-trait/issue-49376.rs
diff --git a/src/test/run-pass/impl-trait/lifetimes.rs b/src/test/ui/run-pass/impl-trait/lifetimes.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/lifetimes.rs
rename to src/test/ui/run-pass/impl-trait/lifetimes.rs
diff --git a/src/test/run-pass/impl-trait/nesting.rs b/src/test/ui/run-pass/impl-trait/nesting.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/nesting.rs
rename to src/test/ui/run-pass/impl-trait/nesting.rs
diff --git a/src/test/run-pass/impl-trait/universal_hrtb_anon.rs b/src/test/ui/run-pass/impl-trait/universal_hrtb_anon.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/universal_hrtb_anon.rs
rename to src/test/ui/run-pass/impl-trait/universal_hrtb_anon.rs
diff --git a/src/test/run-pass/impl-trait/universal_hrtb_named.rs b/src/test/ui/run-pass/impl-trait/universal_hrtb_named.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/universal_hrtb_named.rs
rename to src/test/ui/run-pass/impl-trait/universal_hrtb_named.rs
diff --git a/src/test/run-pass/impl-trait/universal_in_adt_in_parameters.rs b/src/test/ui/run-pass/impl-trait/universal_in_adt_in_parameters.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/universal_in_adt_in_parameters.rs
rename to src/test/ui/run-pass/impl-trait/universal_in_adt_in_parameters.rs
diff --git a/src/test/run-pass/impl-trait/universal_in_impl_trait_in_parameters.rs b/src/test/ui/run-pass/impl-trait/universal_in_impl_trait_in_parameters.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/universal_in_impl_trait_in_parameters.rs
rename to src/test/ui/run-pass/impl-trait/universal_in_impl_trait_in_parameters.rs
diff --git a/src/test/run-pass/impl-trait/universal_in_trait_defn_parameters.rs b/src/test/ui/run-pass/impl-trait/universal_in_trait_defn_parameters.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/universal_in_trait_defn_parameters.rs
rename to src/test/ui/run-pass/impl-trait/universal_in_trait_defn_parameters.rs
diff --git a/src/test/run-pass/impl-trait/universal_multiple_bounds.rs b/src/test/ui/run-pass/impl-trait/universal_multiple_bounds.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/universal_multiple_bounds.rs
rename to src/test/ui/run-pass/impl-trait/universal_multiple_bounds.rs
diff --git a/src/test/run-pass/impl-trait/xcrate.rs b/src/test/ui/run-pass/impl-trait/xcrate.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/xcrate.rs
rename to src/test/ui/run-pass/impl-trait/xcrate.rs
diff --git a/src/test/run-pass/impl-trait/xcrate_simple.rs b/src/test/ui/run-pass/impl-trait/xcrate_simple.rs
similarity index 100%
rename from src/test/run-pass/impl-trait/xcrate_simple.rs
rename to src/test/ui/run-pass/impl-trait/xcrate_simple.rs
diff --git a/src/test/run-pass/nll/issue-47153-generic-const.rs b/src/test/ui/run-pass/nll/issue-47153-generic-const.rs
similarity index 100%
rename from src/test/run-pass/nll/issue-47153-generic-const.rs
rename to src/test/ui/run-pass/nll/issue-47153-generic-const.rs
diff --git a/src/test/run-pass/nll/issue-47589.rs b/src/test/ui/run-pass/nll/issue-47589.rs
similarity index 100%
rename from src/test/run-pass/nll/issue-47589.rs
rename to src/test/ui/run-pass/nll/issue-47589.rs
diff --git a/src/test/run-pass/nll/issue-48623-closure.rs b/src/test/ui/run-pass/nll/issue-48623-closure.rs
similarity index 100%
rename from src/test/run-pass/nll/issue-48623-closure.rs
rename to src/test/ui/run-pass/nll/issue-48623-closure.rs
diff --git a/src/test/run-pass/nll/issue-48623-generator.rs b/src/test/ui/run-pass/nll/issue-48623-generator.rs
similarity index 100%
rename from src/test/run-pass/nll/issue-48623-generator.rs
rename to src/test/ui/run-pass/nll/issue-48623-generator.rs
diff --git a/src/test/run-pass/nll/issue-50343.rs b/src/test/ui/run-pass/nll/issue-50343.rs
similarity index 100%
rename from src/test/run-pass/nll/issue-50343.rs
rename to src/test/ui/run-pass/nll/issue-50343.rs
diff --git a/src/test/run-pass/nll/issue-50461-used-mut-from-moves.rs b/src/test/ui/run-pass/nll/issue-50461-used-mut-from-moves.rs
similarity index 100%
rename from src/test/run-pass/nll/issue-50461-used-mut-from-moves.rs
rename to src/test/ui/run-pass/nll/issue-50461-used-mut-from-moves.rs
diff --git a/src/test/run-pass/nll/issue-53123-raw-pointer-cast.rs b/src/test/ui/run-pass/nll/issue-53123-raw-pointer-cast.rs
similarity index 100%
rename from src/test/run-pass/nll/issue-53123-raw-pointer-cast.rs
rename to src/test/ui/run-pass/nll/issue-53123-raw-pointer-cast.rs
diff --git a/src/test/run-pass/nll/mutating_references.rs b/src/test/ui/run-pass/nll/mutating_references.rs
similarity index 100%
rename from src/test/run-pass/nll/mutating_references.rs
rename to src/test/ui/run-pass/nll/mutating_references.rs
diff --git a/src/test/run-pass/nll/process_or_insert_default.rs b/src/test/ui/run-pass/nll/process_or_insert_default.rs
similarity index 100%
rename from src/test/run-pass/nll/process_or_insert_default.rs
rename to src/test/ui/run-pass/nll/process_or_insert_default.rs
diff --git a/src/test/run-pass/nll/rc-loop.rs b/src/test/ui/run-pass/nll/rc-loop.rs
similarity index 100%
rename from src/test/run-pass/nll/rc-loop.rs
rename to src/test/ui/run-pass/nll/rc-loop.rs
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod.rs b/src/test/ui/run-pass/non_modrs_mods/foors_mod.rs
similarity index 100%
rename from src/test/run-pass/non_modrs_mods/foors_mod.rs
rename to src/test/ui/run-pass/non_modrs_mods/foors_mod.rs
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/compiletest-ignore-dir b/src/test/ui/run-pass/non_modrs_mods/foors_mod/compiletest-ignore-dir
similarity index 100%
rename from src/test/run-pass/non_modrs_mods/foors_mod/compiletest-ignore-dir
rename to src/test/ui/run-pass/non_modrs_mods/foors_mod/compiletest-ignore-dir
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs b/src/test/ui/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs
similarity index 100%
rename from src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs
rename to src/test/ui/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs b/src/test/ui/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs
similarity index 100%
rename from src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs
rename to src/test/ui/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs b/src/test/ui/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs
similarity index 100%
rename from src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs
rename to src/test/ui/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs b/src/test/ui/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs
similarity index 100%
rename from src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs
rename to src/test/ui/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/compiletest-ignore-dir b/src/test/ui/run-pass/non_modrs_mods/modrs_mod/compiletest-ignore-dir
similarity index 100%
rename from src/test/run-pass/non_modrs_mods/modrs_mod/compiletest-ignore-dir
rename to src/test/ui/run-pass/non_modrs_mods/modrs_mod/compiletest-ignore-dir
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs b/src/test/ui/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs
similarity index 100%
rename from src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs
rename to src/test/ui/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs b/src/test/ui/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs
similarity index 100%
rename from src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs
rename to src/test/ui/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs b/src/test/ui/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs
similarity index 100%
rename from src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs
rename to src/test/ui/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs b/src/test/ui/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs
similarity index 100%
rename from src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs
rename to src/test/ui/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/mod.rs b/src/test/ui/run-pass/non_modrs_mods/modrs_mod/mod.rs
similarity index 100%
rename from src/test/run-pass/non_modrs_mods/modrs_mod/mod.rs
rename to src/test/ui/run-pass/non_modrs_mods/modrs_mod/mod.rs
diff --git a/src/test/run-pass/non_modrs_mods/non_modrs_mods.rs b/src/test/ui/run-pass/non_modrs_mods/non_modrs_mods.rs
similarity index 100%
rename from src/test/run-pass/non_modrs_mods/non_modrs_mods.rs
rename to src/test/ui/run-pass/non_modrs_mods/non_modrs_mods.rs
diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs b/src/test/ui/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs
similarity index 100%
rename from src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs
rename to src/test/ui/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs
diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir b/src/test/ui/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir
similarity index 100%
rename from src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir
rename to src/test/ui/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir
diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs b/src/test/ui/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs
similarity index 100%
rename from src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs
rename to src/test/ui/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs
diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs b/src/test/ui/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs
similarity index 100%
rename from src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs
rename to src/test/ui/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs
diff --git a/src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs b/src/test/ui/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs
similarity index 100%
rename from src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs
rename to src/test/ui/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs
diff --git a/src/test/run-pass/panic-runtime/abort.rs b/src/test/ui/run-pass/panic-runtime/abort.rs
similarity index 100%
rename from src/test/run-pass/panic-runtime/abort.rs
rename to src/test/ui/run-pass/panic-runtime/abort.rs
diff --git a/src/test/run-pass/panic-runtime/auxiliary/exit-success-if-unwind.rs b/src/test/ui/run-pass/panic-runtime/auxiliary/exit-success-if-unwind.rs
similarity index 100%
rename from src/test/run-pass/panic-runtime/auxiliary/exit-success-if-unwind.rs
rename to src/test/ui/run-pass/panic-runtime/auxiliary/exit-success-if-unwind.rs
diff --git a/src/test/run-pass/panic-runtime/link-to-abort.rs b/src/test/ui/run-pass/panic-runtime/link-to-abort.rs
similarity index 100%
rename from src/test/run-pass/panic-runtime/link-to-abort.rs
rename to src/test/ui/run-pass/panic-runtime/link-to-abort.rs
diff --git a/src/test/run-pass/panic-runtime/link-to-unwind.rs b/src/test/ui/run-pass/panic-runtime/link-to-unwind.rs
similarity index 100%
rename from src/test/run-pass/panic-runtime/link-to-unwind.rs
rename to src/test/ui/run-pass/panic-runtime/link-to-unwind.rs
diff --git a/src/test/run-pass/panic-runtime/lto-abort.rs b/src/test/ui/run-pass/panic-runtime/lto-abort.rs
similarity index 100%
rename from src/test/run-pass/panic-runtime/lto-abort.rs
rename to src/test/ui/run-pass/panic-runtime/lto-abort.rs
diff --git a/src/test/run-pass/panic-runtime/lto-unwind.rs b/src/test/ui/run-pass/panic-runtime/lto-unwind.rs
similarity index 100%
rename from src/test/run-pass/panic-runtime/lto-unwind.rs
rename to src/test/ui/run-pass/panic-runtime/lto-unwind.rs
diff --git a/src/test/run-pass/specialization/README.md b/src/test/ui/run-pass/specialization/README.md
similarity index 100%
rename from src/test/run-pass/specialization/README.md
rename to src/test/ui/run-pass/specialization/README.md
diff --git a/src/test/run-pass/specialization/assoc-ty-graph-cycle.rs b/src/test/ui/run-pass/specialization/assoc-ty-graph-cycle.rs
similarity index 100%
rename from src/test/run-pass/specialization/assoc-ty-graph-cycle.rs
rename to src/test/ui/run-pass/specialization/assoc-ty-graph-cycle.rs
diff --git a/src/test/run-pass/specialization/auxiliary/cross_crates_defaults.rs b/src/test/ui/run-pass/specialization/auxiliary/cross_crates_defaults.rs
similarity index 100%
rename from src/test/run-pass/specialization/auxiliary/cross_crates_defaults.rs
rename to src/test/ui/run-pass/specialization/auxiliary/cross_crates_defaults.rs
diff --git a/src/test/run-pass/specialization/auxiliary/go_trait.rs b/src/test/ui/run-pass/specialization/auxiliary/go_trait.rs
similarity index 100%
rename from src/test/run-pass/specialization/auxiliary/go_trait.rs
rename to src/test/ui/run-pass/specialization/auxiliary/go_trait.rs
diff --git a/src/test/run-pass/specialization/auxiliary/specialization_cross_crate.rs b/src/test/ui/run-pass/specialization/auxiliary/specialization_cross_crate.rs
similarity index 100%
rename from src/test/run-pass/specialization/auxiliary/specialization_cross_crate.rs
rename to src/test/ui/run-pass/specialization/auxiliary/specialization_cross_crate.rs
diff --git a/src/test/run-pass/specialization/cross-crate-defaults.rs b/src/test/ui/run-pass/specialization/cross-crate-defaults.rs
similarity index 100%
rename from src/test/run-pass/specialization/cross-crate-defaults.rs
rename to src/test/ui/run-pass/specialization/cross-crate-defaults.rs
diff --git a/src/test/run-pass/specialization/defaultimpl/allowed-cross-crate.rs b/src/test/ui/run-pass/specialization/defaultimpl/allowed-cross-crate.rs
similarity index 100%
rename from src/test/run-pass/specialization/defaultimpl/allowed-cross-crate.rs
rename to src/test/ui/run-pass/specialization/defaultimpl/allowed-cross-crate.rs
diff --git a/src/test/run-pass/specialization/defaultimpl/auxiliary/go_trait.rs b/src/test/ui/run-pass/specialization/defaultimpl/auxiliary/go_trait.rs
similarity index 100%
rename from src/test/run-pass/specialization/defaultimpl/auxiliary/go_trait.rs
rename to src/test/ui/run-pass/specialization/defaultimpl/auxiliary/go_trait.rs
diff --git a/src/test/run-pass/specialization/defaultimpl/out-of-order.rs b/src/test/ui/run-pass/specialization/defaultimpl/out-of-order.rs
similarity index 100%
rename from src/test/run-pass/specialization/defaultimpl/out-of-order.rs
rename to src/test/ui/run-pass/specialization/defaultimpl/out-of-order.rs
diff --git a/src/test/run-pass/specialization/defaultimpl/overlap-projection.rs b/src/test/ui/run-pass/specialization/defaultimpl/overlap-projection.rs
similarity index 100%
rename from src/test/run-pass/specialization/defaultimpl/overlap-projection.rs
rename to src/test/ui/run-pass/specialization/defaultimpl/overlap-projection.rs
diff --git a/src/test/run-pass/specialization/defaultimpl/projection.rs b/src/test/ui/run-pass/specialization/defaultimpl/projection.rs
similarity index 100%
rename from src/test/run-pass/specialization/defaultimpl/projection.rs
rename to src/test/ui/run-pass/specialization/defaultimpl/projection.rs
diff --git a/src/test/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs b/src/test/ui/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs
similarity index 100%
rename from src/test/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs
rename to src/test/ui/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs
diff --git a/src/test/run-pass/specialization/specialization-allowed-cross-crate.rs b/src/test/ui/run-pass/specialization/specialization-allowed-cross-crate.rs
similarity index 100%
rename from src/test/run-pass/specialization/specialization-allowed-cross-crate.rs
rename to src/test/ui/run-pass/specialization/specialization-allowed-cross-crate.rs
diff --git a/src/test/run-pass/specialization/specialization-assoc-fns.rs b/src/test/ui/run-pass/specialization/specialization-assoc-fns.rs
similarity index 100%
rename from src/test/run-pass/specialization/specialization-assoc-fns.rs
rename to src/test/ui/run-pass/specialization/specialization-assoc-fns.rs
diff --git a/src/test/run-pass/specialization/specialization-basics.rs b/src/test/ui/run-pass/specialization/specialization-basics.rs
similarity index 100%
rename from src/test/run-pass/specialization/specialization-basics.rs
rename to src/test/ui/run-pass/specialization/specialization-basics.rs
diff --git a/src/test/run-pass/specialization/specialization-cross-crate-no-gate.rs b/src/test/ui/run-pass/specialization/specialization-cross-crate-no-gate.rs
similarity index 100%
rename from src/test/run-pass/specialization/specialization-cross-crate-no-gate.rs
rename to src/test/ui/run-pass/specialization/specialization-cross-crate-no-gate.rs
diff --git a/src/test/run-pass/specialization/specialization-cross-crate.rs b/src/test/ui/run-pass/specialization/specialization-cross-crate.rs
similarity index 100%
rename from src/test/run-pass/specialization/specialization-cross-crate.rs
rename to src/test/ui/run-pass/specialization/specialization-cross-crate.rs
diff --git a/src/test/run-pass/specialization/specialization-default-methods.rs b/src/test/ui/run-pass/specialization/specialization-default-methods.rs
similarity index 100%
rename from src/test/run-pass/specialization/specialization-default-methods.rs
rename to src/test/ui/run-pass/specialization/specialization-default-methods.rs
diff --git a/src/test/run-pass/specialization/specialization-on-projection.rs b/src/test/ui/run-pass/specialization/specialization-on-projection.rs
similarity index 100%
rename from src/test/run-pass/specialization/specialization-on-projection.rs
rename to src/test/ui/run-pass/specialization/specialization-on-projection.rs
diff --git a/src/test/run-pass/specialization/specialization-out-of-order.rs b/src/test/ui/run-pass/specialization/specialization-out-of-order.rs
similarity index 100%
rename from src/test/run-pass/specialization/specialization-out-of-order.rs
rename to src/test/ui/run-pass/specialization/specialization-out-of-order.rs
diff --git a/src/test/run-pass/specialization/specialization-overlap-projection.rs b/src/test/ui/run-pass/specialization/specialization-overlap-projection.rs
similarity index 100%
rename from src/test/run-pass/specialization/specialization-overlap-projection.rs
rename to src/test/ui/run-pass/specialization/specialization-overlap-projection.rs
diff --git a/src/test/run-pass/specialization/specialization-projection-alias.rs b/src/test/ui/run-pass/specialization/specialization-projection-alias.rs
similarity index 100%
rename from src/test/run-pass/specialization/specialization-projection-alias.rs
rename to src/test/ui/run-pass/specialization/specialization-projection-alias.rs
diff --git a/src/test/run-pass/specialization/specialization-projection.rs b/src/test/ui/run-pass/specialization/specialization-projection.rs
similarity index 100%
rename from src/test/run-pass/specialization/specialization-projection.rs
rename to src/test/ui/run-pass/specialization/specialization-projection.rs
diff --git a/src/test/run-pass/specialization/specialization-super-traits.rs b/src/test/ui/run-pass/specialization/specialization-super-traits.rs
similarity index 100%
rename from src/test/run-pass/specialization/specialization-super-traits.rs
rename to src/test/ui/run-pass/specialization/specialization-super-traits.rs
diff --git a/src/test/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs b/src/test/ui/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs
similarity index 100%
rename from src/test/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs
rename to src/test/ui/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs
diff --git a/src/test/run-pass/specialization/specialization-translate-projections-with-params.rs b/src/test/ui/run-pass/specialization/specialization-translate-projections-with-params.rs
similarity index 100%
rename from src/test/run-pass/specialization/specialization-translate-projections-with-params.rs
rename to src/test/ui/run-pass/specialization/specialization-translate-projections-with-params.rs
diff --git a/src/test/run-pass/specialization/specialization-translate-projections.rs b/src/test/ui/run-pass/specialization/specialization-translate-projections.rs
similarity index 100%
rename from src/test/run-pass/specialization/specialization-translate-projections.rs
rename to src/test/ui/run-pass/specialization/specialization-translate-projections.rs
diff --git a/src/test/run-pass/thinlto/all-crates.rs b/src/test/ui/run-pass/thinlto/all-crates.rs
similarity index 100%
rename from src/test/run-pass/thinlto/all-crates.rs
rename to src/test/ui/run-pass/thinlto/all-crates.rs
diff --git a/src/test/run-pass/thinlto/auxiliary/dylib.rs b/src/test/ui/run-pass/thinlto/auxiliary/dylib.rs
similarity index 100%
rename from src/test/run-pass/thinlto/auxiliary/dylib.rs
rename to src/test/ui/run-pass/thinlto/auxiliary/dylib.rs
diff --git a/src/test/run-pass/thinlto/auxiliary/msvc-imp-present.rs b/src/test/ui/run-pass/thinlto/auxiliary/msvc-imp-present.rs
similarity index 100%
rename from src/test/run-pass/thinlto/auxiliary/msvc-imp-present.rs
rename to src/test/ui/run-pass/thinlto/auxiliary/msvc-imp-present.rs
diff --git a/src/test/run-pass/thinlto/auxiliary/thin-lto-inlines-aux.rs b/src/test/ui/run-pass/thinlto/auxiliary/thin-lto-inlines-aux.rs
similarity index 100%
rename from src/test/run-pass/thinlto/auxiliary/thin-lto-inlines-aux.rs
rename to src/test/ui/run-pass/thinlto/auxiliary/thin-lto-inlines-aux.rs
diff --git a/src/test/run-pass/thinlto/dylib-works.rs b/src/test/ui/run-pass/thinlto/dylib-works.rs
similarity index 100%
rename from src/test/run-pass/thinlto/dylib-works.rs
rename to src/test/ui/run-pass/thinlto/dylib-works.rs
diff --git a/src/test/run-pass/thinlto/msvc-imp-present.rs b/src/test/ui/run-pass/thinlto/msvc-imp-present.rs
similarity index 100%
rename from src/test/run-pass/thinlto/msvc-imp-present.rs
rename to src/test/ui/run-pass/thinlto/msvc-imp-present.rs
diff --git a/src/test/run-pass/thinlto/thin-lto-inlines.rs b/src/test/ui/run-pass/thinlto/thin-lto-inlines.rs
similarity index 100%
rename from src/test/run-pass/thinlto/thin-lto-inlines.rs
rename to src/test/ui/run-pass/thinlto/thin-lto-inlines.rs
diff --git a/src/test/run-pass/thinlto/thin-lto-inlines2.rs b/src/test/ui/run-pass/thinlto/thin-lto-inlines2.rs
similarity index 100%
rename from src/test/run-pass/thinlto/thin-lto-inlines2.rs
rename to src/test/ui/run-pass/thinlto/thin-lto-inlines2.rs
diff --git a/src/test/run-pass/thinlto/weak-works.rs b/src/test/ui/run-pass/thinlto/weak-works.rs
similarity index 100%
rename from src/test/run-pass/thinlto/weak-works.rs
rename to src/test/ui/run-pass/thinlto/weak-works.rs
diff --git a/src/test/run-pass/uniform-paths/basic-nested.rs b/src/test/ui/run-pass/uniform-paths/basic-nested.rs
similarity index 100%
rename from src/test/run-pass/uniform-paths/basic-nested.rs
rename to src/test/ui/run-pass/uniform-paths/basic-nested.rs
diff --git a/src/test/run-pass/uniform-paths/basic.rs b/src/test/ui/run-pass/uniform-paths/basic.rs
similarity index 100%
rename from src/test/run-pass/uniform-paths/basic.rs
rename to src/test/ui/run-pass/uniform-paths/basic.rs
diff --git a/src/test/run-pass/uniform-paths/macros-nested.rs b/src/test/ui/run-pass/uniform-paths/macros-nested.rs
similarity index 100%
rename from src/test/run-pass/uniform-paths/macros-nested.rs
rename to src/test/ui/run-pass/uniform-paths/macros-nested.rs
diff --git a/src/test/run-pass/uniform-paths/macros.rs b/src/test/ui/run-pass/uniform-paths/macros.rs
similarity index 100%
rename from src/test/run-pass/uniform-paths/macros.rs
rename to src/test/ui/run-pass/uniform-paths/macros.rs
diff --git a/src/test/run-pass/uniform-paths/same-crate.rs b/src/test/ui/run-pass/uniform-paths/same-crate.rs
similarity index 100%
rename from src/test/run-pass/uniform-paths/same-crate.rs
rename to src/test/ui/run-pass/uniform-paths/same-crate.rs
diff --git a/src/test/run-pass/union/auxiliary/union.rs b/src/test/ui/run-pass/union/auxiliary/union.rs
similarity index 100%
rename from src/test/run-pass/union/auxiliary/union.rs
rename to src/test/ui/run-pass/union/auxiliary/union.rs
diff --git a/src/test/run-pass/union/union-align.rs b/src/test/ui/run-pass/union/union-align.rs
similarity index 100%
rename from src/test/run-pass/union/union-align.rs
rename to src/test/ui/run-pass/union/union-align.rs
diff --git a/src/test/run-pass/union/union-backcomp.rs b/src/test/ui/run-pass/union/union-backcomp.rs
similarity index 100%
rename from src/test/run-pass/union/union-backcomp.rs
rename to src/test/ui/run-pass/union/union-backcomp.rs
diff --git a/src/test/run-pass/union/union-basic.rs b/src/test/ui/run-pass/union/union-basic.rs
similarity index 100%
rename from src/test/run-pass/union/union-basic.rs
rename to src/test/ui/run-pass/union/union-basic.rs
diff --git a/src/test/run-pass/union/union-c-interop.rs b/src/test/ui/run-pass/union/union-c-interop.rs
similarity index 100%
rename from src/test/run-pass/union/union-c-interop.rs
rename to src/test/ui/run-pass/union/union-c-interop.rs
diff --git a/src/test/run-pass/union/union-const-codegen.rs b/src/test/ui/run-pass/union/union-const-codegen.rs
similarity index 100%
rename from src/test/run-pass/union/union-const-codegen.rs
rename to src/test/ui/run-pass/union/union-const-codegen.rs
diff --git a/src/test/run-pass/union/union-const-eval-field.rs b/src/test/ui/run-pass/union/union-const-eval-field.rs
similarity index 100%
rename from src/test/run-pass/union/union-const-eval-field.rs
rename to src/test/ui/run-pass/union/union-const-eval-field.rs
diff --git a/src/test/run-pass/union/union-derive.rs b/src/test/ui/run-pass/union/union-derive.rs
similarity index 100%
rename from src/test/run-pass/union/union-derive.rs
rename to src/test/ui/run-pass/union/union-derive.rs
diff --git a/src/test/run-pass/union/union-drop-assign.rs b/src/test/ui/run-pass/union/union-drop-assign.rs
similarity index 100%
rename from src/test/run-pass/union/union-drop-assign.rs
rename to src/test/ui/run-pass/union/union-drop-assign.rs
diff --git a/src/test/run-pass/union/union-drop.rs b/src/test/ui/run-pass/union/union-drop.rs
similarity index 100%
rename from src/test/run-pass/union/union-drop.rs
rename to src/test/ui/run-pass/union/union-drop.rs
diff --git a/src/test/run-pass/union/union-generic.rs b/src/test/ui/run-pass/union/union-generic.rs
similarity index 100%
rename from src/test/run-pass/union/union-generic.rs
rename to src/test/ui/run-pass/union/union-generic.rs
diff --git a/src/test/run-pass/union/union-inherent-method.rs b/src/test/ui/run-pass/union/union-inherent-method.rs
similarity index 100%
rename from src/test/run-pass/union/union-inherent-method.rs
rename to src/test/ui/run-pass/union/union-inherent-method.rs
diff --git a/src/test/run-pass/union/union-macro.rs b/src/test/ui/run-pass/union/union-macro.rs
similarity index 100%
rename from src/test/run-pass/union/union-macro.rs
rename to src/test/ui/run-pass/union/union-macro.rs
diff --git a/src/test/run-pass/union/union-nodrop.rs b/src/test/ui/run-pass/union/union-nodrop.rs
similarity index 100%
rename from src/test/run-pass/union/union-nodrop.rs
rename to src/test/ui/run-pass/union/union-nodrop.rs
diff --git a/src/test/run-pass/union/union-overwrite.rs b/src/test/ui/run-pass/union/union-overwrite.rs
similarity index 100%
rename from src/test/run-pass/union/union-overwrite.rs
rename to src/test/ui/run-pass/union/union-overwrite.rs
diff --git a/src/test/run-pass/union/union-packed.rs b/src/test/ui/run-pass/union/union-packed.rs
similarity index 100%
rename from src/test/run-pass/union/union-packed.rs
rename to src/test/ui/run-pass/union/union-packed.rs
diff --git a/src/test/run-pass/union/union-pat-refutability.rs b/src/test/ui/run-pass/union/union-pat-refutability.rs
similarity index 100%
rename from src/test/run-pass/union/union-pat-refutability.rs
rename to src/test/ui/run-pass/union/union-pat-refutability.rs
diff --git a/src/test/run-pass/union/union-trait-impl.rs b/src/test/ui/run-pass/union/union-trait-impl.rs
similarity index 100%
rename from src/test/run-pass/union/union-trait-impl.rs
rename to src/test/ui/run-pass/union/union-trait-impl.rs
diff --git a/src/test/run-pass/union/union-transmute.rs b/src/test/ui/run-pass/union/union-transmute.rs
similarity index 100%
rename from src/test/run-pass/union/union-transmute.rs
rename to src/test/ui/run-pass/union/union-transmute.rs
diff --git a/src/test/run-pass/union/union-with-drop-fields-lint.rs b/src/test/ui/run-pass/union/union-with-drop-fields-lint.rs
similarity index 100%
rename from src/test/run-pass/union/union-with-drop-fields-lint.rs
rename to src/test/ui/run-pass/union/union-with-drop-fields-lint.rs
diff --git a/src/test/run-pass/unsized-locals/reference-unsized-locals.rs b/src/test/ui/run-pass/unsized-locals/reference-unsized-locals.rs
similarity index 100%
rename from src/test/run-pass/unsized-locals/reference-unsized-locals.rs
rename to src/test/ui/run-pass/unsized-locals/reference-unsized-locals.rs
diff --git a/src/test/run-pass/unsized-locals/simple-unsized-locals.rs b/src/test/ui/run-pass/unsized-locals/simple-unsized-locals.rs
similarity index 100%
rename from src/test/run-pass/unsized-locals/simple-unsized-locals.rs
rename to src/test/ui/run-pass/unsized-locals/simple-unsized-locals.rs
diff --git a/src/test/run-pass/unsized-locals/unsized-exprs.rs b/src/test/ui/run-pass/unsized-locals/unsized-exprs.rs
similarity index 100%
rename from src/test/run-pass/unsized-locals/unsized-exprs.rs
rename to src/test/ui/run-pass/unsized-locals/unsized-exprs.rs
diff --git a/src/test/run-pass/unsized-locals/unsized-parameters.rs b/src/test/ui/run-pass/unsized-locals/unsized-parameters.rs
similarity index 100%
rename from src/test/run-pass/unsized-locals/unsized-parameters.rs
rename to src/test/ui/run-pass/unsized-locals/unsized-parameters.rs