diff --git a/src/test/ui/compile-fail-migration/.gitattributes b/src/test/ui/.gitattributes similarity index 100% rename from src/test/ui/compile-fail-migration/.gitattributes rename to src/test/ui/.gitattributes diff --git a/src/test/ui/compile-fail-migration/E0501.ast.nll.stderr b/src/test/ui/E0501.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/E0501.ast.nll.stderr rename to src/test/ui/E0501.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/E0501.ast.stderr b/src/test/ui/E0501.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/E0501.ast.stderr rename to src/test/ui/E0501.ast.stderr diff --git a/src/test/ui/compile-fail-migration/E0501.mir.stderr b/src/test/ui/E0501.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/E0501.mir.stderr rename to src/test/ui/E0501.mir.stderr diff --git a/src/test/ui/compile-fail-migration/E0501.rs b/src/test/ui/E0501.rs similarity index 100% rename from src/test/ui/compile-fail-migration/E0501.rs rename to src/test/ui/E0501.rs diff --git a/src/test/ui/compile-fail-migration/E0506.ast.nll.stderr b/src/test/ui/E0506.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/E0506.ast.nll.stderr rename to src/test/ui/E0506.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/E0506.ast.stderr b/src/test/ui/E0506.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/E0506.ast.stderr rename to src/test/ui/E0506.ast.stderr diff --git a/src/test/ui/compile-fail-migration/E0506.mir.stderr b/src/test/ui/E0506.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/E0506.mir.stderr rename to src/test/ui/E0506.mir.stderr diff --git a/src/test/ui/compile-fail-migration/E0506.rs b/src/test/ui/E0506.rs similarity index 100% rename from src/test/ui/compile-fail-migration/E0506.rs rename to src/test/ui/E0506.rs diff --git a/src/test/ui/E0508-fail.ast.stderr b/src/test/ui/E0508-fail.ast.stderr new file mode 100644 index 00000000000..faf7411af31 --- /dev/null +++ b/src/test/ui/E0508-fail.ast.stderr @@ -0,0 +1,12 @@ +error[E0508]: cannot move out of type `[NonCopy; 1]`, a non-copy array + --> $DIR/E0508-fail.rs:18:18 + | +LL | let _value = array[0]; //[ast]~ ERROR [E0508] + | ^^^^^^^^ + | | + | cannot move out of here + | help: consider using a reference instead: `&array[0]` + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0508`. diff --git a/src/test/ui/E0508-fail.mir.stderr b/src/test/ui/E0508-fail.mir.stderr new file mode 100644 index 00000000000..faf7411af31 --- /dev/null +++ b/src/test/ui/E0508-fail.mir.stderr @@ -0,0 +1,12 @@ +error[E0508]: cannot move out of type `[NonCopy; 1]`, a non-copy array + --> $DIR/E0508-fail.rs:18:18 + | +LL | let _value = array[0]; //[ast]~ ERROR [E0508] + | ^^^^^^^^ + | | + | cannot move out of here + | help: consider using a reference instead: `&array[0]` + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0508`. diff --git a/src/test/ui/compile-fail-migration/E0508.rs b/src/test/ui/E0508-fail.rs similarity index 100% rename from src/test/ui/compile-fail-migration/E0508.rs rename to src/test/ui/E0508-fail.rs diff --git a/src/test/ui/compile-fail-migration/E0508.ast.stderr b/src/test/ui/E0508.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/E0508.ast.stderr rename to src/test/ui/E0508.ast.stderr diff --git a/src/test/ui/compile-fail-migration/E0508.mir.stderr b/src/test/ui/E0508.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/E0508.mir.stderr rename to src/test/ui/E0508.mir.stderr diff --git a/src/test/ui/compile-fail-migration/E0583.rs b/src/test/ui/E0583.rs similarity index 100% rename from src/test/ui/compile-fail-migration/E0583.rs rename to src/test/ui/E0583.rs diff --git a/src/test/ui/compile-fail-migration/E0583.stderr b/src/test/ui/E0583.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/E0583.stderr rename to src/test/ui/E0583.stderr diff --git a/src/test/ui/compile-fail-migration/E0594.ast.nll.stderr b/src/test/ui/E0594.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/E0594.ast.nll.stderr rename to src/test/ui/E0594.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/E0594.ast.stderr b/src/test/ui/E0594.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/E0594.ast.stderr rename to src/test/ui/E0594.ast.stderr diff --git a/src/test/ui/compile-fail-migration/E0594.mir.stderr b/src/test/ui/E0594.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/E0594.mir.stderr rename to src/test/ui/E0594.mir.stderr diff --git a/src/test/ui/compile-fail-migration/E0594.rs b/src/test/ui/E0594.rs similarity index 100% rename from src/test/ui/compile-fail-migration/E0594.rs rename to src/test/ui/E0594.rs diff --git a/src/test/ui/compile-fail-migration/E0596.ast.nll.stderr b/src/test/ui/E0596.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/E0596.ast.nll.stderr rename to src/test/ui/E0596.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/E0596.ast.stderr b/src/test/ui/E0596.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/E0596.ast.stderr rename to src/test/ui/E0596.ast.stderr diff --git a/src/test/ui/compile-fail-migration/E0596.mir.stderr b/src/test/ui/E0596.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/E0596.mir.stderr rename to src/test/ui/E0596.mir.stderr diff --git a/src/test/ui/compile-fail-migration/E0596.rs b/src/test/ui/E0596.rs similarity index 100% rename from src/test/ui/compile-fail-migration/E0596.rs rename to src/test/ui/E0596.rs diff --git a/src/test/ui/compile-fail-migration/absolute-paths-in-nested-use-groups.rs b/src/test/ui/absolute-paths-in-nested-use-groups.rs similarity index 100% rename from src/test/ui/compile-fail-migration/absolute-paths-in-nested-use-groups.rs rename to src/test/ui/absolute-paths-in-nested-use-groups.rs diff --git a/src/test/ui/compile-fail-migration/absolute-paths-in-nested-use-groups.stderr b/src/test/ui/absolute-paths-in-nested-use-groups.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/absolute-paths-in-nested-use-groups.stderr rename to src/test/ui/absolute-paths-in-nested-use-groups.stderr diff --git a/src/test/ui/compile-fail-migration/access-mode-in-closures.nll.stderr b/src/test/ui/access-mode-in-closures.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/access-mode-in-closures.nll.stderr rename to src/test/ui/access-mode-in-closures.nll.stderr diff --git a/src/test/ui/compile-fail-migration/access-mode-in-closures.rs b/src/test/ui/access-mode-in-closures.rs similarity index 100% rename from src/test/ui/compile-fail-migration/access-mode-in-closures.rs rename to src/test/ui/access-mode-in-closures.rs diff --git a/src/test/ui/compile-fail-migration/access-mode-in-closures.stderr b/src/test/ui/access-mode-in-closures.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/access-mode-in-closures.stderr rename to src/test/ui/access-mode-in-closures.stderr diff --git a/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-1.rs b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-1.rs rename to src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.rs diff --git a/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-1.stderr b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-1.stderr rename to src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.stderr diff --git a/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-2.rs b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-2.rs rename to src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.rs diff --git a/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-2.stderr b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-2.stderr rename to src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.stderr diff --git a/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-3.rs b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-3.rs rename to src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.rs diff --git a/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-3.stderr b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-3.stderr rename to src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.stderr diff --git a/src/test/ui/compile-fail-migration/allocator/auxiliary/system-allocator.rs b/src/test/ui/allocator/auxiliary/system-allocator.rs similarity index 100% rename from src/test/ui/compile-fail-migration/allocator/auxiliary/system-allocator.rs rename to src/test/ui/allocator/auxiliary/system-allocator.rs diff --git a/src/test/ui/compile-fail-migration/allocator/auxiliary/system-allocator2.rs b/src/test/ui/allocator/auxiliary/system-allocator2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/allocator/auxiliary/system-allocator2.rs rename to src/test/ui/allocator/auxiliary/system-allocator2.rs diff --git a/src/test/ui/compile-fail-migration/allocator/function-allocator.rs b/src/test/ui/allocator/function-allocator.rs similarity index 100% rename from src/test/ui/compile-fail-migration/allocator/function-allocator.rs rename to src/test/ui/allocator/function-allocator.rs diff --git a/src/test/ui/compile-fail-migration/allocator/function-allocator.stderr b/src/test/ui/allocator/function-allocator.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/allocator/function-allocator.stderr rename to src/test/ui/allocator/function-allocator.stderr diff --git a/src/test/ui/compile-fail-migration/allocator/not-an-allocator.rs b/src/test/ui/allocator/not-an-allocator.rs similarity index 100% rename from src/test/ui/compile-fail-migration/allocator/not-an-allocator.rs rename to src/test/ui/allocator/not-an-allocator.rs diff --git a/src/test/ui/compile-fail-migration/allocator/not-an-allocator.stderr b/src/test/ui/allocator/not-an-allocator.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/allocator/not-an-allocator.stderr rename to src/test/ui/allocator/not-an-allocator.stderr diff --git a/src/test/ui/compile-fail-migration/allocator/two-allocators.rs b/src/test/ui/allocator/two-allocators.rs similarity index 100% rename from src/test/ui/compile-fail-migration/allocator/two-allocators.rs rename to src/test/ui/allocator/two-allocators.rs diff --git a/src/test/ui/compile-fail-migration/allocator/two-allocators.stderr b/src/test/ui/allocator/two-allocators.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/allocator/two-allocators.stderr rename to src/test/ui/allocator/two-allocators.stderr diff --git a/src/test/ui/compile-fail-migration/allocator/two-allocators2.rs b/src/test/ui/allocator/two-allocators2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/allocator/two-allocators2.rs rename to src/test/ui/allocator/two-allocators2.rs diff --git a/src/test/ui/compile-fail-migration/allocator/two-allocators2.stderr b/src/test/ui/allocator/two-allocators2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/allocator/two-allocators2.stderr rename to src/test/ui/allocator/two-allocators2.stderr diff --git a/src/test/ui/compile-fail-migration/allocator/two-allocators3.rs b/src/test/ui/allocator/two-allocators3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/allocator/two-allocators3.rs rename to src/test/ui/allocator/two-allocators3.rs diff --git a/src/test/ui/compile-fail-migration/allocator/two-allocators3.stderr b/src/test/ui/allocator/two-allocators3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/allocator/two-allocators3.stderr rename to src/test/ui/allocator/two-allocators3.stderr diff --git a/src/test/ui/compile-fail-migration/anon-params-deprecated.rs b/src/test/ui/anon-params-deprecated.rs similarity index 100% rename from src/test/ui/compile-fail-migration/anon-params-deprecated.rs rename to src/test/ui/anon-params-deprecated.rs diff --git a/src/test/ui/compile-fail-migration/anon-params-deprecated.stderr b/src/test/ui/anon-params-deprecated.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/anon-params-deprecated.stderr rename to src/test/ui/anon-params-deprecated.stderr diff --git a/src/test/ui/compile-fail-migration/arg-count-mismatch.rs b/src/test/ui/arg-count-mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/arg-count-mismatch.rs rename to src/test/ui/arg-count-mismatch.rs diff --git a/src/test/ui/compile-fail-migration/arg-count-mismatch.stderr b/src/test/ui/arg-count-mismatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/arg-count-mismatch.stderr rename to src/test/ui/arg-count-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/arg-type-mismatch.rs b/src/test/ui/arg-type-mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/arg-type-mismatch.rs rename to src/test/ui/arg-type-mismatch.rs diff --git a/src/test/ui/compile-fail-migration/arg-type-mismatch.stderr b/src/test/ui/arg-type-mismatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/arg-type-mismatch.stderr rename to src/test/ui/arg-type-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/array-not-vector.rs b/src/test/ui/array-not-vector.rs similarity index 100% rename from src/test/ui/compile-fail-migration/array-not-vector.rs rename to src/test/ui/array-not-vector.rs diff --git a/src/test/ui/compile-fail-migration/array-not-vector.stderr b/src/test/ui/array-not-vector.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/array-not-vector.stderr rename to src/test/ui/array-not-vector.stderr diff --git a/src/test/ui/compile-fail-migration/array_const_index-0.rs b/src/test/ui/array_const_index-0.rs similarity index 100% rename from src/test/ui/compile-fail-migration/array_const_index-0.rs rename to src/test/ui/array_const_index-0.rs diff --git a/src/test/ui/compile-fail-migration/array_const_index-0.stderr b/src/test/ui/array_const_index-0.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/array_const_index-0.stderr rename to src/test/ui/array_const_index-0.stderr diff --git a/src/test/ui/compile-fail-migration/array_const_index-1.rs b/src/test/ui/array_const_index-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/array_const_index-1.rs rename to src/test/ui/array_const_index-1.rs diff --git a/src/test/ui/compile-fail-migration/array_const_index-1.stderr b/src/test/ui/array_const_index-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/array_const_index-1.stderr rename to src/test/ui/array_const_index-1.stderr diff --git a/src/test/ui/compile-fail-migration/asm-bad-clobber.rs b/src/test/ui/asm/asm-bad-clobber.rs similarity index 100% rename from src/test/ui/compile-fail-migration/asm-bad-clobber.rs rename to src/test/ui/asm/asm-bad-clobber.rs diff --git a/src/test/ui/compile-fail-migration/asm-bad-clobber.stderr b/src/test/ui/asm/asm-bad-clobber.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/asm-bad-clobber.stderr rename to src/test/ui/asm/asm-bad-clobber.stderr diff --git a/src/test/ui/compile-fail-migration/asm-in-bad-modifier.rs b/src/test/ui/asm/asm-in-bad-modifier.rs similarity index 100% rename from src/test/ui/compile-fail-migration/asm-in-bad-modifier.rs rename to src/test/ui/asm/asm-in-bad-modifier.rs diff --git a/src/test/ui/compile-fail-migration/asm-in-bad-modifier.stderr b/src/test/ui/asm/asm-in-bad-modifier.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/asm-in-bad-modifier.stderr rename to src/test/ui/asm/asm-in-bad-modifier.stderr diff --git a/src/test/ui/compile-fail-migration/asm-misplaced-option.rs b/src/test/ui/asm/asm-misplaced-option.rs similarity index 100% rename from src/test/ui/compile-fail-migration/asm-misplaced-option.rs rename to src/test/ui/asm/asm-misplaced-option.rs diff --git a/src/test/ui/compile-fail-migration/asm-misplaced-option.stderr b/src/test/ui/asm/asm-misplaced-option.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/asm-misplaced-option.stderr rename to src/test/ui/asm/asm-misplaced-option.stderr diff --git a/src/test/ui/asm-out-assign-imm.nll.stderr b/src/test/ui/asm/asm-out-assign-imm.nll.stderr similarity index 100% rename from src/test/ui/asm-out-assign-imm.nll.stderr rename to src/test/ui/asm/asm-out-assign-imm.nll.stderr diff --git a/src/test/ui/asm-out-assign-imm.rs b/src/test/ui/asm/asm-out-assign-imm.rs similarity index 100% rename from src/test/ui/asm-out-assign-imm.rs rename to src/test/ui/asm/asm-out-assign-imm.rs diff --git a/src/test/ui/asm-out-assign-imm.stderr b/src/test/ui/asm/asm-out-assign-imm.stderr similarity index 100% rename from src/test/ui/asm-out-assign-imm.stderr rename to src/test/ui/asm/asm-out-assign-imm.stderr diff --git a/src/test/ui/compile-fail-migration/asm-out-no-modifier.rs b/src/test/ui/asm/asm-out-no-modifier.rs similarity index 100% rename from src/test/ui/compile-fail-migration/asm-out-no-modifier.rs rename to src/test/ui/asm/asm-out-no-modifier.rs diff --git a/src/test/ui/compile-fail-migration/asm-out-no-modifier.stderr b/src/test/ui/asm/asm-out-no-modifier.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/asm-out-no-modifier.stderr rename to src/test/ui/asm/asm-out-no-modifier.stderr diff --git a/src/test/ui/compile-fail-migration/asm-out-read-uninit.ast.stderr b/src/test/ui/asm/asm-out-read-uninit.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/asm-out-read-uninit.ast.stderr rename to src/test/ui/asm/asm-out-read-uninit.ast.stderr diff --git a/src/test/ui/compile-fail-migration/asm-out-read-uninit.mir.stderr b/src/test/ui/asm/asm-out-read-uninit.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/asm-out-read-uninit.mir.stderr rename to src/test/ui/asm/asm-out-read-uninit.mir.stderr diff --git a/src/test/ui/compile-fail-migration/asm-out-read-uninit.rs b/src/test/ui/asm/asm-out-read-uninit.rs similarity index 100% rename from src/test/ui/compile-fail-migration/asm-out-read-uninit.rs rename to src/test/ui/asm/asm-out-read-uninit.rs diff --git a/src/test/ui/compile-fail-migration/asm-src-loc-codegen-units.rs b/src/test/ui/asm/asm-src-loc-codegen-units.rs similarity index 100% rename from src/test/ui/compile-fail-migration/asm-src-loc-codegen-units.rs rename to src/test/ui/asm/asm-src-loc-codegen-units.rs diff --git a/src/test/ui/compile-fail-migration/asm-src-loc-codegen-units.stderr b/src/test/ui/asm/asm-src-loc-codegen-units.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/asm-src-loc-codegen-units.stderr rename to src/test/ui/asm/asm-src-loc-codegen-units.stderr diff --git a/src/test/ui/compile-fail-migration/asm-src-loc.rs b/src/test/ui/asm/asm-src-loc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/asm-src-loc.rs rename to src/test/ui/asm/asm-src-loc.rs diff --git a/src/test/ui/compile-fail-migration/asm-src-loc.stderr b/src/test/ui/asm/asm-src-loc.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/asm-src-loc.stderr rename to src/test/ui/asm/asm-src-loc.stderr diff --git a/src/test/ui/compile-fail-migration/assign-imm-local-twice.ast.nll.stderr b/src/test/ui/assign-imm-local-twice.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/assign-imm-local-twice.ast.nll.stderr rename to src/test/ui/assign-imm-local-twice.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/assign-imm-local-twice.ast.stderr b/src/test/ui/assign-imm-local-twice.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/assign-imm-local-twice.ast.stderr rename to src/test/ui/assign-imm-local-twice.ast.stderr diff --git a/src/test/ui/compile-fail-migration/assign-imm-local-twice.mir.stderr b/src/test/ui/assign-imm-local-twice.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/assign-imm-local-twice.mir.stderr rename to src/test/ui/assign-imm-local-twice.mir.stderr diff --git a/src/test/ui/compile-fail-migration/assign-imm-local-twice.rs b/src/test/ui/assign-imm-local-twice.rs similarity index 100% rename from src/test/ui/compile-fail-migration/assign-imm-local-twice.rs rename to src/test/ui/assign-imm-local-twice.rs diff --git a/src/test/ui/compile-fail-migration/assign-to-method.rs b/src/test/ui/assign-to-method.rs similarity index 100% rename from src/test/ui/compile-fail-migration/assign-to-method.rs rename to src/test/ui/assign-to-method.rs diff --git a/src/test/ui/compile-fail-migration/assign-to-method.stderr b/src/test/ui/assign-to-method.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/assign-to-method.stderr rename to src/test/ui/assign-to-method.stderr diff --git a/src/test/ui/compile-fail-migration/assignment-operator-unimplemented.rs b/src/test/ui/assignment-operator-unimplemented.rs similarity index 100% rename from src/test/ui/compile-fail-migration/assignment-operator-unimplemented.rs rename to src/test/ui/assignment-operator-unimplemented.rs diff --git a/src/test/ui/compile-fail-migration/assignment-operator-unimplemented.stderr b/src/test/ui/assignment-operator-unimplemented.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/assignment-operator-unimplemented.stderr rename to src/test/ui/assignment-operator-unimplemented.stderr diff --git a/src/test/ui/compile-fail-migration/assoc-inherent.rs b/src/test/ui/assoc-inherent.rs similarity index 100% rename from src/test/ui/compile-fail-migration/assoc-inherent.rs rename to src/test/ui/assoc-inherent.rs diff --git a/src/test/ui/compile-fail-migration/assoc-inherent.stderr b/src/test/ui/assoc-inherent.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/assoc-inherent.stderr rename to src/test/ui/assoc-inherent.stderr diff --git a/src/test/ui/compile-fail-migration/associated-const-ambiguity-report.rs b/src/test/ui/associated-const/associated-const-ambiguity-report.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-ambiguity-report.rs rename to src/test/ui/associated-const/associated-const-ambiguity-report.rs diff --git a/src/test/ui/compile-fail-migration/associated-const-ambiguity-report.stderr b/src/test/ui/associated-const/associated-const-ambiguity-report.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-ambiguity-report.stderr rename to src/test/ui/associated-const/associated-const-ambiguity-report.stderr diff --git a/src/test/ui/compile-fail-migration/associated-const-array-len.rs b/src/test/ui/associated-const/associated-const-array-len.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-array-len.rs rename to src/test/ui/associated-const/associated-const-array-len.rs diff --git a/src/test/ui/compile-fail-migration/associated-const-array-len.stderr b/src/test/ui/associated-const/associated-const-array-len.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-array-len.stderr rename to src/test/ui/associated-const/associated-const-array-len.stderr diff --git a/src/test/ui/compile-fail-migration/associated-const-dead-code.rs b/src/test/ui/associated-const/associated-const-dead-code.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-dead-code.rs rename to src/test/ui/associated-const/associated-const-dead-code.rs diff --git a/src/test/ui/compile-fail-migration/associated-const-dead-code.stderr b/src/test/ui/associated-const/associated-const-dead-code.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-dead-code.stderr rename to src/test/ui/associated-const/associated-const-dead-code.stderr diff --git a/src/test/ui/compile-fail-migration/associated-const-generic-obligations.rs b/src/test/ui/associated-const/associated-const-generic-obligations.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-generic-obligations.rs rename to src/test/ui/associated-const/associated-const-generic-obligations.rs diff --git a/src/test/ui/compile-fail-migration/associated-const-generic-obligations.stderr b/src/test/ui/associated-const/associated-const-generic-obligations.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-generic-obligations.stderr rename to src/test/ui/associated-const/associated-const-generic-obligations.stderr diff --git a/src/test/ui/associated-const-impl-wrong-lifetime.rs b/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.rs similarity index 100% rename from src/test/ui/associated-const-impl-wrong-lifetime.rs rename to src/test/ui/associated-const/associated-const-impl-wrong-lifetime.rs diff --git a/src/test/ui/associated-const-impl-wrong-lifetime.stderr b/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.stderr similarity index 100% rename from src/test/ui/associated-const-impl-wrong-lifetime.stderr rename to src/test/ui/associated-const/associated-const-impl-wrong-lifetime.stderr diff --git a/src/test/ui/associated-const-impl-wrong-type.rs b/src/test/ui/associated-const/associated-const-impl-wrong-type.rs similarity index 100% rename from src/test/ui/associated-const-impl-wrong-type.rs rename to src/test/ui/associated-const/associated-const-impl-wrong-type.rs diff --git a/src/test/ui/associated-const-impl-wrong-type.stderr b/src/test/ui/associated-const/associated-const-impl-wrong-type.stderr similarity index 100% rename from src/test/ui/associated-const-impl-wrong-type.stderr rename to src/test/ui/associated-const/associated-const-impl-wrong-type.stderr diff --git a/src/test/ui/compile-fail-migration/associated-const-in-trait.rs b/src/test/ui/associated-const/associated-const-in-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-in-trait.rs rename to src/test/ui/associated-const/associated-const-in-trait.rs diff --git a/src/test/ui/compile-fail-migration/associated-const-in-trait.stderr b/src/test/ui/associated-const/associated-const-in-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-in-trait.stderr rename to src/test/ui/associated-const/associated-const-in-trait.stderr diff --git a/src/test/ui/compile-fail-migration/associated-const-no-item.rs b/src/test/ui/associated-const/associated-const-no-item.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-no-item.rs rename to src/test/ui/associated-const/associated-const-no-item.rs diff --git a/src/test/ui/compile-fail-migration/associated-const-no-item.stderr b/src/test/ui/associated-const/associated-const-no-item.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-no-item.stderr rename to src/test/ui/associated-const/associated-const-no-item.stderr diff --git a/src/test/ui/compile-fail-migration/associated-const-private-impl.rs b/src/test/ui/associated-const/associated-const-private-impl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-private-impl.rs rename to src/test/ui/associated-const/associated-const-private-impl.rs diff --git a/src/test/ui/compile-fail-migration/associated-const-private-impl.stderr b/src/test/ui/associated-const/associated-const-private-impl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-private-impl.stderr rename to src/test/ui/associated-const/associated-const-private-impl.stderr diff --git a/src/test/ui/compile-fail-migration/associated-const-type-parameter-arms.rs b/src/test/ui/associated-const/associated-const-type-parameter-arms.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-type-parameter-arms.rs rename to src/test/ui/associated-const/associated-const-type-parameter-arms.rs diff --git a/src/test/ui/compile-fail-migration/associated-const-type-parameter-arms.stderr b/src/test/ui/associated-const/associated-const-type-parameter-arms.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-type-parameter-arms.stderr rename to src/test/ui/associated-const/associated-const-type-parameter-arms.stderr diff --git a/src/test/ui/compile-fail-migration/associated-const-type-parameter-arrays-2.rs b/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-type-parameter-arrays-2.rs rename to src/test/ui/associated-const/associated-const-type-parameter-arrays-2.rs diff --git a/src/test/ui/compile-fail-migration/associated-const-type-parameter-arrays-2.stderr b/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-type-parameter-arrays-2.stderr rename to src/test/ui/associated-const/associated-const-type-parameter-arrays-2.stderr diff --git a/src/test/ui/compile-fail-migration/associated-const-type-parameter-arrays.rs b/src/test/ui/associated-const/associated-const-type-parameter-arrays.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-type-parameter-arrays.rs rename to src/test/ui/associated-const/associated-const-type-parameter-arrays.rs diff --git a/src/test/ui/compile-fail-migration/associated-const-type-parameter-arrays.stderr b/src/test/ui/associated-const/associated-const-type-parameter-arrays.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-type-parameter-arrays.stderr rename to src/test/ui/associated-const/associated-const-type-parameter-arrays.stderr diff --git a/src/test/ui/compile-fail-migration/associated-const-upper-case-lint.rs b/src/test/ui/associated-const/associated-const-upper-case-lint.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-upper-case-lint.rs rename to src/test/ui/associated-const/associated-const-upper-case-lint.rs diff --git a/src/test/ui/compile-fail-migration/associated-const-upper-case-lint.stderr b/src/test/ui/associated-const/associated-const-upper-case-lint.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-const-upper-case-lint.stderr rename to src/test/ui/associated-const/associated-const-upper-case-lint.stderr diff --git a/src/test/ui/compile-fail-migration/associated-item-duplicate-names-2.rs b/src/test/ui/associated-item/associated-item-duplicate-names-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-item-duplicate-names-2.rs rename to src/test/ui/associated-item/associated-item-duplicate-names-2.rs diff --git a/src/test/ui/compile-fail-migration/associated-item-duplicate-names-2.stderr b/src/test/ui/associated-item/associated-item-duplicate-names-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-item-duplicate-names-2.stderr rename to src/test/ui/associated-item/associated-item-duplicate-names-2.stderr diff --git a/src/test/ui/compile-fail-migration/associated-item-duplicate-names-3.rs b/src/test/ui/associated-item/associated-item-duplicate-names-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-item-duplicate-names-3.rs rename to src/test/ui/associated-item/associated-item-duplicate-names-3.rs diff --git a/src/test/ui/compile-fail-migration/associated-item-duplicate-names-3.stderr b/src/test/ui/associated-item/associated-item-duplicate-names-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-item-duplicate-names-3.stderr rename to src/test/ui/associated-item/associated-item-duplicate-names-3.stderr diff --git a/src/test/ui/compile-fail-migration/associated-item-duplicate-names.rs b/src/test/ui/associated-item/associated-item-duplicate-names.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-item-duplicate-names.rs rename to src/test/ui/associated-item/associated-item-duplicate-names.rs diff --git a/src/test/ui/compile-fail-migration/associated-item-duplicate-names.stderr b/src/test/ui/associated-item/associated-item-duplicate-names.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-item-duplicate-names.stderr rename to src/test/ui/associated-item/associated-item-duplicate-names.stderr diff --git a/src/test/ui/compile-fail-migration/associated-path-shl.rs b/src/test/ui/associated-path-shl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-path-shl.rs rename to src/test/ui/associated-path-shl.rs diff --git a/src/test/ui/compile-fail-migration/associated-path-shl.stderr b/src/test/ui/associated-path-shl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-path-shl.stderr rename to src/test/ui/associated-path-shl.stderr diff --git a/src/test/ui/compile-fail-migration/associated-type-projection-ambig-between-bound-and-where-clause.rs b/src/test/ui/associated-type/associated-type-projection-ambig-between-bound-and-where-clause.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-type-projection-ambig-between-bound-and-where-clause.rs rename to src/test/ui/associated-type/associated-type-projection-ambig-between-bound-and-where-clause.rs diff --git a/src/test/ui/compile-fail-migration/associated-type-projection-ambig-between-bound-and-where-clause.stderr b/src/test/ui/associated-type/associated-type-projection-ambig-between-bound-and-where-clause.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-type-projection-ambig-between-bound-and-where-clause.stderr rename to src/test/ui/associated-type/associated-type-projection-ambig-between-bound-and-where-clause.stderr diff --git a/src/test/ui/associated-type-projection-from-multiple-supertraits.rs b/src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.rs similarity index 100% rename from src/test/ui/associated-type-projection-from-multiple-supertraits.rs rename to src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.rs diff --git a/src/test/ui/associated-type-projection-from-multiple-supertraits.stderr b/src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.stderr similarity index 100% rename from src/test/ui/associated-type-projection-from-multiple-supertraits.stderr rename to src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.stderr diff --git a/src/test/ui/compile-fail-migration/associated-type-projection-from-supertrait.rs b/src/test/ui/associated-type/associated-type-projection-from-supertrait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-type-projection-from-supertrait.rs rename to src/test/ui/associated-type/associated-type-projection-from-supertrait.rs diff --git a/src/test/ui/compile-fail-migration/associated-type-projection-from-supertrait.stderr b/src/test/ui/associated-type/associated-type-projection-from-supertrait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-type-projection-from-supertrait.stderr rename to src/test/ui/associated-type/associated-type-projection-from-supertrait.stderr diff --git a/src/test/ui/associated-types-ICE-when-projecting-out-of-err.rs b/src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.rs similarity index 100% rename from src/test/ui/associated-types-ICE-when-projecting-out-of-err.rs rename to src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.rs diff --git a/src/test/ui/associated-types-ICE-when-projecting-out-of-err.stderr b/src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.stderr similarity index 100% rename from src/test/ui/associated-types-ICE-when-projecting-out-of-err.stderr rename to src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-binding-to-type-defined-in-supertrait.rs b/src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-binding-to-type-defined-in-supertrait.rs rename to src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-binding-to-type-defined-in-supertrait.stderr b/src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-binding-to-type-defined-in-supertrait.stderr rename to src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-bound-failure.rs b/src/test/ui/associated-types/associated-types-bound-failure.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-bound-failure.rs rename to src/test/ui/associated-types/associated-types-bound-failure.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-bound-failure.stderr b/src/test/ui/associated-types/associated-types-bound-failure.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-bound-failure.stderr rename to src/test/ui/associated-types/associated-types-bound-failure.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-coherence-failure.rs b/src/test/ui/associated-types/associated-types-coherence-failure.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-coherence-failure.rs rename to src/test/ui/associated-types/associated-types-coherence-failure.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-coherence-failure.stderr b/src/test/ui/associated-types/associated-types-coherence-failure.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-coherence-failure.stderr rename to src/test/ui/associated-types/associated-types-coherence-failure.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-eq-1.rs b/src/test/ui/associated-types/associated-types-eq-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-eq-1.rs rename to src/test/ui/associated-types/associated-types-eq-1.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-eq-1.stderr b/src/test/ui/associated-types/associated-types-eq-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-eq-1.stderr rename to src/test/ui/associated-types/associated-types-eq-1.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-eq-2.rs b/src/test/ui/associated-types/associated-types-eq-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-eq-2.rs rename to src/test/ui/associated-types/associated-types-eq-2.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-eq-2.stderr b/src/test/ui/associated-types/associated-types-eq-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-eq-2.stderr rename to src/test/ui/associated-types/associated-types-eq-2.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-eq-3.rs b/src/test/ui/associated-types/associated-types-eq-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-eq-3.rs rename to src/test/ui/associated-types/associated-types-eq-3.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-eq-3.stderr b/src/test/ui/associated-types/associated-types-eq-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-eq-3.stderr rename to src/test/ui/associated-types/associated-types-eq-3.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-eq-expr-path.rs b/src/test/ui/associated-types/associated-types-eq-expr-path.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-eq-expr-path.rs rename to src/test/ui/associated-types/associated-types-eq-expr-path.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-eq-expr-path.stderr b/src/test/ui/associated-types/associated-types-eq-expr-path.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-eq-expr-path.stderr rename to src/test/ui/associated-types/associated-types-eq-expr-path.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-eq-hr.rs b/src/test/ui/associated-types/associated-types-eq-hr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-eq-hr.rs rename to src/test/ui/associated-types/associated-types-eq-hr.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-eq-hr.stderr b/src/test/ui/associated-types/associated-types-eq-hr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-eq-hr.stderr rename to src/test/ui/associated-types/associated-types-eq-hr.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-for-unimpl-trait.rs b/src/test/ui/associated-types/associated-types-for-unimpl-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-for-unimpl-trait.rs rename to src/test/ui/associated-types/associated-types-for-unimpl-trait.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-for-unimpl-trait.stderr b/src/test/ui/associated-types/associated-types-for-unimpl-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-for-unimpl-trait.stderr rename to src/test/ui/associated-types/associated-types-for-unimpl-trait.stderr diff --git a/src/test/ui/associated-types-in-ambiguous-context.rs b/src/test/ui/associated-types/associated-types-in-ambiguous-context.rs similarity index 100% rename from src/test/ui/associated-types-in-ambiguous-context.rs rename to src/test/ui/associated-types/associated-types-in-ambiguous-context.rs diff --git a/src/test/ui/associated-types-in-ambiguous-context.stderr b/src/test/ui/associated-types/associated-types-in-ambiguous-context.stderr similarity index 100% rename from src/test/ui/associated-types-in-ambiguous-context.stderr rename to src/test/ui/associated-types/associated-types-in-ambiguous-context.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-incomplete-object.rs b/src/test/ui/associated-types/associated-types-incomplete-object.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-incomplete-object.rs rename to src/test/ui/associated-types/associated-types-incomplete-object.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-incomplete-object.stderr b/src/test/ui/associated-types/associated-types-incomplete-object.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-incomplete-object.stderr rename to src/test/ui/associated-types/associated-types-incomplete-object.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-invalid-trait-ref-issue-18865.rs b/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-invalid-trait-ref-issue-18865.rs rename to src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-invalid-trait-ref-issue-18865.stderr b/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-invalid-trait-ref-issue-18865.stderr rename to src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-issue-17359.rs b/src/test/ui/associated-types/associated-types-issue-17359.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-issue-17359.rs rename to src/test/ui/associated-types/associated-types-issue-17359.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-issue-17359.stderr b/src/test/ui/associated-types/associated-types-issue-17359.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-issue-17359.stderr rename to src/test/ui/associated-types/associated-types-issue-17359.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-issue-20346.rs b/src/test/ui/associated-types/associated-types-issue-20346.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-issue-20346.rs rename to src/test/ui/associated-types/associated-types-issue-20346.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-issue-20346.stderr b/src/test/ui/associated-types/associated-types-issue-20346.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-issue-20346.stderr rename to src/test/ui/associated-types/associated-types-issue-20346.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-multiple-types-one-trait.rs b/src/test/ui/associated-types/associated-types-multiple-types-one-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-multiple-types-one-trait.rs rename to src/test/ui/associated-types/associated-types-multiple-types-one-trait.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-multiple-types-one-trait.stderr b/src/test/ui/associated-types/associated-types-multiple-types-one-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-multiple-types-one-trait.stderr rename to src/test/ui/associated-types/associated-types-multiple-types-one-trait.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-no-suitable-bound.rs b/src/test/ui/associated-types/associated-types-no-suitable-bound.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-no-suitable-bound.rs rename to src/test/ui/associated-types/associated-types-no-suitable-bound.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-no-suitable-bound.stderr b/src/test/ui/associated-types/associated-types-no-suitable-bound.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-no-suitable-bound.stderr rename to src/test/ui/associated-types/associated-types-no-suitable-bound.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-no-suitable-supertrait-2.rs b/src/test/ui/associated-types/associated-types-no-suitable-supertrait-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-no-suitable-supertrait-2.rs rename to src/test/ui/associated-types/associated-types-no-suitable-supertrait-2.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-no-suitable-supertrait-2.stderr b/src/test/ui/associated-types/associated-types-no-suitable-supertrait-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-no-suitable-supertrait-2.stderr rename to src/test/ui/associated-types/associated-types-no-suitable-supertrait-2.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-no-suitable-supertrait.rs b/src/test/ui/associated-types/associated-types-no-suitable-supertrait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-no-suitable-supertrait.rs rename to src/test/ui/associated-types/associated-types-no-suitable-supertrait.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-no-suitable-supertrait.stderr b/src/test/ui/associated-types/associated-types-no-suitable-supertrait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-no-suitable-supertrait.stderr rename to src/test/ui/associated-types/associated-types-no-suitable-supertrait.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-outlives.nll.stderr b/src/test/ui/associated-types/associated-types-outlives.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-outlives.nll.stderr rename to src/test/ui/associated-types/associated-types-outlives.nll.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-outlives.rs b/src/test/ui/associated-types/associated-types-outlives.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-outlives.rs rename to src/test/ui/associated-types/associated-types-outlives.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-outlives.stderr b/src/test/ui/associated-types/associated-types-outlives.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-outlives.stderr rename to src/test/ui/associated-types/associated-types-outlives.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-overridden-default.rs b/src/test/ui/associated-types/associated-types-overridden-default.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-overridden-default.rs rename to src/test/ui/associated-types/associated-types-overridden-default.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-overridden-default.stderr b/src/test/ui/associated-types/associated-types-overridden-default.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-overridden-default.stderr rename to src/test/ui/associated-types/associated-types-overridden-default.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-path-1.rs b/src/test/ui/associated-types/associated-types-path-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-path-1.rs rename to src/test/ui/associated-types/associated-types-path-1.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-path-1.stderr b/src/test/ui/associated-types/associated-types-path-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-path-1.stderr rename to src/test/ui/associated-types/associated-types-path-1.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-path-2.rs b/src/test/ui/associated-types/associated-types-path-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-path-2.rs rename to src/test/ui/associated-types/associated-types-path-2.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-path-2.stderr b/src/test/ui/associated-types/associated-types-path-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-path-2.stderr rename to src/test/ui/associated-types/associated-types-path-2.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-fn-body.nll.stderr b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-fn-body.nll.stderr rename to src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.nll.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-fn-body.rs b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-fn-body.rs rename to src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-fn-body.stderr b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-fn-body.stderr rename to src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn-body.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-fn.rs b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-fn.rs rename to src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-fn.stderr b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-fn.stderr rename to src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-struct.rs b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-struct.rs rename to src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-struct.stderr b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-struct.stderr rename to src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-trait-method.rs b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-trait-method.rs rename to src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-trait-method.stderr b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-project-from-hrtb-in-trait-method.stderr rename to src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-projection-to-unrelated-trait-in-method-without-default.rs b/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-projection-to-unrelated-trait-in-method-without-default.rs rename to src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-projection-to-unrelated-trait-in-method-without-default.stderr b/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-projection-to-unrelated-trait-in-method-without-default.stderr rename to src/test/ui/associated-types/associated-types-projection-to-unrelated-trait-in-method-without-default.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-subtyping-1.rs b/src/test/ui/associated-types/associated-types-subtyping-1.rs similarity index 88% rename from src/test/ui/compile-fail-migration/associated-types-subtyping-1.rs rename to src/test/ui/associated-types/associated-types-subtyping-1.rs index 1c4b684265c..c3acffff240 100644 --- a/src/test/ui/compile-fail-migration/associated-types-subtyping-1.rs +++ b/src/test/ui/associated-types/associated-types-subtyping-1.rs @@ -24,7 +24,7 @@ fn method1<'a,'b,T>(x: &'a T, y: &'b T) // Note that &'static T <: &'a T. let a: >::Type = loop { }; let b: >::Type = loop { }; - let _: >::Type = a; + let _c: >::Type = a; } fn method2<'a,'b,T>(x: &'a T, y: &'b T) @@ -33,7 +33,7 @@ fn method2<'a,'b,T>(x: &'a T, y: &'b T) // Note that &'static T <: &'a T. let a: >::Type = loop { }; let b: >::Type = loop { }; - let _: >::Type = a; //~ ERROR E0623 + let _c: >::Type = a; //~ ERROR E0623 } fn method3<'a,'b,T>(x: &'a T, y: &'b T) @@ -42,7 +42,7 @@ fn method3<'a,'b,T>(x: &'a T, y: &'b T) // Note that &'static T <: &'a T. let a: >::Type = loop { }; let b: >::Type = loop { }; - let _: >::Type = b; //~ ERROR E0623 + let _c: >::Type = b; //~ ERROR E0623 } fn method4<'a,'b,T>(x: &'a T, y: &'b T) @@ -51,7 +51,7 @@ fn method4<'a,'b,T>(x: &'a T, y: &'b T) // Note that &'static T <: &'a T. let a: >::Type = loop { }; let b: >::Type = loop { }; - let _: >::Type = b; + let _c: >::Type = b; } fn main() { } diff --git a/src/test/ui/compile-fail-migration/associated-types-subtyping-1.stderr b/src/test/ui/associated-types/associated-types-subtyping-1.stderr similarity index 55% rename from src/test/ui/compile-fail-migration/associated-types-subtyping-1.stderr rename to src/test/ui/associated-types/associated-types-subtyping-1.stderr index 58925a0e63f..3cc7b07a20c 100644 --- a/src/test/ui/compile-fail-migration/associated-types-subtyping-1.stderr +++ b/src/test/ui/associated-types/associated-types-subtyping-1.stderr @@ -1,20 +1,20 @@ error[E0623]: lifetime mismatch - --> $DIR/associated-types-subtyping-1.rs:36:37 + --> $DIR/associated-types-subtyping-1.rs:36:38 | LL | fn method2<'a,'b,T>(x: &'a T, y: &'b T) | ----- ----- these two types are declared with different lifetimes... ... -LL | let _: >::Type = a; //~ ERROR E0623 - | ^ ...but data from `y` flows into `x` here +LL | let _c: >::Type = a; //~ ERROR E0623 + | ^ ...but data from `y` flows into `x` here error[E0623]: lifetime mismatch - --> $DIR/associated-types-subtyping-1.rs:45:37 + --> $DIR/associated-types-subtyping-1.rs:45:38 | LL | fn method3<'a,'b,T>(x: &'a T, y: &'b T) | ----- ----- these two types are declared with different lifetimes... ... -LL | let _: >::Type = b; //~ ERROR E0623 - | ^ ...but data from `y` flows into `x` here +LL | let _c: >::Type = b; //~ ERROR E0623 + | ^ ...but data from `y` flows into `x` here error: aborting due to 2 previous errors diff --git a/src/test/ui/compile-fail-migration/associated-types-unconstrained.rs b/src/test/ui/associated-types/associated-types-unconstrained.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-unconstrained.rs rename to src/test/ui/associated-types/associated-types-unconstrained.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-unconstrained.stderr b/src/test/ui/associated-types/associated-types-unconstrained.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-unconstrained.stderr rename to src/test/ui/associated-types/associated-types-unconstrained.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types-unsized.rs b/src/test/ui/associated-types/associated-types-unsized.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types-unsized.rs rename to src/test/ui/associated-types/associated-types-unsized.rs diff --git a/src/test/ui/compile-fail-migration/associated-types-unsized.stderr b/src/test/ui/associated-types/associated-types-unsized.stderr similarity index 96% rename from src/test/ui/compile-fail-migration/associated-types-unsized.stderr rename to src/test/ui/associated-types/associated-types-unsized.stderr index 4b9d1ea8fac..0b338c9ad45 100644 --- a/src/test/ui/compile-fail-migration/associated-types-unsized.stderr +++ b/src/test/ui/associated-types/associated-types-unsized.stderr @@ -5,7 +5,7 @@ LL | let x = t.get(); //~ ERROR the size for values of type | ^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `::Value` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where ::Value: std::marker::Sized` bound = note: all local variables must have a statically known size diff --git a/src/test/ui/compile-fail-migration/associated-types/bound-lifetime-constrained.clause.stderr b/src/test/ui/associated-types/bound-lifetime-constrained.clause.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/bound-lifetime-constrained.clause.stderr rename to src/test/ui/associated-types/bound-lifetime-constrained.clause.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/bound-lifetime-constrained.func.stderr b/src/test/ui/associated-types/bound-lifetime-constrained.func.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/bound-lifetime-constrained.func.stderr rename to src/test/ui/associated-types/bound-lifetime-constrained.func.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/bound-lifetime-constrained.object.stderr b/src/test/ui/associated-types/bound-lifetime-constrained.object.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/bound-lifetime-constrained.object.stderr rename to src/test/ui/associated-types/bound-lifetime-constrained.object.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/bound-lifetime-constrained.rs b/src/test/ui/associated-types/bound-lifetime-constrained.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/bound-lifetime-constrained.rs rename to src/test/ui/associated-types/bound-lifetime-constrained.rs diff --git a/src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-binding-only.angle.stderr b/src/test/ui/associated-types/bound-lifetime-in-binding-only.angle.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-binding-only.angle.stderr rename to src/test/ui/associated-types/bound-lifetime-in-binding-only.angle.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-binding-only.elision.stderr b/src/test/ui/associated-types/bound-lifetime-in-binding-only.elision.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-binding-only.elision.stderr rename to src/test/ui/associated-types/bound-lifetime-in-binding-only.elision.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-binding-only.ok.stderr b/src/test/ui/associated-types/bound-lifetime-in-binding-only.ok.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-binding-only.ok.stderr rename to src/test/ui/associated-types/bound-lifetime-in-binding-only.ok.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-binding-only.paren.stderr b/src/test/ui/associated-types/bound-lifetime-in-binding-only.paren.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-binding-only.paren.stderr rename to src/test/ui/associated-types/bound-lifetime-in-binding-only.paren.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-binding-only.rs b/src/test/ui/associated-types/bound-lifetime-in-binding-only.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-binding-only.rs rename to src/test/ui/associated-types/bound-lifetime-in-binding-only.rs diff --git a/src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-return-only.elision.stderr b/src/test/ui/associated-types/bound-lifetime-in-return-only.elision.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-return-only.elision.stderr rename to src/test/ui/associated-types/bound-lifetime-in-return-only.elision.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-return-only.local.stderr b/src/test/ui/associated-types/bound-lifetime-in-return-only.local.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-return-only.local.stderr rename to src/test/ui/associated-types/bound-lifetime-in-return-only.local.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-return-only.ok.stderr b/src/test/ui/associated-types/bound-lifetime-in-return-only.ok.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-return-only.ok.stderr rename to src/test/ui/associated-types/bound-lifetime-in-return-only.ok.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-return-only.rs b/src/test/ui/associated-types/bound-lifetime-in-return-only.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-return-only.rs rename to src/test/ui/associated-types/bound-lifetime-in-return-only.rs diff --git a/src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-return-only.sig.stderr b/src/test/ui/associated-types/bound-lifetime-in-return-only.sig.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-return-only.sig.stderr rename to src/test/ui/associated-types/bound-lifetime-in-return-only.sig.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-return-only.structure.stderr b/src/test/ui/associated-types/bound-lifetime-in-return-only.structure.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/bound-lifetime-in-return-only.structure.stderr rename to src/test/ui/associated-types/bound-lifetime-in-return-only.structure.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/chrono-scan.rs b/src/test/ui/associated-types/cache/chrono-scan.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/chrono-scan.rs rename to src/test/ui/associated-types/cache/chrono-scan.rs diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/chrono-scan.stderr b/src/test/ui/associated-types/cache/chrono-scan.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/chrono-scan.stderr rename to src/test/ui/associated-types/cache/chrono-scan.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/elision.rs b/src/test/ui/associated-types/cache/elision.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/elision.rs rename to src/test/ui/associated-types/cache/elision.rs diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/elision.stderr b/src/test/ui/associated-types/cache/elision.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/elision.stderr rename to src/test/ui/associated-types/cache/elision.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-contravariant.krisskross.nll.stderr b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.krisskross.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-contravariant.krisskross.nll.stderr rename to src/test/ui/associated-types/cache/project-fn-ret-contravariant.krisskross.nll.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-contravariant.krisskross.stderr b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.krisskross.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-contravariant.krisskross.stderr rename to src/test/ui/associated-types/cache/project-fn-ret-contravariant.krisskross.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-contravariant.ok.stderr b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.ok.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-contravariant.ok.stderr rename to src/test/ui/associated-types/cache/project-fn-ret-contravariant.ok.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-contravariant.oneuse.stderr b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.oneuse.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-contravariant.oneuse.stderr rename to src/test/ui/associated-types/cache/project-fn-ret-contravariant.oneuse.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-contravariant.rs b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-contravariant.rs rename to src/test/ui/associated-types/cache/project-fn-ret-contravariant.rs diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-contravariant.transmute.nll.stderr b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.transmute.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-contravariant.transmute.nll.stderr rename to src/test/ui/associated-types/cache/project-fn-ret-contravariant.transmute.nll.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-contravariant.transmute.stderr b/src/test/ui/associated-types/cache/project-fn-ret-contravariant.transmute.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-contravariant.transmute.stderr rename to src/test/ui/associated-types/cache/project-fn-ret-contravariant.transmute.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-invariant.krisskross.nll.stderr b/src/test/ui/associated-types/cache/project-fn-ret-invariant.krisskross.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-invariant.krisskross.nll.stderr rename to src/test/ui/associated-types/cache/project-fn-ret-invariant.krisskross.nll.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-invariant.krisskross.stderr b/src/test/ui/associated-types/cache/project-fn-ret-invariant.krisskross.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-invariant.krisskross.stderr rename to src/test/ui/associated-types/cache/project-fn-ret-invariant.krisskross.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-invariant.ok.stderr b/src/test/ui/associated-types/cache/project-fn-ret-invariant.ok.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-invariant.ok.stderr rename to src/test/ui/associated-types/cache/project-fn-ret-invariant.ok.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-invariant.oneuse.nll.stderr b/src/test/ui/associated-types/cache/project-fn-ret-invariant.oneuse.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-invariant.oneuse.nll.stderr rename to src/test/ui/associated-types/cache/project-fn-ret-invariant.oneuse.nll.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-invariant.oneuse.stderr b/src/test/ui/associated-types/cache/project-fn-ret-invariant.oneuse.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-invariant.oneuse.stderr rename to src/test/ui/associated-types/cache/project-fn-ret-invariant.oneuse.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-invariant.rs b/src/test/ui/associated-types/cache/project-fn-ret-invariant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-invariant.rs rename to src/test/ui/associated-types/cache/project-fn-ret-invariant.rs diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-invariant.transmute.nll.stderr b/src/test/ui/associated-types/cache/project-fn-ret-invariant.transmute.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-invariant.transmute.nll.stderr rename to src/test/ui/associated-types/cache/project-fn-ret-invariant.transmute.nll.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-invariant.transmute.stderr b/src/test/ui/associated-types/cache/project-fn-ret-invariant.transmute.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/cache/project-fn-ret-invariant.transmute.stderr rename to src/test/ui/associated-types/cache/project-fn-ret-invariant.transmute.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/higher-ranked-projection.bad.stderr b/src/test/ui/associated-types/higher-ranked-projection.bad.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/higher-ranked-projection.bad.stderr rename to src/test/ui/associated-types/higher-ranked-projection.bad.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/higher-ranked-projection.good.stderr b/src/test/ui/associated-types/higher-ranked-projection.good.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/higher-ranked-projection.good.stderr rename to src/test/ui/associated-types/higher-ranked-projection.good.stderr diff --git a/src/test/ui/compile-fail-migration/associated-types/higher-ranked-projection.rs b/src/test/ui/associated-types/higher-ranked-projection.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/higher-ranked-projection.rs rename to src/test/ui/associated-types/higher-ranked-projection.rs diff --git a/src/test/ui/compile-fail-migration/associated-types/issue-36499.rs b/src/test/ui/associated-types/issue-36499.rs similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/issue-36499.rs rename to src/test/ui/associated-types/issue-36499.rs diff --git a/src/test/ui/compile-fail-migration/associated-types/issue-36499.stderr b/src/test/ui/associated-types/issue-36499.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/associated-types/issue-36499.stderr rename to src/test/ui/associated-types/issue-36499.stderr diff --git a/src/test/ui/compile-fail-migration/attempted-access-non-fatal.rs b/src/test/ui/attempted-access-non-fatal.rs similarity index 100% rename from src/test/ui/compile-fail-migration/attempted-access-non-fatal.rs rename to src/test/ui/attempted-access-non-fatal.rs diff --git a/src/test/ui/compile-fail-migration/attempted-access-non-fatal.stderr b/src/test/ui/attempted-access-non-fatal.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/attempted-access-non-fatal.stderr rename to src/test/ui/attempted-access-non-fatal.stderr diff --git a/src/test/ui/compile-fail-migration/attr-bad-crate-attr.rc b/src/test/ui/attr-bad-crate-attr.rc similarity index 100% rename from src/test/ui/compile-fail-migration/attr-bad-crate-attr.rc rename to src/test/ui/attr-bad-crate-attr.rc diff --git a/src/test/ui/compile-fail-migration/attr-usage-inline.rs b/src/test/ui/attr-usage-inline.rs similarity index 100% rename from src/test/ui/compile-fail-migration/attr-usage-inline.rs rename to src/test/ui/attr-usage-inline.rs diff --git a/src/test/ui/compile-fail-migration/attr-usage-inline.stderr b/src/test/ui/attr-usage-inline.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/attr-usage-inline.stderr rename to src/test/ui/attr-usage-inline.stderr diff --git a/src/test/ui/compile-fail-migration/attrs-with-no-formal-in-generics-1.rs b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/attrs-with-no-formal-in-generics-1.rs rename to src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-1.rs diff --git a/src/test/ui/compile-fail-migration/attrs-with-no-formal-in-generics-1.stderr b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/attrs-with-no-formal-in-generics-1.stderr rename to src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-1.stderr diff --git a/src/test/ui/compile-fail-migration/attrs-with-no-formal-in-generics-2.rs b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/attrs-with-no-formal-in-generics-2.rs rename to src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-2.rs diff --git a/src/test/ui/compile-fail-migration/attrs-with-no-formal-in-generics-2.stderr b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/attrs-with-no-formal-in-generics-2.stderr rename to src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-2.stderr diff --git a/src/test/ui/compile-fail-migration/attrs-with-no-formal-in-generics-3.rs b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/attrs-with-no-formal-in-generics-3.rs rename to src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-3.rs diff --git a/src/test/ui/compile-fail-migration/attrs-with-no-formal-in-generics-3.stderr b/src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/attrs-with-no-formal-in-generics-3.stderr rename to src/test/ui/attrs-with-no-formal-in-generics/attrs-with-no-formal-in-generics-3.stderr diff --git a/src/test/ui/compile-fail-migration/auto-ref-slice-plus-ref.rs b/src/test/ui/auto-ref-slice-plus-ref.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auto-ref-slice-plus-ref.rs rename to src/test/ui/auto-ref-slice-plus-ref.rs diff --git a/src/test/ui/compile-fail-migration/auto-ref-slice-plus-ref.stderr b/src/test/ui/auto-ref-slice-plus-ref.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/auto-ref-slice-plus-ref.stderr rename to src/test/ui/auto-ref-slice-plus-ref.stderr diff --git a/src/test/ui/compile-fail-migration/auto-trait-validation.rs b/src/test/ui/auto-trait-validation.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auto-trait-validation.rs rename to src/test/ui/auto-trait-validation.rs diff --git a/src/test/ui/compile-fail-migration/auto-trait-validation.stderr b/src/test/ui/auto-trait-validation.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/auto-trait-validation.stderr rename to src/test/ui/auto-trait-validation.stderr diff --git a/src/test/ui/compile-fail-migration/autoderef-full-lval.rs b/src/test/ui/autoderef-full-lval.rs similarity index 100% rename from src/test/ui/compile-fail-migration/autoderef-full-lval.rs rename to src/test/ui/autoderef-full-lval.rs diff --git a/src/test/ui/compile-fail-migration/autoderef-full-lval.stderr b/src/test/ui/autoderef-full-lval.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/autoderef-full-lval.stderr rename to src/test/ui/autoderef-full-lval.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/cdylib-dep.rs b/src/test/ui/auxiliary/cdylib-dep.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/cdylib-dep.rs rename to src/test/ui/auxiliary/cdylib-dep.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/crateresolve1-1.rs b/src/test/ui/auxiliary/crateresolve1-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/crateresolve1-1.rs rename to src/test/ui/auxiliary/crateresolve1-1.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/crateresolve1-2.rs b/src/test/ui/auxiliary/crateresolve1-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/crateresolve1-2.rs rename to src/test/ui/auxiliary/crateresolve1-2.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/crateresolve1-3.rs b/src/test/ui/auxiliary/crateresolve1-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/crateresolve1-3.rs rename to src/test/ui/auxiliary/crateresolve1-3.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/default_ty_param_cross_crate_crate.rs b/src/test/ui/auxiliary/default_ty_param_cross_crate_crate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/default_ty_param_cross_crate_crate.rs rename to src/test/ui/auxiliary/default_ty_param_cross_crate_crate.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/define_macro.rs b/src/test/ui/auxiliary/define_macro.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/define_macro.rs rename to src/test/ui/auxiliary/define_macro.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/extern-statics.rs b/src/test/ui/auxiliary/extern-statics.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/extern-statics.rs rename to src/test/ui/auxiliary/extern-statics.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/lto-duplicate-symbols1.rs b/src/test/ui/auxiliary/lto-duplicate-symbols1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/lto-duplicate-symbols1.rs rename to src/test/ui/auxiliary/lto-duplicate-symbols1.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/lto-duplicate-symbols2.rs b/src/test/ui/auxiliary/lto-duplicate-symbols2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/lto-duplicate-symbols2.rs rename to src/test/ui/auxiliary/lto-duplicate-symbols2.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/namespaced_enums.rs b/src/test/ui/auxiliary/namespaced_enums.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/namespaced_enums.rs rename to src/test/ui/auxiliary/namespaced_enums.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/noexporttypelib.rs b/src/test/ui/auxiliary/noexporttypelib.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/noexporttypelib.rs rename to src/test/ui/auxiliary/noexporttypelib.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/orphan_check_diagnostics.rs b/src/test/ui/auxiliary/orphan_check_diagnostics.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/orphan_check_diagnostics.rs rename to src/test/ui/auxiliary/orphan_check_diagnostics.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/rmeta_meta.rs b/src/test/ui/auxiliary/rmeta_meta.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/rmeta_meta.rs rename to src/test/ui/auxiliary/rmeta_meta.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/rmeta_rlib.rs b/src/test/ui/auxiliary/rmeta_rlib.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/rmeta_rlib.rs rename to src/test/ui/auxiliary/rmeta_rlib.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/stability_cfg2.rs b/src/test/ui/auxiliary/stability_cfg2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/stability_cfg2.rs rename to src/test/ui/auxiliary/stability_cfg2.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/weak-lang-items.rs b/src/test/ui/auxiliary/weak-lang-items.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/weak-lang-items.rs rename to src/test/ui/auxiliary/weak-lang-items.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/xc_private_method_lib.rs b/src/test/ui/auxiliary/xc_private_method_lib.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/xc_private_method_lib.rs rename to src/test/ui/auxiliary/xc_private_method_lib.rs diff --git a/src/test/ui/compile-fail-migration/bad-const-type.rs b/src/test/ui/bad/bad-const-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-const-type.rs rename to src/test/ui/bad/bad-const-type.rs diff --git a/src/test/ui/compile-fail-migration/bad-const-type.stderr b/src/test/ui/bad/bad-const-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bad-const-type.stderr rename to src/test/ui/bad/bad-const-type.stderr diff --git a/src/test/ui/bad-crate-name.rs b/src/test/ui/bad/bad-crate-name.rs similarity index 100% rename from src/test/ui/bad-crate-name.rs rename to src/test/ui/bad/bad-crate-name.rs diff --git a/src/test/ui/bad-crate-name.stderr b/src/test/ui/bad/bad-crate-name.stderr similarity index 100% rename from src/test/ui/bad-crate-name.stderr rename to src/test/ui/bad/bad-crate-name.stderr diff --git a/src/test/ui/compile-fail-migration/bad-env-capture.rs b/src/test/ui/bad/bad-env-capture.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-env-capture.rs rename to src/test/ui/bad/bad-env-capture.rs diff --git a/src/test/ui/compile-fail-migration/bad-env-capture.stderr b/src/test/ui/bad/bad-env-capture.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bad-env-capture.stderr rename to src/test/ui/bad/bad-env-capture.stderr diff --git a/src/test/ui/compile-fail-migration/bad-env-capture2.rs b/src/test/ui/bad/bad-env-capture2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-env-capture2.rs rename to src/test/ui/bad/bad-env-capture2.rs diff --git a/src/test/ui/compile-fail-migration/bad-env-capture2.stderr b/src/test/ui/bad/bad-env-capture2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bad-env-capture2.stderr rename to src/test/ui/bad/bad-env-capture2.stderr diff --git a/src/test/ui/compile-fail-migration/bad-env-capture3.rs b/src/test/ui/bad/bad-env-capture3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-env-capture3.rs rename to src/test/ui/bad/bad-env-capture3.rs diff --git a/src/test/ui/compile-fail-migration/bad-env-capture3.stderr b/src/test/ui/bad/bad-env-capture3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bad-env-capture3.stderr rename to src/test/ui/bad/bad-env-capture3.stderr diff --git a/src/test/ui/compile-fail-migration/bad-expr-lhs.rs b/src/test/ui/bad/bad-expr-lhs.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-expr-lhs.rs rename to src/test/ui/bad/bad-expr-lhs.rs diff --git a/src/test/ui/compile-fail-migration/bad-expr-lhs.stderr b/src/test/ui/bad/bad-expr-lhs.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bad-expr-lhs.stderr rename to src/test/ui/bad/bad-expr-lhs.stderr diff --git a/src/test/ui/compile-fail-migration/bad-expr-path.rs b/src/test/ui/bad/bad-expr-path.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-expr-path.rs rename to src/test/ui/bad/bad-expr-path.rs diff --git a/src/test/ui/compile-fail-migration/bad-expr-path.stderr b/src/test/ui/bad/bad-expr-path.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bad-expr-path.stderr rename to src/test/ui/bad/bad-expr-path.stderr diff --git a/src/test/ui/compile-fail-migration/bad-expr-path2.rs b/src/test/ui/bad/bad-expr-path2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-expr-path2.rs rename to src/test/ui/bad/bad-expr-path2.rs diff --git a/src/test/ui/compile-fail-migration/bad-expr-path2.stderr b/src/test/ui/bad/bad-expr-path2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bad-expr-path2.stderr rename to src/test/ui/bad/bad-expr-path2.stderr diff --git a/src/test/ui/compile-fail-migration/bad-extern-link-attrs.rs b/src/test/ui/bad/bad-extern-link-attrs.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-extern-link-attrs.rs rename to src/test/ui/bad/bad-extern-link-attrs.rs diff --git a/src/test/ui/compile-fail-migration/bad-extern-link-attrs.stderr b/src/test/ui/bad/bad-extern-link-attrs.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bad-extern-link-attrs.stderr rename to src/test/ui/bad/bad-extern-link-attrs.stderr diff --git a/src/test/ui/compile-fail-migration/bad-intrinsic-monomorphization.rs b/src/test/ui/bad/bad-intrinsic-monomorphization.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-intrinsic-monomorphization.rs rename to src/test/ui/bad/bad-intrinsic-monomorphization.rs diff --git a/src/test/ui/compile-fail-migration/bad-intrinsic-monomorphization.stderr b/src/test/ui/bad/bad-intrinsic-monomorphization.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bad-intrinsic-monomorphization.stderr rename to src/test/ui/bad/bad-intrinsic-monomorphization.stderr diff --git a/src/test/ui/compile-fail-migration/bad-lint-cap.rs b/src/test/ui/bad/bad-lint-cap.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-lint-cap.rs rename to src/test/ui/bad/bad-lint-cap.rs diff --git a/src/test/ui/compile-fail-migration/bad-lint-cap.stderr b/src/test/ui/bad/bad-lint-cap.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bad-lint-cap.stderr rename to src/test/ui/bad/bad-lint-cap.stderr diff --git a/src/test/ui/compile-fail-migration/bad-lint-cap2.rs b/src/test/ui/bad/bad-lint-cap2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-lint-cap2.rs rename to src/test/ui/bad/bad-lint-cap2.rs diff --git a/src/test/ui/compile-fail-migration/bad-lint-cap2.stderr b/src/test/ui/bad/bad-lint-cap2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bad-lint-cap2.stderr rename to src/test/ui/bad/bad-lint-cap2.stderr diff --git a/src/test/ui/compile-fail-migration/bad-lint-cap3.rs b/src/test/ui/bad/bad-lint-cap3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-lint-cap3.rs rename to src/test/ui/bad/bad-lint-cap3.rs diff --git a/src/test/ui/compile-fail-migration/bad-lint-cap3.stderr b/src/test/ui/bad/bad-lint-cap3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bad-lint-cap3.stderr rename to src/test/ui/bad/bad-lint-cap3.stderr diff --git a/src/test/ui/compile-fail-migration/bad-main.rs b/src/test/ui/bad/bad-main.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-main.rs rename to src/test/ui/bad/bad-main.rs diff --git a/src/test/ui/compile-fail-migration/bad-main.stderr b/src/test/ui/bad/bad-main.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bad-main.stderr rename to src/test/ui/bad/bad-main.stderr diff --git a/src/test/ui/compile-fail-migration/bad-method-typaram-kind.rs b/src/test/ui/bad/bad-method-typaram-kind.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-method-typaram-kind.rs rename to src/test/ui/bad/bad-method-typaram-kind.rs diff --git a/src/test/ui/compile-fail-migration/bad-method-typaram-kind.stderr b/src/test/ui/bad/bad-method-typaram-kind.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bad-method-typaram-kind.stderr rename to src/test/ui/bad/bad-method-typaram-kind.stderr diff --git a/src/test/ui/compile-fail-migration/bad-mid-path-type-params.rs b/src/test/ui/bad/bad-mid-path-type-params.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-mid-path-type-params.rs rename to src/test/ui/bad/bad-mid-path-type-params.rs diff --git a/src/test/ui/compile-fail-migration/bad-mid-path-type-params.stderr b/src/test/ui/bad/bad-mid-path-type-params.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bad-mid-path-type-params.stderr rename to src/test/ui/bad/bad-mid-path-type-params.stderr diff --git a/src/test/ui/compile-fail-migration/bad-module.rs b/src/test/ui/bad/bad-module.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-module.rs rename to src/test/ui/bad/bad-module.rs diff --git a/src/test/ui/compile-fail-migration/bad-module.stderr b/src/test/ui/bad/bad-module.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bad-module.stderr rename to src/test/ui/bad/bad-module.stderr diff --git a/src/test/ui/compile-fail-migration/bad-sized.rs b/src/test/ui/bad/bad-sized.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-sized.rs rename to src/test/ui/bad/bad-sized.rs diff --git a/src/test/ui/compile-fail-migration/bad-sized.stderr b/src/test/ui/bad/bad-sized.stderr similarity index 96% rename from src/test/ui/compile-fail-migration/bad-sized.stderr rename to src/test/ui/bad/bad-sized.stderr index 12873d40b57..5f8013826d9 100644 --- a/src/test/ui/compile-fail-migration/bad-sized.stderr +++ b/src/test/ui/bad/bad-sized.stderr @@ -11,7 +11,7 @@ LL | let x: Vec = Vec::new(); | ^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `dyn Trait` - = note: to learn more, visit + = note: to learn more, visit = note: required by `std::vec::Vec` error[E0277]: the size for values of type `dyn Trait` cannot be known at compilation time @@ -21,7 +21,7 @@ LL | let x: Vec = Vec::new(); | ^^^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `dyn Trait` - = note: to learn more, visit + = note: to learn more, visit = note: required by `>::new` error: aborting due to 3 previous errors diff --git a/src/test/ui/compile-fail-migration/bad-type-env-capture.rs b/src/test/ui/bad/bad-type-env-capture.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bad-type-env-capture.rs rename to src/test/ui/bad/bad-type-env-capture.rs diff --git a/src/test/ui/compile-fail-migration/bad-type-env-capture.stderr b/src/test/ui/bad/bad-type-env-capture.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bad-type-env-capture.stderr rename to src/test/ui/bad/bad-type-env-capture.stderr diff --git a/src/test/ui/compile-fail-migration/bind-by-move-neither-can-live-while-the-other-survives-2.rs b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bind-by-move-neither-can-live-while-the-other-survives-2.rs rename to src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.rs diff --git a/src/test/ui/compile-fail-migration/bind-by-move-neither-can-live-while-the-other-survives-2.stderr b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bind-by-move-neither-can-live-while-the-other-survives-2.stderr rename to src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.stderr diff --git a/src/test/ui/compile-fail-migration/bind-by-move-neither-can-live-while-the-other-survives-3.rs b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bind-by-move-neither-can-live-while-the-other-survives-3.rs rename to src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.rs diff --git a/src/test/ui/compile-fail-migration/bind-by-move-neither-can-live-while-the-other-survives-3.stderr b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bind-by-move-neither-can-live-while-the-other-survives-3.stderr rename to src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.stderr diff --git a/src/test/ui/compile-fail-migration/bind-by-move-neither-can-live-while-the-other-survives-4.rs b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bind-by-move-neither-can-live-while-the-other-survives-4.rs rename to src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.rs diff --git a/src/test/ui/compile-fail-migration/bind-by-move-neither-can-live-while-the-other-survives-4.stderr b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bind-by-move-neither-can-live-while-the-other-survives-4.stderr rename to src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.stderr diff --git a/src/test/ui/compile-fail-migration/bind-by-move-no-guards.rs b/src/test/ui/bind-by-move/bind-by-move-no-guards.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bind-by-move-no-guards.rs rename to src/test/ui/bind-by-move/bind-by-move-no-guards.rs diff --git a/src/test/ui/compile-fail-migration/bind-by-move-no-guards.stderr b/src/test/ui/bind-by-move/bind-by-move-no-guards.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bind-by-move-no-guards.stderr rename to src/test/ui/bind-by-move/bind-by-move-no-guards.stderr diff --git a/src/test/ui/compile-fail-migration/binop-bitxor-str.rs b/src/test/ui/binop/binop-bitxor-str.rs similarity index 100% rename from src/test/ui/compile-fail-migration/binop-bitxor-str.rs rename to src/test/ui/binop/binop-bitxor-str.rs diff --git a/src/test/ui/compile-fail-migration/binop-bitxor-str.stderr b/src/test/ui/binop/binop-bitxor-str.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/binop-bitxor-str.stderr rename to src/test/ui/binop/binop-bitxor-str.stderr diff --git a/src/test/ui/compile-fail-migration/binop-consume-args.rs b/src/test/ui/binop/binop-consume-args.rs similarity index 100% rename from src/test/ui/compile-fail-migration/binop-consume-args.rs rename to src/test/ui/binop/binop-consume-args.rs diff --git a/src/test/ui/compile-fail-migration/binop-consume-args.stderr b/src/test/ui/binop/binop-consume-args.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/binop-consume-args.stderr rename to src/test/ui/binop/binop-consume-args.stderr diff --git a/src/test/ui/compile-fail-migration/binop-logic-float.rs b/src/test/ui/binop/binop-logic-float.rs similarity index 100% rename from src/test/ui/compile-fail-migration/binop-logic-float.rs rename to src/test/ui/binop/binop-logic-float.rs diff --git a/src/test/ui/compile-fail-migration/binop-logic-float.stderr b/src/test/ui/binop/binop-logic-float.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/binop-logic-float.stderr rename to src/test/ui/binop/binop-logic-float.stderr diff --git a/src/test/ui/compile-fail-migration/binop-logic-int.rs b/src/test/ui/binop/binop-logic-int.rs similarity index 100% rename from src/test/ui/compile-fail-migration/binop-logic-int.rs rename to src/test/ui/binop/binop-logic-int.rs diff --git a/src/test/ui/compile-fail-migration/binop-logic-int.stderr b/src/test/ui/binop/binop-logic-int.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/binop-logic-int.stderr rename to src/test/ui/binop/binop-logic-int.stderr diff --git a/src/test/ui/compile-fail-migration/binop-move-semantics.nll.stderr b/src/test/ui/binop/binop-move-semantics.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/binop-move-semantics.nll.stderr rename to src/test/ui/binop/binop-move-semantics.nll.stderr diff --git a/src/test/ui/compile-fail-migration/binop-move-semantics.rs b/src/test/ui/binop/binop-move-semantics.rs similarity index 100% rename from src/test/ui/compile-fail-migration/binop-move-semantics.rs rename to src/test/ui/binop/binop-move-semantics.rs diff --git a/src/test/ui/compile-fail-migration/binop-move-semantics.stderr b/src/test/ui/binop/binop-move-semantics.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/binop-move-semantics.stderr rename to src/test/ui/binop/binop-move-semantics.stderr diff --git a/src/test/ui/compile-fail-migration/binop-mul-bool.rs b/src/test/ui/binop/binop-mul-bool.rs similarity index 100% rename from src/test/ui/compile-fail-migration/binop-mul-bool.rs rename to src/test/ui/binop/binop-mul-bool.rs diff --git a/src/test/ui/compile-fail-migration/binop-mul-bool.stderr b/src/test/ui/binop/binop-mul-bool.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/binop-mul-bool.stderr rename to src/test/ui/binop/binop-mul-bool.stderr diff --git a/src/test/ui/compile-fail-migration/binop-typeck.rs b/src/test/ui/binop/binop-typeck.rs similarity index 100% rename from src/test/ui/compile-fail-migration/binop-typeck.rs rename to src/test/ui/binop/binop-typeck.rs diff --git a/src/test/ui/compile-fail-migration/binop-typeck.stderr b/src/test/ui/binop/binop-typeck.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/binop-typeck.stderr rename to src/test/ui/binop/binop-typeck.stderr diff --git a/src/test/ui/compile-fail-migration/blind-item-block-item-shadow.rs b/src/test/ui/blind/blind-item-block-item-shadow.rs similarity index 100% rename from src/test/ui/compile-fail-migration/blind-item-block-item-shadow.rs rename to src/test/ui/blind/blind-item-block-item-shadow.rs diff --git a/src/test/ui/compile-fail-migration/blind-item-block-item-shadow.stderr b/src/test/ui/blind/blind-item-block-item-shadow.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/blind-item-block-item-shadow.stderr rename to src/test/ui/blind/blind-item-block-item-shadow.stderr diff --git a/src/test/ui/compile-fail-migration/blind-item-block-middle.rs b/src/test/ui/blind/blind-item-block-middle.rs similarity index 100% rename from src/test/ui/compile-fail-migration/blind-item-block-middle.rs rename to src/test/ui/blind/blind-item-block-middle.rs diff --git a/src/test/ui/compile-fail-migration/blind-item-block-middle.stderr b/src/test/ui/blind/blind-item-block-middle.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/blind-item-block-middle.stderr rename to src/test/ui/blind/blind-item-block-middle.stderr diff --git a/src/test/ui/blind-item-item-shadow.rs b/src/test/ui/blind/blind-item-item-shadow.rs similarity index 100% rename from src/test/ui/blind-item-item-shadow.rs rename to src/test/ui/blind/blind-item-item-shadow.rs diff --git a/src/test/ui/blind-item-item-shadow.stderr b/src/test/ui/blind/blind-item-item-shadow.stderr similarity index 100% rename from src/test/ui/blind-item-item-shadow.stderr rename to src/test/ui/blind/blind-item-item-shadow.stderr diff --git a/src/test/ui/compile-fail-migration/borrow-immutable-upvar-mutation.nll.stderr b/src/test/ui/borrowck/borrow-immutable-upvar-mutation.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrow-immutable-upvar-mutation.nll.stderr rename to src/test/ui/borrowck/borrow-immutable-upvar-mutation.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrow-immutable-upvar-mutation.rs b/src/test/ui/borrowck/borrow-immutable-upvar-mutation.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrow-immutable-upvar-mutation.rs rename to src/test/ui/borrowck/borrow-immutable-upvar-mutation.rs diff --git a/src/test/ui/compile-fail-migration/borrow-immutable-upvar-mutation.stderr b/src/test/ui/borrowck/borrow-immutable-upvar-mutation.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrow-immutable-upvar-mutation.stderr rename to src/test/ui/borrowck/borrow-immutable-upvar-mutation.stderr diff --git a/src/test/ui/compile-fail-migration/borrow-tuple-fields.rs b/src/test/ui/borrowck/borrow-tuple-fields.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrow-tuple-fields.rs rename to src/test/ui/borrowck/borrow-tuple-fields.rs diff --git a/src/test/ui/compile-fail-migration/borrow-tuple-fields.stderr b/src/test/ui/borrowck/borrow-tuple-fields.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrow-tuple-fields.stderr rename to src/test/ui/borrowck/borrow-tuple-fields.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-access-permissions.ast.nll.stderr b/src/test/ui/borrowck/borrowck-access-permissions.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-access-permissions.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-access-permissions.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-access-permissions.ast.stderr b/src/test/ui/borrowck/borrowck-access-permissions.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-access-permissions.ast.stderr rename to src/test/ui/borrowck/borrowck-access-permissions.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-access-permissions.mir.stderr b/src/test/ui/borrowck/borrowck-access-permissions.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-access-permissions.mir.stderr rename to src/test/ui/borrowck/borrowck-access-permissions.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-access-permissions.rs b/src/test/ui/borrowck/borrowck-access-permissions.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-access-permissions.rs rename to src/test/ui/borrowck/borrowck-access-permissions.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-and-init.nll.stderr b/src/test/ui/borrowck/borrowck-and-init.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-and-init.nll.stderr rename to src/test/ui/borrowck/borrowck-and-init.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-and-init.rs b/src/test/ui/borrowck/borrowck-and-init.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-and-init.rs rename to src/test/ui/borrowck/borrowck-and-init.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-and-init.stderr b/src/test/ui/borrowck/borrowck-and-init.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-and-init.stderr rename to src/test/ui/borrowck/borrowck-and-init.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-struct.nll.stderr b/src/test/ui/borrowck/borrowck-anon-fields-struct.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-struct.nll.stderr rename to src/test/ui/borrowck/borrowck-anon-fields-struct.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-struct.rs b/src/test/ui/borrowck/borrowck-anon-fields-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-struct.rs rename to src/test/ui/borrowck/borrowck-anon-fields-struct.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-struct.stderr b/src/test/ui/borrowck/borrowck-anon-fields-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-struct.stderr rename to src/test/ui/borrowck/borrowck-anon-fields-struct.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-tuple.nll.stderr b/src/test/ui/borrowck/borrowck-anon-fields-tuple.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-tuple.nll.stderr rename to src/test/ui/borrowck/borrowck-anon-fields-tuple.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-tuple.rs b/src/test/ui/borrowck/borrowck-anon-fields-tuple.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-tuple.rs rename to src/test/ui/borrowck/borrowck-anon-fields-tuple.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-tuple.stderr b/src/test/ui/borrowck/borrowck-anon-fields-tuple.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-tuple.stderr rename to src/test/ui/borrowck/borrowck-anon-fields-tuple.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-variant.nll.stderr b/src/test/ui/borrowck/borrowck-anon-fields-variant.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-variant.nll.stderr rename to src/test/ui/borrowck/borrowck-anon-fields-variant.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-variant.rs b/src/test/ui/borrowck/borrowck-anon-fields-variant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-variant.rs rename to src/test/ui/borrowck/borrowck-anon-fields-variant.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-variant.stderr b/src/test/ui/borrowck/borrowck-anon-fields-variant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-variant.stderr rename to src/test/ui/borrowck/borrowck-anon-fields-variant.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-argument.nll.stderr b/src/test/ui/borrowck/borrowck-argument.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-argument.nll.stderr rename to src/test/ui/borrowck/borrowck-argument.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-argument.rs b/src/test/ui/borrowck/borrowck-argument.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-argument.rs rename to src/test/ui/borrowck/borrowck-argument.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-argument.stderr b/src/test/ui/borrowck/borrowck-argument.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-argument.stderr rename to src/test/ui/borrowck/borrowck-argument.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-asm.ast.nll.stderr b/src/test/ui/borrowck/borrowck-asm.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-asm.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-asm.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-asm.ast.stderr b/src/test/ui/borrowck/borrowck-asm.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-asm.ast.stderr rename to src/test/ui/borrowck/borrowck-asm.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-asm.mir.stderr b/src/test/ui/borrowck/borrowck-asm.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-asm.mir.stderr rename to src/test/ui/borrowck/borrowck-asm.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-asm.rs b/src/test/ui/borrowck/borrowck-asm.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-asm.rs rename to src/test/ui/borrowck/borrowck-asm.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp-idx.nll.stderr b/src/test/ui/borrowck/borrowck-assign-comp-idx.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp-idx.nll.stderr rename to src/test/ui/borrowck/borrowck-assign-comp-idx.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp-idx.rs b/src/test/ui/borrowck/borrowck-assign-comp-idx.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp-idx.rs rename to src/test/ui/borrowck/borrowck-assign-comp-idx.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp-idx.stderr b/src/test/ui/borrowck/borrowck-assign-comp-idx.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp-idx.stderr rename to src/test/ui/borrowck/borrowck-assign-comp-idx.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp.ast.nll.stderr b/src/test/ui/borrowck/borrowck-assign-comp.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-assign-comp.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp.ast.stderr b/src/test/ui/borrowck/borrowck-assign-comp.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp.ast.stderr rename to src/test/ui/borrowck/borrowck-assign-comp.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp.mir.stderr b/src/test/ui/borrowck/borrowck-assign-comp.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp.mir.stderr rename to src/test/ui/borrowck/borrowck-assign-comp.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp.rs b/src/test/ui/borrowck/borrowck-assign-comp.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp.rs rename to src/test/ui/borrowck/borrowck-assign-comp.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.nll.stderr b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.nll.stderr rename to src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.rs b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.rs rename to src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.stderr b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.stderr rename to src/test/ui/borrowck/borrowck-assign-to-andmut-in-aliasable-loc.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.nll.stderr b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.nll.stderr rename to src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.rs b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.rs rename to src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.stderr b/src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.stderr rename to src/test/ui/borrowck/borrowck-assign-to-andmut-in-borrowed-loc.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-constants.ast.nll.stderr b/src/test/ui/borrowck/borrowck-assign-to-constants.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-constants.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-assign-to-constants.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-constants.ast.stderr b/src/test/ui/borrowck/borrowck-assign-to-constants.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-constants.ast.stderr rename to src/test/ui/borrowck/borrowck-assign-to-constants.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-constants.mir.stderr b/src/test/ui/borrowck/borrowck-assign-to-constants.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-constants.mir.stderr rename to src/test/ui/borrowck/borrowck-assign-to-constants.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-constants.rs b/src/test/ui/borrowck/borrowck-assign-to-constants.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-constants.rs rename to src/test/ui/borrowck/borrowck-assign-to-constants.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-auto-mut-ref-to-immut-var.nll.stderr b/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-auto-mut-ref-to-immut-var.nll.stderr rename to src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-auto-mut-ref-to-immut-var.rs b/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-auto-mut-ref-to-immut-var.rs rename to src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-auto-mut-ref-to-immut-var.stderr b/src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-auto-mut-ref-to-immut-var.stderr rename to src/test/ui/borrowck/borrowck-auto-mut-ref-to-immut-var.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-autoref-3261.nll.stderr b/src/test/ui/borrowck/borrowck-autoref-3261.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-autoref-3261.nll.stderr rename to src/test/ui/borrowck/borrowck-autoref-3261.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-autoref-3261.rs b/src/test/ui/borrowck/borrowck-autoref-3261.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-autoref-3261.rs rename to src/test/ui/borrowck/borrowck-autoref-3261.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-autoref-3261.stderr b/src/test/ui/borrowck/borrowck-autoref-3261.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-autoref-3261.stderr rename to src/test/ui/borrowck/borrowck-autoref-3261.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-bad-nested-calls-free.nll.stderr b/src/test/ui/borrowck/borrowck-bad-nested-calls-free.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-bad-nested-calls-free.nll.stderr rename to src/test/ui/borrowck/borrowck-bad-nested-calls-free.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-bad-nested-calls-free.rs b/src/test/ui/borrowck/borrowck-bad-nested-calls-free.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-bad-nested-calls-free.rs rename to src/test/ui/borrowck/borrowck-bad-nested-calls-free.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-bad-nested-calls-free.stderr b/src/test/ui/borrowck/borrowck-bad-nested-calls-free.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-bad-nested-calls-free.stderr rename to src/test/ui/borrowck/borrowck-bad-nested-calls-free.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-bad-nested-calls-move.nll.stderr b/src/test/ui/borrowck/borrowck-bad-nested-calls-move.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-bad-nested-calls-move.nll.stderr rename to src/test/ui/borrowck/borrowck-bad-nested-calls-move.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-bad-nested-calls-move.rs b/src/test/ui/borrowck/borrowck-bad-nested-calls-move.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-bad-nested-calls-move.rs rename to src/test/ui/borrowck/borrowck-bad-nested-calls-move.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-bad-nested-calls-move.stderr b/src/test/ui/borrowck/borrowck-bad-nested-calls-move.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-bad-nested-calls-move.stderr rename to src/test/ui/borrowck/borrowck-bad-nested-calls-move.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-block-unint.nll.stderr b/src/test/ui/borrowck/borrowck-block-unint.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-block-unint.nll.stderr rename to src/test/ui/borrowck/borrowck-block-unint.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-block-unint.rs b/src/test/ui/borrowck/borrowck-block-unint.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-block-unint.rs rename to src/test/ui/borrowck/borrowck-block-unint.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-block-unint.stderr b/src/test/ui/borrowck/borrowck-block-unint.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-block-unint.stderr rename to src/test/ui/borrowck/borrowck-block-unint.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-owned-ptr.nll.stderr b/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-owned-ptr.nll.stderr rename to src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-owned-ptr.rs b/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-owned-ptr.rs rename to src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-owned-ptr.stderr b/src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-owned-ptr.stderr rename to src/test/ui/borrowck/borrowck-borrow-from-owned-ptr.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-stack-variable.nll.stderr b/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-stack-variable.nll.stderr rename to src/test/ui/borrowck/borrowck-borrow-from-stack-variable.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-stack-variable.rs b/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-stack-variable.rs rename to src/test/ui/borrowck/borrowck-borrow-from-stack-variable.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-stack-variable.stderr b/src/test/ui/borrowck/borrowck-borrow-from-stack-variable.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-stack-variable.stderr rename to src/test/ui/borrowck/borrowck-borrow-from-stack-variable.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-temporary.rs b/src/test/ui/borrowck/borrowck-borrow-from-temporary.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-temporary.rs rename to src/test/ui/borrowck/borrowck-borrow-from-temporary.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-temporary.stderr b/src/test/ui/borrowck/borrowck-borrow-from-temporary.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-temporary.stderr rename to src/test/ui/borrowck/borrowck-borrow-from-temporary.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.nll.stderr b/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.nll.stderr rename to src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.rs b/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.rs rename to src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.stderr b/src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.stderr rename to src/test/ui/borrowck/borrowck-borrow-immut-deref-of-box-as-mut.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.nll.stderr b/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.nll.stderr rename to src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs b/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs rename to src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.stderr b/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.stderr rename to src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-mut-object-twice.rs b/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-mut-object-twice.rs rename to src/test/ui/borrowck/borrowck-borrow-mut-object-twice.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-mut-object-twice.stderr b/src/test/ui/borrowck/borrowck-borrow-mut-object-twice.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-mut-object-twice.stderr rename to src/test/ui/borrowck/borrowck-borrow-mut-object-twice.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-overloaded-auto-deref.nll.stderr b/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-overloaded-auto-deref.nll.stderr rename to src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-overloaded-auto-deref.rs b/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-overloaded-auto-deref.rs rename to src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-overloaded-auto-deref.stderr b/src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-overloaded-auto-deref.stderr rename to src/test/ui/borrowck/borrowck-borrow-overloaded-auto-deref.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-overloaded-deref.nll.stderr b/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-overloaded-deref.nll.stderr rename to src/test/ui/borrowck/borrowck-borrow-overloaded-deref.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-overloaded-deref.rs b/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-overloaded-deref.rs rename to src/test/ui/borrowck/borrowck-borrow-overloaded-deref.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-overloaded-deref.stderr b/src/test/ui/borrowck/borrowck-borrow-overloaded-deref.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-overloaded-deref.stderr rename to src/test/ui/borrowck/borrowck-borrow-overloaded-deref.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrowed-uniq-rvalue-2.nll.stderr b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrowed-uniq-rvalue-2.nll.stderr rename to src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrowed-uniq-rvalue-2.rs b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrowed-uniq-rvalue-2.rs rename to src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrowed-uniq-rvalue-2.stderr b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrowed-uniq-rvalue-2.stderr rename to src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrowed-uniq-rvalue.nll.stderr b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrowed-uniq-rvalue.nll.stderr rename to src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrowed-uniq-rvalue.rs b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrowed-uniq-rvalue.rs rename to src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrowed-uniq-rvalue.stderr b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-borrowed-uniq-rvalue.stderr rename to src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-break-uninit-2.nll.stderr b/src/test/ui/borrowck/borrowck-break-uninit-2.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-break-uninit-2.nll.stderr rename to src/test/ui/borrowck/borrowck-break-uninit-2.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-break-uninit-2.rs b/src/test/ui/borrowck/borrowck-break-uninit-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-break-uninit-2.rs rename to src/test/ui/borrowck/borrowck-break-uninit-2.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-break-uninit-2.stderr b/src/test/ui/borrowck/borrowck-break-uninit-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-break-uninit-2.stderr rename to src/test/ui/borrowck/borrowck-break-uninit-2.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-break-uninit.nll.stderr b/src/test/ui/borrowck/borrowck-break-uninit.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-break-uninit.nll.stderr rename to src/test/ui/borrowck/borrowck-break-uninit.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-break-uninit.rs b/src/test/ui/borrowck/borrowck-break-uninit.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-break-uninit.rs rename to src/test/ui/borrowck/borrowck-break-uninit.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-break-uninit.stderr b/src/test/ui/borrowck/borrowck-break-uninit.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-break-uninit.stderr rename to src/test/ui/borrowck/borrowck-break-uninit.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-mut-and-imm.ast.nll.stderr b/src/test/ui/borrowck/borrowck-closures-mut-and-imm.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-closures-mut-and-imm.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-closures-mut-and-imm.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-mut-and-imm.ast.stderr b/src/test/ui/borrowck/borrowck-closures-mut-and-imm.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-closures-mut-and-imm.ast.stderr rename to src/test/ui/borrowck/borrowck-closures-mut-and-imm.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-mut-and-imm.mir.stderr b/src/test/ui/borrowck/borrowck-closures-mut-and-imm.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-closures-mut-and-imm.mir.stderr rename to src/test/ui/borrowck/borrowck-closures-mut-and-imm.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-mut-and-imm.rs b/src/test/ui/borrowck/borrowck-closures-mut-and-imm.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-closures-mut-and-imm.rs rename to src/test/ui/borrowck/borrowck-closures-mut-and-imm.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-mut-of-imm.nll.stderr b/src/test/ui/borrowck/borrowck-closures-mut-of-imm.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-closures-mut-of-imm.nll.stderr rename to src/test/ui/borrowck/borrowck-closures-mut-of-imm.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-mut-of-imm.rs b/src/test/ui/borrowck/borrowck-closures-mut-of-imm.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-closures-mut-of-imm.rs rename to src/test/ui/borrowck/borrowck-closures-mut-of-imm.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-mut-of-imm.stderr b/src/test/ui/borrowck/borrowck-closures-mut-of-imm.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-closures-mut-of-imm.stderr rename to src/test/ui/borrowck/borrowck-closures-mut-of-imm.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-two-mut.rs b/src/test/ui/borrowck/borrowck-closures-two-mut-fail.rs similarity index 98% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-closures-two-mut.rs rename to src/test/ui/borrowck/borrowck-closures-two-mut-fail.rs index de8cac38dcf..6a1b786f528 100644 --- a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-two-mut.rs +++ b/src/test/ui/borrowck/borrowck-closures-two-mut-fail.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-compare-mode-nll + // Tests that two closures cannot simultaneously have mutable // access to the variable, whether that mutable access be used // for direct assignment or for taking mutable ref. Issue #6801. diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-two-mut.stderr b/src/test/ui/borrowck/borrowck-closures-two-mut-fail.stderr similarity index 92% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-closures-two-mut.stderr rename to src/test/ui/borrowck/borrowck-closures-two-mut-fail.stderr index f314bb95c31..bea32f6be99 100644 --- a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-two-mut.stderr +++ b/src/test/ui/borrowck/borrowck-closures-two-mut-fail.stderr @@ -1,5 +1,5 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-closures-two-mut.rs:24:24 + --> $DIR/borrowck-closures-two-mut-fail.rs:26:24 | LL | let c1 = to_fn_mut(|| x = 4); | -- - previous borrow occurs due to use of `x` in closure @@ -13,7 +13,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-closures-two-mut.rs:34:24 + --> $DIR/borrowck-closures-two-mut-fail.rs:36:24 | LL | let c1 = to_fn_mut(|| set(&mut x)); | -- - previous borrow occurs due to use of `x` in closure @@ -27,7 +27,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-closures-two-mut.rs:40:24 + --> $DIR/borrowck-closures-two-mut-fail.rs:42:24 | LL | let c1 = to_fn_mut(|| x = 5); | -- - previous borrow occurs due to use of `x` in closure @@ -41,7 +41,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-closures-two-mut.rs:46:24 + --> $DIR/borrowck-closures-two-mut-fail.rs:48:24 | LL | let c1 = to_fn_mut(|| x = 5); | -- - previous borrow occurs due to use of `x` in closure @@ -56,7 +56,7 @@ LL | } | - first borrow ends here error[E0499]: cannot borrow `x` as mutable more than once at a time - --> $DIR/borrowck-closures-two-mut.rs:57:24 + --> $DIR/borrowck-closures-two-mut-fail.rs:59:24 | LL | let c1 = to_fn_mut(|| set(&mut *x.f)); | -- - previous borrow occurs due to use of `x` in closure diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-unique-imm.rs b/src/test/ui/borrowck/borrowck-closures-unique-imm.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-closures-unique-imm.rs rename to src/test/ui/borrowck/borrowck-closures-unique-imm.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-unique-imm.stderr b/src/test/ui/borrowck/borrowck-closures-unique-imm.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-closures-unique-imm.stderr rename to src/test/ui/borrowck/borrowck-closures-unique-imm.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-unique.rs b/src/test/ui/borrowck/borrowck-closures-unique.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-closures-unique.rs rename to src/test/ui/borrowck/borrowck-closures-unique.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-unique.stderr b/src/test/ui/borrowck/borrowck-closures-unique.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-closures-unique.stderr rename to src/test/ui/borrowck/borrowck-closures-unique.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-use-after-free.nll.stderr b/src/test/ui/borrowck/borrowck-closures-use-after-free.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-closures-use-after-free.nll.stderr rename to src/test/ui/borrowck/borrowck-closures-use-after-free.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-use-after-free.rs b/src/test/ui/borrowck/borrowck-closures-use-after-free.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-closures-use-after-free.rs rename to src/test/ui/borrowck/borrowck-closures-use-after-free.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-use-after-free.stderr b/src/test/ui/borrowck/borrowck-closures-use-after-free.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-closures-use-after-free.stderr rename to src/test/ui/borrowck/borrowck-closures-use-after-free.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-consume-unsize-vec.rs b/src/test/ui/borrowck/borrowck-consume-unsize-vec.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-consume-unsize-vec.rs rename to src/test/ui/borrowck/borrowck-consume-unsize-vec.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-consume-unsize-vec.stderr b/src/test/ui/borrowck/borrowck-consume-unsize-vec.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-consume-unsize-vec.stderr rename to src/test/ui/borrowck/borrowck-consume-unsize-vec.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-consume-upcast-box.nll.stderr b/src/test/ui/borrowck/borrowck-consume-upcast-box.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-consume-upcast-box.nll.stderr rename to src/test/ui/borrowck/borrowck-consume-upcast-box.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-consume-upcast-box.rs b/src/test/ui/borrowck/borrowck-consume-upcast-box.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-consume-upcast-box.rs rename to src/test/ui/borrowck/borrowck-consume-upcast-box.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-consume-upcast-box.stderr b/src/test/ui/borrowck/borrowck-consume-upcast-box.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-consume-upcast-box.stderr rename to src/test/ui/borrowck/borrowck-consume-upcast-box.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-describe-lvalue.ast.nll.stderr b/src/test/ui/borrowck/borrowck-describe-lvalue.ast.nll.stderr similarity index 95% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-describe-lvalue.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-describe-lvalue.ast.nll.stderr index 34715e307fe..c8170436e05 100644 --- a/src/test/ui/compile-fail-migration/borrowck/borrowck-describe-lvalue.ast.nll.stderr +++ b/src/test/ui/borrowck/borrowck-describe-lvalue.ast.nll.stderr @@ -23,24 +23,21 @@ LL | *y = 1; error: unsatisfied lifetime constraints --> $DIR/borrowck-describe-lvalue.rs:305:16 | -LL | || { - | ____________- - | |____________| - | || -LL | || || { //[mir]~ ERROR unsatisfied lifetime constraints - | ||________________^ -LL | ||| let y = &mut x; -LL | ||| &mut x; //[ast]~ ERROR cannot borrow `**x` as mutable more than once at a time -LL | ||| //[mir]~^ ERROR cannot borrow `x` as mutable more than once at a time -LL | ||| *y = 1; -LL | ||| drop(y); -LL | ||| } - | |||_________________^ requires that `'1` must outlive `'2` -LL | || }; - | || - - | ||____________| - | |_____________lifetime `'1` represents the closure body - | lifetime `'2` appears in return type +LL | || { + | -- + | || + | |return type of closure is [closure@$DIR/borrowck-describe-lvalue.rs:305:16: 311:18 x:&'2 mut i32] + | lifetime `'1` represents this closure's body +LL | / || { //[mir]~ ERROR unsatisfied lifetime constraints +LL | | let y = &mut x; +LL | | &mut x; //[ast]~ ERROR cannot borrow `**x` as mutable more than once at a time +LL | | //[mir]~^ ERROR cannot borrow `x` as mutable more than once at a time +LL | | *y = 1; +LL | | drop(y); +LL | | } + | |_________________^ requires that `'1` must outlive `'2` + | + = note: closure implements `FnMut`, so references to captured variables can't escape the closure error[E0503]: cannot use `f.x` because it was mutably borrowed --> $DIR/borrowck-describe-lvalue.rs:53:9 diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-describe-lvalue.ast.stderr b/src/test/ui/borrowck/borrowck-describe-lvalue.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-describe-lvalue.ast.stderr rename to src/test/ui/borrowck/borrowck-describe-lvalue.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-describe-lvalue.mir.stderr b/src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr similarity index 95% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-describe-lvalue.mir.stderr rename to src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr index 34715e307fe..c8170436e05 100644 --- a/src/test/ui/compile-fail-migration/borrowck/borrowck-describe-lvalue.mir.stderr +++ b/src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr @@ -23,24 +23,21 @@ LL | *y = 1; error: unsatisfied lifetime constraints --> $DIR/borrowck-describe-lvalue.rs:305:16 | -LL | || { - | ____________- - | |____________| - | || -LL | || || { //[mir]~ ERROR unsatisfied lifetime constraints - | ||________________^ -LL | ||| let y = &mut x; -LL | ||| &mut x; //[ast]~ ERROR cannot borrow `**x` as mutable more than once at a time -LL | ||| //[mir]~^ ERROR cannot borrow `x` as mutable more than once at a time -LL | ||| *y = 1; -LL | ||| drop(y); -LL | ||| } - | |||_________________^ requires that `'1` must outlive `'2` -LL | || }; - | || - - | ||____________| - | |_____________lifetime `'1` represents the closure body - | lifetime `'2` appears in return type +LL | || { + | -- + | || + | |return type of closure is [closure@$DIR/borrowck-describe-lvalue.rs:305:16: 311:18 x:&'2 mut i32] + | lifetime `'1` represents this closure's body +LL | / || { //[mir]~ ERROR unsatisfied lifetime constraints +LL | | let y = &mut x; +LL | | &mut x; //[ast]~ ERROR cannot borrow `**x` as mutable more than once at a time +LL | | //[mir]~^ ERROR cannot borrow `x` as mutable more than once at a time +LL | | *y = 1; +LL | | drop(y); +LL | | } + | |_________________^ requires that `'1` must outlive `'2` + | + = note: closure implements `FnMut`, so references to captured variables can't escape the closure error[E0503]: cannot use `f.x` because it was mutably borrowed --> $DIR/borrowck-describe-lvalue.rs:53:9 diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-describe-lvalue.rs b/src/test/ui/borrowck/borrowck-describe-lvalue.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-describe-lvalue.rs rename to src/test/ui/borrowck/borrowck-describe-lvalue.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-drop-from-guard.rs b/src/test/ui/borrowck/borrowck-drop-from-guard.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-drop-from-guard.rs rename to src/test/ui/borrowck/borrowck-drop-from-guard.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-drop-from-guard.stderr b/src/test/ui/borrowck/borrowck-drop-from-guard.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-drop-from-guard.stderr rename to src/test/ui/borrowck/borrowck-drop-from-guard.stderr diff --git a/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.edition.stderr b/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.edition.stderr deleted file mode 100644 index fa82efa3533..00000000000 --- a/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.edition.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-feature-nll-overrides-migrate.rs:32:17 - | -LL | (|| { let bar = foo; bar.take() })(); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0507`. diff --git a/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.zflag.stderr b/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.zflag.stderr deleted file mode 100644 index fa82efa3533..00000000000 --- a/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.zflag.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-feature-nll-overrides-migrate.rs:32:17 - | -LL | (|| { let bar = foo; bar.take() })(); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0507`. diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-field-sensitivity.nll.stderr b/src/test/ui/borrowck/borrowck-field-sensitivity.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-field-sensitivity.nll.stderr rename to src/test/ui/borrowck/borrowck-field-sensitivity.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-field-sensitivity.rs b/src/test/ui/borrowck/borrowck-field-sensitivity.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-field-sensitivity.rs rename to src/test/ui/borrowck/borrowck-field-sensitivity.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-field-sensitivity.stderr b/src/test/ui/borrowck/borrowck-field-sensitivity.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-field-sensitivity.stderr rename to src/test/ui/borrowck/borrowck-field-sensitivity.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-fn-in-const-a.ast.stderr b/src/test/ui/borrowck/borrowck-fn-in-const-a.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-fn-in-const-a.ast.stderr rename to src/test/ui/borrowck/borrowck-fn-in-const-a.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-fn-in-const-a.mir.stderr b/src/test/ui/borrowck/borrowck-fn-in-const-a.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-fn-in-const-a.mir.stderr rename to src/test/ui/borrowck/borrowck-fn-in-const-a.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-fn-in-const-a.rs b/src/test/ui/borrowck/borrowck-fn-in-const-a.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-fn-in-const-a.rs rename to src/test/ui/borrowck/borrowck-fn-in-const-a.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-fn-in-const-c.nll.stderr b/src/test/ui/borrowck/borrowck-fn-in-const-c.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-fn-in-const-c.nll.stderr rename to src/test/ui/borrowck/borrowck-fn-in-const-c.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-fn-in-const-c.rs b/src/test/ui/borrowck/borrowck-fn-in-const-c.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-fn-in-const-c.rs rename to src/test/ui/borrowck/borrowck-fn-in-const-c.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-fn-in-const-c.stderr b/src/test/ui/borrowck/borrowck-fn-in-const-c.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-fn-in-const-c.stderr rename to src/test/ui/borrowck/borrowck-fn-in-const-c.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-for-loop-correct-cmt-for-pattern.nll.stderr b/src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-for-loop-correct-cmt-for-pattern.nll.stderr rename to src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-for-loop-correct-cmt-for-pattern.rs b/src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-for-loop-correct-cmt-for-pattern.rs rename to src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-for-loop-correct-cmt-for-pattern.stderr b/src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-for-loop-correct-cmt-for-pattern.stderr rename to src/test/ui/borrowck/borrowck-for-loop-correct-cmt-for-pattern.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-for-loop-head-linkage.nll.stderr b/src/test/ui/borrowck/borrowck-for-loop-head-linkage.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-for-loop-head-linkage.nll.stderr rename to src/test/ui/borrowck/borrowck-for-loop-head-linkage.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-for-loop-head-linkage.rs b/src/test/ui/borrowck/borrowck-for-loop-head-linkage.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-for-loop-head-linkage.rs rename to src/test/ui/borrowck/borrowck-for-loop-head-linkage.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-for-loop-head-linkage.stderr b/src/test/ui/borrowck/borrowck-for-loop-head-linkage.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-for-loop-head-linkage.stderr rename to src/test/ui/borrowck/borrowck-for-loop-head-linkage.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-if-no-else.rs b/src/test/ui/borrowck/borrowck-if-no-else.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-if-no-else.rs rename to src/test/ui/borrowck/borrowck-if-no-else.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-if-no-else.stderr b/src/test/ui/borrowck/borrowck-if-no-else.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-if-no-else.stderr rename to src/test/ui/borrowck/borrowck-if-no-else.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-if-with-else.rs b/src/test/ui/borrowck/borrowck-if-with-else.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-if-with-else.rs rename to src/test/ui/borrowck/borrowck-if-with-else.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-if-with-else.stderr b/src/test/ui/borrowck/borrowck-if-with-else.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-if-with-else.stderr rename to src/test/ui/borrowck/borrowck-if-with-else.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.ast.nll.stderr b/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.ast.stderr b/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.ast.stderr rename to src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.mir.stderr b/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.mir.stderr rename to src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs b/src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs rename to src/test/ui/borrowck/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-init-in-called-fn-expr.rs b/src/test/ui/borrowck/borrowck-init-in-called-fn-expr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-init-in-called-fn-expr.rs rename to src/test/ui/borrowck/borrowck-init-in-called-fn-expr.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-init-in-called-fn-expr.stderr b/src/test/ui/borrowck/borrowck-init-in-called-fn-expr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-init-in-called-fn-expr.stderr rename to src/test/ui/borrowck/borrowck-init-in-called-fn-expr.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-init-in-fn-expr.rs b/src/test/ui/borrowck/borrowck-init-in-fn-expr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-init-in-fn-expr.rs rename to src/test/ui/borrowck/borrowck-init-in-fn-expr.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-init-in-fn-expr.stderr b/src/test/ui/borrowck/borrowck-init-in-fn-expr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-init-in-fn-expr.stderr rename to src/test/ui/borrowck/borrowck-init-in-fn-expr.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-init-in-fru.ast.nll.stderr b/src/test/ui/borrowck/borrowck-init-in-fru.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-init-in-fru.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-init-in-fru.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-init-in-fru.ast.stderr b/src/test/ui/borrowck/borrowck-init-in-fru.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-init-in-fru.ast.stderr rename to src/test/ui/borrowck/borrowck-init-in-fru.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-init-in-fru.mir.stderr b/src/test/ui/borrowck/borrowck-init-in-fru.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-init-in-fru.mir.stderr rename to src/test/ui/borrowck/borrowck-init-in-fru.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-init-in-fru.rs b/src/test/ui/borrowck/borrowck-init-in-fru.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-init-in-fru.rs rename to src/test/ui/borrowck/borrowck-init-in-fru.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-init-op-equal.rs b/src/test/ui/borrowck/borrowck-init-op-equal.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-init-op-equal.rs rename to src/test/ui/borrowck/borrowck-init-op-equal.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-init-op-equal.stderr b/src/test/ui/borrowck/borrowck-init-op-equal.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-init-op-equal.stderr rename to src/test/ui/borrowck/borrowck-init-op-equal.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-init-plus-equal.rs b/src/test/ui/borrowck/borrowck-init-plus-equal.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-init-plus-equal.rs rename to src/test/ui/borrowck/borrowck-init-plus-equal.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-init-plus-equal.stderr b/src/test/ui/borrowck/borrowck-init-plus-equal.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-init-plus-equal.stderr rename to src/test/ui/borrowck/borrowck-init-plus-equal.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-insert-during-each.nll.stderr b/src/test/ui/borrowck/borrowck-insert-during-each.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-insert-during-each.nll.stderr rename to src/test/ui/borrowck/borrowck-insert-during-each.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-insert-during-each.rs b/src/test/ui/borrowck/borrowck-insert-during-each.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-insert-during-each.rs rename to src/test/ui/borrowck/borrowck-insert-during-each.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-insert-during-each.stderr b/src/test/ui/borrowck/borrowck-insert-during-each.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-insert-during-each.stderr rename to src/test/ui/borrowck/borrowck-insert-during-each.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-14498.ast.nll.stderr b/src/test/ui/borrowck/borrowck-issue-14498.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-issue-14498.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-issue-14498.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-14498.ast.stderr b/src/test/ui/borrowck/borrowck-issue-14498.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-issue-14498.ast.stderr rename to src/test/ui/borrowck/borrowck-issue-14498.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-14498.mir.stderr b/src/test/ui/borrowck/borrowck-issue-14498.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-issue-14498.mir.stderr rename to src/test/ui/borrowck/borrowck-issue-14498.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-14498.rs b/src/test/ui/borrowck/borrowck-issue-14498.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-issue-14498.rs rename to src/test/ui/borrowck/borrowck-issue-14498.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-2657-1.rs b/src/test/ui/borrowck/borrowck-issue-2657-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-issue-2657-1.rs rename to src/test/ui/borrowck/borrowck-issue-2657-1.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-2657-1.stderr b/src/test/ui/borrowck/borrowck-issue-2657-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-issue-2657-1.stderr rename to src/test/ui/borrowck/borrowck-issue-2657-1.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-2657-2.nll.stderr b/src/test/ui/borrowck/borrowck-issue-2657-2.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-issue-2657-2.nll.stderr rename to src/test/ui/borrowck/borrowck-issue-2657-2.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-2657-2.rs b/src/test/ui/borrowck/borrowck-issue-2657-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-issue-2657-2.rs rename to src/test/ui/borrowck/borrowck-issue-2657-2.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-2657-2.stderr b/src/test/ui/borrowck/borrowck-issue-2657-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-issue-2657-2.stderr rename to src/test/ui/borrowck/borrowck-issue-2657-2.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-48962.rs b/src/test/ui/borrowck/borrowck-issue-48962.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-issue-48962.rs rename to src/test/ui/borrowck/borrowck-issue-48962.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-48962.stderr b/src/test/ui/borrowck/borrowck-issue-48962.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-issue-48962.stderr rename to src/test/ui/borrowck/borrowck-issue-48962.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-if.rs b/src/test/ui/borrowck/borrowck-lend-flow-if.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-if.rs rename to src/test/ui/borrowck/borrowck-lend-flow-if.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-if.stderr b/src/test/ui/borrowck/borrowck-lend-flow-if.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-if.stderr rename to src/test/ui/borrowck/borrowck-lend-flow-if.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-loop.nll.stderr b/src/test/ui/borrowck/borrowck-lend-flow-loop.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-loop.nll.stderr rename to src/test/ui/borrowck/borrowck-lend-flow-loop.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-loop.rs b/src/test/ui/borrowck/borrowck-lend-flow-loop.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-loop.rs rename to src/test/ui/borrowck/borrowck-lend-flow-loop.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-loop.stderr b/src/test/ui/borrowck/borrowck-lend-flow-loop.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-loop.stderr rename to src/test/ui/borrowck/borrowck-lend-flow-loop.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-match.ast.nll.stderr b/src/test/ui/borrowck/borrowck-lend-flow-match.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-match.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-lend-flow-match.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-match.ast.stderr b/src/test/ui/borrowck/borrowck-lend-flow-match.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-match.ast.stderr rename to src/test/ui/borrowck/borrowck-lend-flow-match.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-match.mir.stderr b/src/test/ui/borrowck/borrowck-lend-flow-match.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-match.mir.stderr rename to src/test/ui/borrowck/borrowck-lend-flow-match.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-match.rs b/src/test/ui/borrowck/borrowck-lend-flow-match.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-match.rs rename to src/test/ui/borrowck/borrowck-lend-flow-match.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow.rs b/src/test/ui/borrowck/borrowck-lend-flow.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow.rs rename to src/test/ui/borrowck/borrowck-lend-flow.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow.stderr b/src/test/ui/borrowck/borrowck-lend-flow.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow.stderr rename to src/test/ui/borrowck/borrowck-lend-flow.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-move-cc.rs b/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-move-cc.rs rename to src/test/ui/borrowck/borrowck-loan-blocks-move-cc.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-move-cc.stderr b/src/test/ui/borrowck/borrowck-loan-blocks-move-cc.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-move-cc.stderr rename to src/test/ui/borrowck/borrowck-loan-blocks-move-cc.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-move.rs b/src/test/ui/borrowck/borrowck-loan-blocks-move.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-move.rs rename to src/test/ui/borrowck/borrowck-loan-blocks-move.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-move.stderr b/src/test/ui/borrowck/borrowck-loan-blocks-move.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-move.stderr rename to src/test/ui/borrowck/borrowck-loan-blocks-move.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-mut-uniq.nll.stderr b/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-mut-uniq.nll.stderr rename to src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-mut-uniq.rs b/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-mut-uniq.rs rename to src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-mut-uniq.stderr b/src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-mut-uniq.stderr rename to src/test/ui/borrowck/borrowck-loan-blocks-mut-uniq.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-in-overloaded-op.nll.stderr b/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-in-overloaded-op.nll.stderr rename to src/test/ui/borrowck/borrowck-loan-in-overloaded-op.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-in-overloaded-op.rs b/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-in-overloaded-op.rs rename to src/test/ui/borrowck/borrowck-loan-in-overloaded-op.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-in-overloaded-op.stderr b/src/test/ui/borrowck/borrowck-loan-in-overloaded-op.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-in-overloaded-op.stderr rename to src/test/ui/borrowck/borrowck-loan-in-overloaded-op.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-of-static-data-issue-27616.nll.stderr b/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-of-static-data-issue-27616.nll.stderr rename to src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-of-static-data-issue-27616.rs b/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-of-static-data-issue-27616.rs rename to src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-of-static-data-issue-27616.stderr b/src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-of-static-data-issue-27616.stderr rename to src/test/ui/borrowck/borrowck-loan-of-static-data-issue-27616.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-rcvr-overloaded-op.nll.stderr b/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-rcvr-overloaded-op.nll.stderr rename to src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-rcvr-overloaded-op.rs b/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-rcvr-overloaded-op.rs rename to src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-rcvr-overloaded-op.stderr b/src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-rcvr-overloaded-op.stderr rename to src/test/ui/borrowck/borrowck-loan-rcvr-overloaded-op.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-rcvr.nll.stderr b/src/test/ui/borrowck/borrowck-loan-rcvr.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-rcvr.nll.stderr rename to src/test/ui/borrowck/borrowck-loan-rcvr.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-rcvr.rs b/src/test/ui/borrowck/borrowck-loan-rcvr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-rcvr.rs rename to src/test/ui/borrowck/borrowck-loan-rcvr.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-rcvr.stderr b/src/test/ui/borrowck/borrowck-loan-rcvr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-rcvr.stderr rename to src/test/ui/borrowck/borrowck-loan-rcvr.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-vec-content.nll.stderr b/src/test/ui/borrowck/borrowck-loan-vec-content.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-vec-content.nll.stderr rename to src/test/ui/borrowck/borrowck-loan-vec-content.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-vec-content.rs b/src/test/ui/borrowck/borrowck-loan-vec-content.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-vec-content.rs rename to src/test/ui/borrowck/borrowck-loan-vec-content.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-vec-content.stderr b/src/test/ui/borrowck/borrowck-loan-vec-content.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-loan-vec-content.stderr rename to src/test/ui/borrowck/borrowck-loan-vec-content.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-local-borrow-outlives-fn.ast.nll.stderr b/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-local-borrow-outlives-fn.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-local-borrow-outlives-fn.ast.stderr b/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-local-borrow-outlives-fn.ast.stderr rename to src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-local-borrow-outlives-fn.mir.stderr b/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-local-borrow-outlives-fn.mir.stderr rename to src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-local-borrow-outlives-fn.rs b/src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-local-borrow-outlives-fn.rs rename to src/test/ui/borrowck/borrowck-local-borrow-outlives-fn.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-local-borrow-with-panic-outlives-fn.ast.nll.stderr b/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-local-borrow-with-panic-outlives-fn.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-local-borrow-with-panic-outlives-fn.ast.stderr b/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-local-borrow-with-panic-outlives-fn.ast.stderr rename to src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-local-borrow-with-panic-outlives-fn.mir.stderr b/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-local-borrow-with-panic-outlives-fn.mir.stderr rename to src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-local-borrow-with-panic-outlives-fn.rs b/src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-local-borrow-with-panic-outlives-fn.rs rename to src/test/ui/borrowck/borrowck-local-borrow-with-panic-outlives-fn.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-match-already-borrowed.ast.nll.stderr b/src/test/ui/borrowck/borrowck-match-already-borrowed.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-match-already-borrowed.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-match-already-borrowed.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-match-already-borrowed.ast.stderr b/src/test/ui/borrowck/borrowck-match-already-borrowed.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-match-already-borrowed.ast.stderr rename to src/test/ui/borrowck/borrowck-match-already-borrowed.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-match-already-borrowed.mir.stderr b/src/test/ui/borrowck/borrowck-match-already-borrowed.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-match-already-borrowed.mir.stderr rename to src/test/ui/borrowck/borrowck-match-already-borrowed.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-match-already-borrowed.rs b/src/test/ui/borrowck/borrowck-match-already-borrowed.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-match-already-borrowed.rs rename to src/test/ui/borrowck/borrowck-match-already-borrowed.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-match-binding-is-assignment.ast.nll.stderr b/src/test/ui/borrowck/borrowck-match-binding-is-assignment.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-match-binding-is-assignment.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-match-binding-is-assignment.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-match-binding-is-assignment.ast.stderr b/src/test/ui/borrowck/borrowck-match-binding-is-assignment.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-match-binding-is-assignment.ast.stderr rename to src/test/ui/borrowck/borrowck-match-binding-is-assignment.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-match-binding-is-assignment.mir.stderr b/src/test/ui/borrowck/borrowck-match-binding-is-assignment.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-match-binding-is-assignment.mir.stderr rename to src/test/ui/borrowck/borrowck-match-binding-is-assignment.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-match-binding-is-assignment.rs b/src/test/ui/borrowck/borrowck-match-binding-is-assignment.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-match-binding-is-assignment.rs rename to src/test/ui/borrowck/borrowck-match-binding-is-assignment.rs diff --git a/src/test/ui/borrowck/borrowck-migrate-to-nll.edition.stderr b/src/test/ui/borrowck/borrowck-migrate-to-nll.edition.stderr deleted file mode 100644 index f5a9db36406..00000000000 --- a/src/test/ui/borrowck/borrowck-migrate-to-nll.edition.stderr +++ /dev/null @@ -1,24 +0,0 @@ -warning[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-migrate-to-nll.rs:35:17 - | -LL | (|| { let bar = foo; bar.take() })(); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content - | - = warning: This error has been downgraded to a warning for backwards compatibility with previous releases. - It represents potential unsoundness in your code. - This warning will become a hard error in the future. - -warning[E0507]: cannot move out of `foo`, as it is immutable for the pattern guard - --> $DIR/borrowck-migrate-to-nll.rs:35:17 - | -LL | (|| { let bar = foo; bar.take() })(); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | | - | cannot move out of `foo`, as it is immutable for the pattern guard - | cannot move - | - = note: variables bound in patterns are immutable until the end of the pattern guard - = warning: This error has been downgraded to a warning for backwards compatibility with previous releases. - It represents potential unsoundness in your code. - This warning will become a hard error in the future. - diff --git a/src/test/ui/borrowck/borrowck-migrate-to-nll.zflag.stderr b/src/test/ui/borrowck/borrowck-migrate-to-nll.zflag.stderr deleted file mode 100644 index f5a9db36406..00000000000 --- a/src/test/ui/borrowck/borrowck-migrate-to-nll.zflag.stderr +++ /dev/null @@ -1,24 +0,0 @@ -warning[E0507]: cannot move out of borrowed content - --> $DIR/borrowck-migrate-to-nll.rs:35:17 - | -LL | (|| { let bar = foo; bar.take() })(); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot move out of borrowed content - | - = warning: This error has been downgraded to a warning for backwards compatibility with previous releases. - It represents potential unsoundness in your code. - This warning will become a hard error in the future. - -warning[E0507]: cannot move out of `foo`, as it is immutable for the pattern guard - --> $DIR/borrowck-migrate-to-nll.rs:35:17 - | -LL | (|| { let bar = foo; bar.take() })(); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | | - | cannot move out of `foo`, as it is immutable for the pattern guard - | cannot move - | - = note: variables bound in patterns are immutable until the end of the pattern guard - = warning: This error has been downgraded to a warning for backwards compatibility with previous releases. - It represents potential unsoundness in your code. - This warning will become a hard error in the future. - diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-by-capture.nll.stderr b/src/test/ui/borrowck/borrowck-move-by-capture.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-by-capture.nll.stderr rename to src/test/ui/borrowck/borrowck-move-by-capture.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-by-capture.rs b/src/test/ui/borrowck/borrowck-move-by-capture.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-by-capture.rs rename to src/test/ui/borrowck/borrowck-move-by-capture.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-by-capture.stderr b/src/test/ui/borrowck/borrowck-move-by-capture.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-by-capture.stderr rename to src/test/ui/borrowck/borrowck-move-by-capture.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-from-subpath-of-borrowed-path.rs b/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-from-subpath-of-borrowed-path.rs rename to src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr b/src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr rename to src/test/ui/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-from-unsafe-ptr.nll.stderr b/src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-from-unsafe-ptr.nll.stderr rename to src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-from-unsafe-ptr.rs b/src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-from-unsafe-ptr.rs rename to src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-from-unsafe-ptr.stderr b/src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-from-unsafe-ptr.stderr rename to src/test/ui/borrowck/borrowck-move-from-unsafe-ptr.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-in-irrefut-pat.ast.nll.stderr b/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-in-irrefut-pat.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-move-in-irrefut-pat.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-in-irrefut-pat.ast.stderr b/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-in-irrefut-pat.ast.stderr rename to src/test/ui/borrowck/borrowck-move-in-irrefut-pat.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-in-irrefut-pat.mir.stderr b/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-in-irrefut-pat.mir.stderr rename to src/test/ui/borrowck/borrowck-move-in-irrefut-pat.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-in-irrefut-pat.rs b/src/test/ui/borrowck/borrowck-move-in-irrefut-pat.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-in-irrefut-pat.rs rename to src/test/ui/borrowck/borrowck-move-in-irrefut-pat.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-moved-value-into-closure.ast.nll.stderr b/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-moved-value-into-closure.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-move-moved-value-into-closure.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-moved-value-into-closure.ast.stderr b/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-moved-value-into-closure.ast.stderr rename to src/test/ui/borrowck/borrowck-move-moved-value-into-closure.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-moved-value-into-closure.mir.stderr b/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-moved-value-into-closure.mir.stderr rename to src/test/ui/borrowck/borrowck-move-moved-value-into-closure.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-moved-value-into-closure.rs b/src/test/ui/borrowck/borrowck-move-moved-value-into-closure.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-moved-value-into-closure.rs rename to src/test/ui/borrowck/borrowck-move-moved-value-into-closure.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-mut-base-ptr.rs b/src/test/ui/borrowck/borrowck-move-mut-base-ptr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-mut-base-ptr.rs rename to src/test/ui/borrowck/borrowck-move-mut-base-ptr.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-mut-base-ptr.stderr b/src/test/ui/borrowck/borrowck-move-mut-base-ptr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-mut-base-ptr.stderr rename to src/test/ui/borrowck/borrowck-move-mut-base-ptr.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-from-array.ast.nll.stderr b/src/test/ui/borrowck/borrowck-move-out-from-array.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-from-array.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-move-out-from-array.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-from-array.ast.stderr b/src/test/ui/borrowck/borrowck-move-out-from-array.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-from-array.ast.stderr rename to src/test/ui/borrowck/borrowck-move-out-from-array.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-from-array.mir.stderr b/src/test/ui/borrowck/borrowck-move-out-from-array.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-from-array.mir.stderr rename to src/test/ui/borrowck/borrowck-move-out-from-array.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-from-array.rs b/src/test/ui/borrowck/borrowck-move-out-from-array.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-from-array.rs rename to src/test/ui/borrowck/borrowck-move-out-from-array.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-overloaded-auto-deref.ast.stderr b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-overloaded-auto-deref.ast.stderr rename to src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-overloaded-auto-deref.mir.stderr b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-overloaded-auto-deref.mir.stderr rename to src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-overloaded-auto-deref.rs b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-overloaded-auto-deref.rs rename to src/test/ui/borrowck/borrowck-move-out-of-overloaded-auto-deref.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-overloaded-deref.rs b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-overloaded-deref.rs rename to src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-overloaded-deref.stderr b/src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-overloaded-deref.stderr rename to src/test/ui/borrowck/borrowck-move-out-of-overloaded-deref.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-static-item.ast.stderr b/src/test/ui/borrowck/borrowck-move-out-of-static-item.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-static-item.ast.stderr rename to src/test/ui/borrowck/borrowck-move-out-of-static-item.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-static-item.mir.stderr b/src/test/ui/borrowck/borrowck-move-out-of-static-item.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-static-item.mir.stderr rename to src/test/ui/borrowck/borrowck-move-out-of-static-item.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-static-item.rs b/src/test/ui/borrowck/borrowck-move-out-of-static-item.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-static-item.rs rename to src/test/ui/borrowck/borrowck-move-out-of-static-item.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-struct-with-dtor.ast.nll.stderr b/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-struct-with-dtor.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-struct-with-dtor.ast.stderr b/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-struct-with-dtor.ast.stderr rename to src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-struct-with-dtor.mir.stderr b/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-struct-with-dtor.mir.stderr rename to src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-struct-with-dtor.rs b/src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-struct-with-dtor.rs rename to src/test/ui/borrowck/borrowck-move-out-of-struct-with-dtor.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.nll.stderr b/src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.nll.stderr rename to src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.rs b/src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.rs rename to src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.stderr b/src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.stderr rename to src/test/ui/borrowck/borrowck-move-out-of-tuple-struct-with-dtor.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-subcomponent.nll.stderr b/src/test/ui/borrowck/borrowck-move-subcomponent.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-subcomponent.nll.stderr rename to src/test/ui/borrowck/borrowck-move-subcomponent.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-subcomponent.rs b/src/test/ui/borrowck/borrowck-move-subcomponent.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-subcomponent.rs rename to src/test/ui/borrowck/borrowck-move-subcomponent.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-subcomponent.stderr b/src/test/ui/borrowck/borrowck-move-subcomponent.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-move-subcomponent.stderr rename to src/test/ui/borrowck/borrowck-move-subcomponent.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-multiple-captures.nll.stderr b/src/test/ui/borrowck/borrowck-multiple-captures.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-multiple-captures.nll.stderr rename to src/test/ui/borrowck/borrowck-multiple-captures.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-multiple-captures.rs b/src/test/ui/borrowck/borrowck-multiple-captures.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-multiple-captures.rs rename to src/test/ui/borrowck/borrowck-multiple-captures.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-multiple-captures.stderr b/src/test/ui/borrowck/borrowck-multiple-captures.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-multiple-captures.stderr rename to src/test/ui/borrowck/borrowck-multiple-captures.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-mut-addr-of-imm-var.nll.stderr b/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-mut-addr-of-imm-var.nll.stderr rename to src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-mut-addr-of-imm-var.rs b/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-mut-addr-of-imm-var.rs rename to src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-mut-addr-of-imm-var.stderr b/src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-mut-addr-of-imm-var.stderr rename to src/test/ui/borrowck/borrowck-mut-addr-of-imm-var.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-mut-borrow-linear-errors.ast.nll.stderr b/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-mut-borrow-linear-errors.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-mut-borrow-linear-errors.ast.stderr b/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-mut-borrow-linear-errors.ast.stderr rename to src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-mut-borrow-linear-errors.mir.stderr b/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-mut-borrow-linear-errors.mir.stderr rename to src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-mut-borrow-linear-errors.rs b/src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-mut-borrow-linear-errors.rs rename to src/test/ui/borrowck/borrowck-mut-borrow-linear-errors.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs b/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs rename to src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-mut-borrow-of-mut-base-ptr.stderr b/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-mut-borrow-of-mut-base-ptr.stderr rename to src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-mut-slice-of-imm-vec.nll.stderr b/src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-mut-slice-of-imm-vec.nll.stderr rename to src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-mut-slice-of-imm-vec.rs b/src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-mut-slice-of-imm-vec.rs rename to src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-mut-slice-of-imm-vec.stderr b/src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-mut-slice-of-imm-vec.stderr rename to src/test/ui/borrowck/borrowck-mut-slice-of-imm-vec.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-mutate-in-guard.rs b/src/test/ui/borrowck/borrowck-mutate-in-guard.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-mutate-in-guard.rs rename to src/test/ui/borrowck/borrowck-mutate-in-guard.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-mutate-in-guard.stderr b/src/test/ui/borrowck/borrowck-mutate-in-guard.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-mutate-in-guard.stderr rename to src/test/ui/borrowck/borrowck-mutate-in-guard.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-no-cycle-in-exchange-heap.nll.stderr b/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-no-cycle-in-exchange-heap.nll.stderr rename to src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-no-cycle-in-exchange-heap.rs b/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-no-cycle-in-exchange-heap.rs rename to src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-no-cycle-in-exchange-heap.stderr b/src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-no-cycle-in-exchange-heap.stderr rename to src/test/ui/borrowck/borrowck-no-cycle-in-exchange-heap.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-object-lifetime.rs b/src/test/ui/borrowck/borrowck-object-lifetime.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-object-lifetime.rs rename to src/test/ui/borrowck/borrowck-object-lifetime.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-object-lifetime.stderr b/src/test/ui/borrowck/borrowck-object-lifetime.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-object-lifetime.stderr rename to src/test/ui/borrowck/borrowck-object-lifetime.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-or-init.nll.stderr b/src/test/ui/borrowck/borrowck-or-init.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-or-init.nll.stderr rename to src/test/ui/borrowck/borrowck-or-init.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-or-init.rs b/src/test/ui/borrowck/borrowck-or-init.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-or-init.rs rename to src/test/ui/borrowck/borrowck-or-init.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-or-init.stderr b/src/test/ui/borrowck/borrowck-or-init.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-or-init.stderr rename to src/test/ui/borrowck/borrowck-or-init.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-call.nll.stderr b/src/test/ui/borrowck/borrowck-overloaded-call.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-call.nll.stderr rename to src/test/ui/borrowck/borrowck-overloaded-call.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-call.rs b/src/test/ui/borrowck/borrowck-overloaded-call.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-call.rs rename to src/test/ui/borrowck/borrowck-overloaded-call.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-call.stderr b/src/test/ui/borrowck/borrowck-overloaded-call.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-call.stderr rename to src/test/ui/borrowck/borrowck-overloaded-call.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-and-overloaded-deref.ast.nll.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-and-overloaded-deref.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-and-overloaded-deref.ast.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-and-overloaded-deref.ast.stderr rename to src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-and-overloaded-deref.mir.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-and-overloaded-deref.mir.stderr rename to src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-and-overloaded-deref.rs b/src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-and-overloaded-deref.rs rename to src/test/ui/borrowck/borrowck-overloaded-index-and-overloaded-deref.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-autoderef.rs b/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-autoderef.rs rename to src/test/ui/borrowck/borrowck-overloaded-index-autoderef.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-autoderef.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-autoderef.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-autoderef.stderr rename to src/test/ui/borrowck/borrowck-overloaded-index-autoderef.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-move-from-vec.nll.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-move-from-vec.nll.stderr rename to src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-move-from-vec.rs b/src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-move-from-vec.rs rename to src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-move-from-vec.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-move-from-vec.stderr rename to src/test/ui/borrowck/borrowck-overloaded-index-move-from-vec.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-move-index.nll.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-move-index.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-move-index.nll.stderr rename to src/test/ui/borrowck/borrowck-overloaded-index-move-index.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-move-index.rs b/src/test/ui/borrowck/borrowck-overloaded-index-move-index.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-move-index.rs rename to src/test/ui/borrowck/borrowck-overloaded-index-move-index.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-move-index.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-move-index.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-move-index.stderr rename to src/test/ui/borrowck/borrowck-overloaded-index-move-index.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-ref-index.ast.nll.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-ref-index.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-overloaded-index-ref-index.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-ref-index.ast.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.ast.stderr similarity index 90% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-ref-index.ast.stderr rename to src/test/ui/borrowck/borrowck-overloaded-index-ref-index.ast.stderr index 63024acc7df..8675c5b7ac6 100644 --- a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-ref-index.ast.stderr +++ b/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.ast.stderr @@ -3,6 +3,8 @@ error[E0594]: cannot assign to immutable indexed content | LL | s[2] = 20; | ^^^^^^^^^ cannot borrow as mutable + | + = help: trait `IndexMut` is required to modify indexed content, but it is not implemented for `Bar` error[E0502]: cannot borrow `s` as immutable because it is also borrowed as mutable --> $DIR/borrowck-overloaded-index-ref-index.rs:62:23 diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-ref-index.mir.stderr b/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-ref-index.mir.stderr rename to src/test/ui/borrowck/borrowck-overloaded-index-ref-index.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-ref-index.rs b/src/test/ui/borrowck/borrowck-overloaded-index-ref-index.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-ref-index.rs rename to src/test/ui/borrowck/borrowck-overloaded-index-ref-index.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-1.nll.stderr b/src/test/ui/borrowck/borrowck-partial-reinit-1.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-1.nll.stderr rename to src/test/ui/borrowck/borrowck-partial-reinit-1.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-1.rs b/src/test/ui/borrowck/borrowck-partial-reinit-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-1.rs rename to src/test/ui/borrowck/borrowck-partial-reinit-1.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-1.stderr b/src/test/ui/borrowck/borrowck-partial-reinit-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-1.stderr rename to src/test/ui/borrowck/borrowck-partial-reinit-1.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-2.nll.stderr b/src/test/ui/borrowck/borrowck-partial-reinit-2.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-2.nll.stderr rename to src/test/ui/borrowck/borrowck-partial-reinit-2.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-2.rs b/src/test/ui/borrowck/borrowck-partial-reinit-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-2.rs rename to src/test/ui/borrowck/borrowck-partial-reinit-2.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-2.stderr b/src/test/ui/borrowck/borrowck-partial-reinit-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-2.stderr rename to src/test/ui/borrowck/borrowck-partial-reinit-2.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-3.nll.stderr b/src/test/ui/borrowck/borrowck-partial-reinit-3.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-3.nll.stderr rename to src/test/ui/borrowck/borrowck-partial-reinit-3.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-3.rs b/src/test/ui/borrowck/borrowck-partial-reinit-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-3.rs rename to src/test/ui/borrowck/borrowck-partial-reinit-3.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-3.stderr b/src/test/ui/borrowck/borrowck-partial-reinit-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-3.stderr rename to src/test/ui/borrowck/borrowck-partial-reinit-3.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-4.nll.stderr b/src/test/ui/borrowck/borrowck-partial-reinit-4.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-4.nll.stderr rename to src/test/ui/borrowck/borrowck-partial-reinit-4.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-4.rs b/src/test/ui/borrowck/borrowck-partial-reinit-4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-4.rs rename to src/test/ui/borrowck/borrowck-partial-reinit-4.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-4.stderr b/src/test/ui/borrowck/borrowck-partial-reinit-4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-4.stderr rename to src/test/ui/borrowck/borrowck-partial-reinit-4.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-pat-reassign-binding.ast.nll.stderr b/src/test/ui/borrowck/borrowck-pat-reassign-binding.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-pat-reassign-binding.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-pat-reassign-binding.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-pat-reassign-binding.ast.stderr b/src/test/ui/borrowck/borrowck-pat-reassign-binding.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-pat-reassign-binding.ast.stderr rename to src/test/ui/borrowck/borrowck-pat-reassign-binding.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-pat-reassign-binding.mir.stderr b/src/test/ui/borrowck/borrowck-pat-reassign-binding.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-pat-reassign-binding.mir.stderr rename to src/test/ui/borrowck/borrowck-pat-reassign-binding.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-pat-reassign-binding.rs b/src/test/ui/borrowck/borrowck-pat-reassign-binding.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-pat-reassign-binding.rs rename to src/test/ui/borrowck/borrowck-pat-reassign-binding.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-reborrow-from-mut.nll.stderr b/src/test/ui/borrowck/borrowck-reborrow-from-mut.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-reborrow-from-mut.nll.stderr rename to src/test/ui/borrowck/borrowck-reborrow-from-mut.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-reborrow-from-mut.rs b/src/test/ui/borrowck/borrowck-reborrow-from-mut.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-reborrow-from-mut.rs rename to src/test/ui/borrowck/borrowck-reborrow-from-mut.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-reborrow-from-mut.stderr b/src/test/ui/borrowck/borrowck-reborrow-from-mut.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-reborrow-from-mut.stderr rename to src/test/ui/borrowck/borrowck-reborrow-from-mut.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-reborrow-from-shorter-lived-andmut.nll.stderr b/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-reborrow-from-shorter-lived-andmut.nll.stderr rename to src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-reborrow-from-shorter-lived-andmut.rs b/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-reborrow-from-shorter-lived-andmut.rs rename to src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-reborrow-from-shorter-lived-andmut.stderr b/src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-reborrow-from-shorter-lived-andmut.stderr rename to src/test/ui/borrowck/borrowck-reborrow-from-shorter-lived-andmut.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-ref-mut-of-imm.nll.stderr b/src/test/ui/borrowck/borrowck-ref-mut-of-imm.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-ref-mut-of-imm.nll.stderr rename to src/test/ui/borrowck/borrowck-ref-mut-of-imm.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-ref-mut-of-imm.rs b/src/test/ui/borrowck/borrowck-ref-mut-of-imm.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-ref-mut-of-imm.rs rename to src/test/ui/borrowck/borrowck-ref-mut-of-imm.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-ref-mut-of-imm.stderr b/src/test/ui/borrowck/borrowck-ref-mut-of-imm.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-ref-mut-of-imm.stderr rename to src/test/ui/borrowck/borrowck-ref-mut-of-imm.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-return-variable-on-stack-via-clone.nll.stderr b/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-return-variable-on-stack-via-clone.nll.stderr rename to src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-return-variable-on-stack-via-clone.rs b/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-return-variable-on-stack-via-clone.rs rename to src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-return-variable-on-stack-via-clone.stderr b/src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-return-variable-on-stack-via-clone.stderr rename to src/test/ui/borrowck/borrowck-return-variable-on-stack-via-clone.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-return.rs b/src/test/ui/borrowck/borrowck-return.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-return.rs rename to src/test/ui/borrowck/borrowck-return.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-return.stderr b/src/test/ui/borrowck/borrowck-return.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-return.stderr rename to src/test/ui/borrowck/borrowck-return.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-storage-dead.rs b/src/test/ui/borrowck/borrowck-storage-dead.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-storage-dead.rs rename to src/test/ui/borrowck/borrowck-storage-dead.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-storage-dead.stderr b/src/test/ui/borrowck/borrowck-storage-dead.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-storage-dead.stderr rename to src/test/ui/borrowck/borrowck-storage-dead.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-struct-update-with-dtor.ast.nll.stderr b/src/test/ui/borrowck/borrowck-struct-update-with-dtor.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-struct-update-with-dtor.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-struct-update-with-dtor.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-struct-update-with-dtor.ast.stderr b/src/test/ui/borrowck/borrowck-struct-update-with-dtor.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-struct-update-with-dtor.ast.stderr rename to src/test/ui/borrowck/borrowck-struct-update-with-dtor.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-struct-update-with-dtor.mir.stderr b/src/test/ui/borrowck/borrowck-struct-update-with-dtor.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-struct-update-with-dtor.mir.stderr rename to src/test/ui/borrowck/borrowck-struct-update-with-dtor.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-struct-update-with-dtor.rs b/src/test/ui/borrowck/borrowck-struct-update-with-dtor.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-struct-update-with-dtor.rs rename to src/test/ui/borrowck/borrowck-struct-update-with-dtor.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-swap-mut-base-ptr.rs b/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-swap-mut-base-ptr.rs rename to src/test/ui/borrowck/borrowck-swap-mut-base-ptr.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-swap-mut-base-ptr.stderr b/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-swap-mut-base-ptr.stderr rename to src/test/ui/borrowck/borrowck-swap-mut-base-ptr.stderr diff --git a/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.nll.stderr b/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.nll.stderr new file mode 100644 index 00000000000..7373457e719 --- /dev/null +++ b/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.nll.stderr @@ -0,0 +1,12 @@ +error[E0712]: thread-local variable borrowed past end of function + --> $DIR/borrowck-thread-local-static-borrow-outlives-fn.rs:21:20 + | +LL | assert_static(&FOO); //[ast]~ ERROR [E0597] + | ^^^^ thread-local variables cannot be borrowed beyond the end of the function +LL | //[mir]~^ ERROR [E0712] +LL | } + | - end of enclosing function is here + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0712`. diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.stderr b/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.stderr rename to src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.stderr diff --git a/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.mir.stderr b/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.mir.stderr new file mode 100644 index 00000000000..7373457e719 --- /dev/null +++ b/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.mir.stderr @@ -0,0 +1,12 @@ +error[E0712]: thread-local variable borrowed past end of function + --> $DIR/borrowck-thread-local-static-borrow-outlives-fn.rs:21:20 + | +LL | assert_static(&FOO); //[ast]~ ERROR [E0597] + | ^^^^ thread-local variables cannot be borrowed beyond the end of the function +LL | //[mir]~^ ERROR [E0712] +LL | } + | - end of enclosing function is here + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0712`. diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-thread-local-static-borrow-outlives-fn.rs b/src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-thread-local-static-borrow-outlives-fn.rs rename to src/test/ui/borrowck/borrowck-thread-local-static-borrow-outlives-fn.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-unary-move.ast.nll.stderr b/src/test/ui/borrowck/borrowck-unary-move.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-unary-move.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-unary-move.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-unary-move.ast.stderr b/src/test/ui/borrowck/borrowck-unary-move.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-unary-move.ast.stderr rename to src/test/ui/borrowck/borrowck-unary-move.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-unary-move.mir.stderr b/src/test/ui/borrowck/borrowck-unary-move.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-unary-move.mir.stderr rename to src/test/ui/borrowck/borrowck-unary-move.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-unary-move.rs b/src/test/ui/borrowck/borrowck-unary-move.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-unary-move.rs rename to src/test/ui/borrowck/borrowck-unary-move.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-unboxed-closures.nll.stderr b/src/test/ui/borrowck/borrowck-unboxed-closures.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-unboxed-closures.nll.stderr rename to src/test/ui/borrowck/borrowck-unboxed-closures.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-unboxed-closures.rs b/src/test/ui/borrowck/borrowck-unboxed-closures.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-unboxed-closures.rs rename to src/test/ui/borrowck/borrowck-unboxed-closures.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-unboxed-closures.stderr b/src/test/ui/borrowck/borrowck-unboxed-closures.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-unboxed-closures.stderr rename to src/test/ui/borrowck/borrowck-unboxed-closures.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-after-item.rs b/src/test/ui/borrowck/borrowck-uninit-after-item.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-after-item.rs rename to src/test/ui/borrowck/borrowck-uninit-after-item.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-after-item.stderr b/src/test/ui/borrowck/borrowck-uninit-after-item.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-after-item.stderr rename to src/test/ui/borrowck/borrowck-uninit-after-item.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-field-access.ast.nll.stderr b/src/test/ui/borrowck/borrowck-uninit-field-access.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-field-access.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-uninit-field-access.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-field-access.ast.stderr b/src/test/ui/borrowck/borrowck-uninit-field-access.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-field-access.ast.stderr rename to src/test/ui/borrowck/borrowck-uninit-field-access.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-field-access.mir.stderr b/src/test/ui/borrowck/borrowck-uninit-field-access.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-field-access.mir.stderr rename to src/test/ui/borrowck/borrowck-uninit-field-access.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-field-access.rs b/src/test/ui/borrowck/borrowck-uninit-field-access.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-field-access.rs rename to src/test/ui/borrowck/borrowck-uninit-field-access.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-in-assignop.rs b/src/test/ui/borrowck/borrowck-uninit-in-assignop.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-in-assignop.rs rename to src/test/ui/borrowck/borrowck-uninit-in-assignop.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-in-assignop.stderr b/src/test/ui/borrowck/borrowck-uninit-in-assignop.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-in-assignop.stderr rename to src/test/ui/borrowck/borrowck-uninit-in-assignop.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-ref-chain.ast.nll.stderr b/src/test/ui/borrowck/borrowck-uninit-ref-chain.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-ref-chain.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-uninit-ref-chain.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-ref-chain.ast.stderr b/src/test/ui/borrowck/borrowck-uninit-ref-chain.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-ref-chain.ast.stderr rename to src/test/ui/borrowck/borrowck-uninit-ref-chain.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-ref-chain.mir.stderr b/src/test/ui/borrowck/borrowck-uninit-ref-chain.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-ref-chain.mir.stderr rename to src/test/ui/borrowck/borrowck-uninit-ref-chain.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-ref-chain.rs b/src/test/ui/borrowck/borrowck-uninit-ref-chain.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-ref-chain.rs rename to src/test/ui/borrowck/borrowck-uninit-ref-chain.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit.rs b/src/test/ui/borrowck/borrowck-uninit.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-uninit.rs rename to src/test/ui/borrowck/borrowck-uninit.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit.stderr b/src/test/ui/borrowck/borrowck-uninit.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-uninit.stderr rename to src/test/ui/borrowck/borrowck-uninit.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-borrow-nested.rs b/src/test/ui/borrowck/borrowck-union-borrow-nested.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-union-borrow-nested.rs rename to src/test/ui/borrowck/borrowck-union-borrow-nested.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-borrow-nested.stderr b/src/test/ui/borrowck/borrowck-union-borrow-nested.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-union-borrow-nested.stderr rename to src/test/ui/borrowck/borrowck-union-borrow-nested.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-borrow.ast.nll.stderr b/src/test/ui/borrowck/borrowck-union-borrow.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-union-borrow.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-union-borrow.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-borrow.ast.stderr b/src/test/ui/borrowck/borrowck-union-borrow.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-union-borrow.ast.stderr rename to src/test/ui/borrowck/borrowck-union-borrow.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-borrow.mir.stderr b/src/test/ui/borrowck/borrowck-union-borrow.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-union-borrow.mir.stderr rename to src/test/ui/borrowck/borrowck-union-borrow.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-borrow.rs b/src/test/ui/borrowck/borrowck-union-borrow.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-union-borrow.rs rename to src/test/ui/borrowck/borrowck-union-borrow.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-move-assign.nll.stderr b/src/test/ui/borrowck/borrowck-union-move-assign.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-union-move-assign.nll.stderr rename to src/test/ui/borrowck/borrowck-union-move-assign.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-move-assign.rs b/src/test/ui/borrowck/borrowck-union-move-assign.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-union-move-assign.rs rename to src/test/ui/borrowck/borrowck-union-move-assign.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-move-assign.stderr b/src/test/ui/borrowck/borrowck-union-move-assign.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-union-move-assign.stderr rename to src/test/ui/borrowck/borrowck-union-move-assign.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-move.nll.stderr b/src/test/ui/borrowck/borrowck-union-move.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-union-move.nll.stderr rename to src/test/ui/borrowck/borrowck-union-move.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-move.rs b/src/test/ui/borrowck/borrowck-union-move.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-union-move.rs rename to src/test/ui/borrowck/borrowck-union-move.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-move.stderr b/src/test/ui/borrowck/borrowck-union-move.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-union-move.stderr rename to src/test/ui/borrowck/borrowck-union-move.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-uninitialized.nll.stderr b/src/test/ui/borrowck/borrowck-union-uninitialized.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-union-uninitialized.nll.stderr rename to src/test/ui/borrowck/borrowck-union-uninitialized.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-uninitialized.rs b/src/test/ui/borrowck/borrowck-union-uninitialized.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-union-uninitialized.rs rename to src/test/ui/borrowck/borrowck-union-uninitialized.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-uninitialized.stderr b/src/test/ui/borrowck/borrowck-union-uninitialized.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-union-uninitialized.stderr rename to src/test/ui/borrowck/borrowck-union-uninitialized.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-uniq-via-lend.rs b/src/test/ui/borrowck/borrowck-uniq-via-lend.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-uniq-via-lend.rs rename to src/test/ui/borrowck/borrowck-uniq-via-lend.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-uniq-via-lend.stderr b/src/test/ui/borrowck/borrowck-uniq-via-lend.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-uniq-via-lend.stderr rename to src/test/ui/borrowck/borrowck-uniq-via-lend.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-use-in-index-lvalue.ast.nll.stderr b/src/test/ui/borrowck/borrowck-use-in-index-lvalue.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-use-in-index-lvalue.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-use-in-index-lvalue.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-use-in-index-lvalue.ast.stderr b/src/test/ui/borrowck/borrowck-use-in-index-lvalue.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-use-in-index-lvalue.ast.stderr rename to src/test/ui/borrowck/borrowck-use-in-index-lvalue.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-use-in-index-lvalue.mir.stderr b/src/test/ui/borrowck/borrowck-use-in-index-lvalue.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-use-in-index-lvalue.mir.stderr rename to src/test/ui/borrowck/borrowck-use-in-index-lvalue.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-use-in-index-lvalue.rs b/src/test/ui/borrowck/borrowck-use-in-index-lvalue.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-use-in-index-lvalue.rs rename to src/test/ui/borrowck/borrowck-use-in-index-lvalue.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-use-mut-borrow.nll.stderr b/src/test/ui/borrowck/borrowck-use-mut-borrow.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-use-mut-borrow.nll.stderr rename to src/test/ui/borrowck/borrowck-use-mut-borrow.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-use-mut-borrow.rs b/src/test/ui/borrowck/borrowck-use-mut-borrow.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-use-mut-borrow.rs rename to src/test/ui/borrowck/borrowck-use-mut-borrow.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-use-mut-borrow.stderr b/src/test/ui/borrowck/borrowck-use-mut-borrow.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-use-mut-borrow.stderr rename to src/test/ui/borrowck/borrowck-use-mut-borrow.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-use-uninitialized-in-cast-trait.ast.nll.stderr b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-use-uninitialized-in-cast-trait.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-use-uninitialized-in-cast-trait.ast.stderr b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-use-uninitialized-in-cast-trait.ast.stderr rename to src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-use-uninitialized-in-cast-trait.mir.stderr b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-use-uninitialized-in-cast-trait.mir.stderr rename to src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-use-uninitialized-in-cast-trait.rs b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-use-uninitialized-in-cast-trait.rs rename to src/test/ui/borrowck/borrowck-use-uninitialized-in-cast-trait.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-use-uninitialized-in-cast.ast.nll.stderr b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-use-uninitialized-in-cast.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-use-uninitialized-in-cast.ast.stderr b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-use-uninitialized-in-cast.ast.stderr rename to src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-use-uninitialized-in-cast.mir.stderr b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-use-uninitialized-in-cast.mir.stderr rename to src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-use-uninitialized-in-cast.rs b/src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-use-uninitialized-in-cast.rs rename to src/test/ui/borrowck/borrowck-use-uninitialized-in-cast.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-element-loan.nll.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-element-loan.nll.stderr rename to src/test/ui/borrowck/borrowck-vec-pattern-element-loan.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-element-loan.rs b/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-element-loan.rs rename to src/test/ui/borrowck/borrowck-vec-pattern-element-loan.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-element-loan.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-element-loan.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-element-loan.stderr rename to src/test/ui/borrowck/borrowck-vec-pattern-element-loan.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-loan-from-mut.nll.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-loan-from-mut.nll.stderr rename to src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-loan-from-mut.rs b/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-loan-from-mut.rs rename to src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-loan-from-mut.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-loan-from-mut.stderr rename to src/test/ui/borrowck/borrowck-vec-pattern-loan-from-mut.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-move-tail.ast.nll.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-move-tail.ast.nll.stderr rename to src/test/ui/borrowck/borrowck-vec-pattern-move-tail.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-move-tail.ast.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-move-tail.ast.stderr rename to src/test/ui/borrowck/borrowck-vec-pattern-move-tail.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-move-tail.cmp.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.cmp.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-move-tail.cmp.stderr rename to src/test/ui/borrowck/borrowck-vec-pattern-move-tail.cmp.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-move-tail.rs b/src/test/ui/borrowck/borrowck-vec-pattern-move-tail.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-move-tail.rs rename to src/test/ui/borrowck/borrowck-vec-pattern-move-tail.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-tail-element-loan.nll.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-tail-element-loan.nll.stderr rename to src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-tail-element-loan.rs b/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-tail-element-loan.rs rename to src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-tail-element-loan.stderr b/src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-vec-pattern-tail-element-loan.stderr rename to src/test/ui/borrowck/borrowck-vec-pattern-tail-element-loan.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-while-break.nll.stderr b/src/test/ui/borrowck/borrowck-while-break.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-while-break.nll.stderr rename to src/test/ui/borrowck/borrowck-while-break.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-while-break.rs b/src/test/ui/borrowck/borrowck-while-break.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-while-break.rs rename to src/test/ui/borrowck/borrowck-while-break.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-while-break.stderr b/src/test/ui/borrowck/borrowck-while-break.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-while-break.stderr rename to src/test/ui/borrowck/borrowck-while-break.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-while-cond.rs b/src/test/ui/borrowck/borrowck-while-cond.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-while-cond.rs rename to src/test/ui/borrowck/borrowck-while-cond.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-while-cond.stderr b/src/test/ui/borrowck/borrowck-while-cond.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-while-cond.stderr rename to src/test/ui/borrowck/borrowck-while-cond.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-while.rs b/src/test/ui/borrowck/borrowck-while.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-while.rs rename to src/test/ui/borrowck/borrowck-while.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-while.stderr b/src/test/ui/borrowck/borrowck-while.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/borrowck-while.stderr rename to src/test/ui/borrowck/borrowck-while.stderr diff --git a/src/test/ui/borrowck/issue-45983.migrate.stderr b/src/test/ui/borrowck/issue-45983.migrate.stderr deleted file mode 100644 index db7cedffd8f..00000000000 --- a/src/test/ui/borrowck/issue-45983.migrate.stderr +++ /dev/null @@ -1,12 +0,0 @@ -error: borrowed data cannot be stored outside of its closure - --> $DIR/issue-45983.rs:36:27 - | -LL | let x = None; - | - borrowed data cannot be stored into here... -LL | give_any(|y| x = Some(y)); - | --- ^ cannot be stored outside of its closure - | | - | ...because it cannot outlive this closure - -error: aborting due to previous error - diff --git a/src/test/ui/compile-fail-migration/borrowck/move-in-static-initializer-issue-38520.ast.stderr b/src/test/ui/borrowck/move-in-static-initializer-issue-38520.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/move-in-static-initializer-issue-38520.ast.stderr rename to src/test/ui/borrowck/move-in-static-initializer-issue-38520.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/move-in-static-initializer-issue-38520.mir.stderr b/src/test/ui/borrowck/move-in-static-initializer-issue-38520.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/move-in-static-initializer-issue-38520.mir.stderr rename to src/test/ui/borrowck/move-in-static-initializer-issue-38520.mir.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/move-in-static-initializer-issue-38520.rs b/src/test/ui/borrowck/move-in-static-initializer-issue-38520.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/move-in-static-initializer-issue-38520.rs rename to src/test/ui/borrowck/move-in-static-initializer-issue-38520.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-across-loop.rs b/src/test/ui/borrowck/two-phase-across-loop.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-across-loop.rs rename to src/test/ui/borrowck/two-phase-across-loop.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-across-loop.stderr b/src/test/ui/borrowck/two-phase-across-loop.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-across-loop.stderr rename to src/test/ui/borrowck/two-phase-across-loop.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-activation-sharing-interference.nll_target.stderr b/src/test/ui/borrowck/two-phase-activation-sharing-interference.nll_target.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-activation-sharing-interference.nll_target.stderr rename to src/test/ui/borrowck/two-phase-activation-sharing-interference.nll_target.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-activation-sharing-interference.rs b/src/test/ui/borrowck/two-phase-activation-sharing-interference.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-activation-sharing-interference.rs rename to src/test/ui/borrowck/two-phase-activation-sharing-interference.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-allow-access-during-reservation.nll_target.stderr b/src/test/ui/borrowck/two-phase-allow-access-during-reservation.nll_target.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-allow-access-during-reservation.nll_target.stderr rename to src/test/ui/borrowck/two-phase-allow-access-during-reservation.nll_target.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-allow-access-during-reservation.rs b/src/test/ui/borrowck/two-phase-allow-access-during-reservation.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-allow-access-during-reservation.rs rename to src/test/ui/borrowck/two-phase-allow-access-during-reservation.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-cannot-nest-mut-self-calls.rs b/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-cannot-nest-mut-self-calls.rs rename to src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-cannot-nest-mut-self-calls.stderr b/src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-cannot-nest-mut-self-calls.stderr rename to src/test/ui/borrowck/two-phase-cannot-nest-mut-self-calls.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-nonrecv-autoref.ast.nll.stderr b/src/test/ui/borrowck/two-phase-nonrecv-autoref.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-nonrecv-autoref.ast.nll.stderr rename to src/test/ui/borrowck/two-phase-nonrecv-autoref.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-nonrecv-autoref.ast.stderr b/src/test/ui/borrowck/two-phase-nonrecv-autoref.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-nonrecv-autoref.ast.stderr rename to src/test/ui/borrowck/two-phase-nonrecv-autoref.ast.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-nonrecv-autoref.nll.stderr b/src/test/ui/borrowck/two-phase-nonrecv-autoref.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-nonrecv-autoref.nll.stderr rename to src/test/ui/borrowck/two-phase-nonrecv-autoref.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-nonrecv-autoref.rs b/src/test/ui/borrowck/two-phase-nonrecv-autoref.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-nonrecv-autoref.rs rename to src/test/ui/borrowck/two-phase-nonrecv-autoref.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-reservation-sharing-interference-2.rs b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-reservation-sharing-interference-2.rs rename to src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-reservation-sharing-interference-2.stderr b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-reservation-sharing-interference-2.stderr rename to src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-reservation-sharing-interference.nll_target.stderr b/src/test/ui/borrowck/two-phase-reservation-sharing-interference.nll_target.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-reservation-sharing-interference.nll_target.stderr rename to src/test/ui/borrowck/two-phase-reservation-sharing-interference.nll_target.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-reservation-sharing-interference.rs b/src/test/ui/borrowck/two-phase-reservation-sharing-interference.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-reservation-sharing-interference.rs rename to src/test/ui/borrowck/two-phase-reservation-sharing-interference.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-sneaky.nll.stderr b/src/test/ui/borrowck/two-phase-sneaky.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-sneaky.nll.stderr rename to src/test/ui/borrowck/two-phase-sneaky.nll.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-sneaky.rs b/src/test/ui/borrowck/two-phase-sneaky.rs similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-sneaky.rs rename to src/test/ui/borrowck/two-phase-sneaky.rs diff --git a/src/test/ui/compile-fail-migration/borrowck/two-phase-sneaky.stderr b/src/test/ui/borrowck/two-phase-sneaky.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/borrowck/two-phase-sneaky.stderr rename to src/test/ui/borrowck/two-phase-sneaky.stderr diff --git a/src/test/ui/compile-fail-migration/bounds-lifetime.rs b/src/test/ui/bounds-lifetime.rs similarity index 100% rename from src/test/ui/compile-fail-migration/bounds-lifetime.rs rename to src/test/ui/bounds-lifetime.rs diff --git a/src/test/ui/compile-fail-migration/bounds-lifetime.stderr b/src/test/ui/bounds-lifetime.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/bounds-lifetime.stderr rename to src/test/ui/bounds-lifetime.stderr diff --git a/src/test/ui/compile-fail-migration/break-outside-loop.rs b/src/test/ui/break-outside-loop.rs similarity index 100% rename from src/test/ui/compile-fail-migration/break-outside-loop.rs rename to src/test/ui/break-outside-loop.rs diff --git a/src/test/ui/compile-fail-migration/break-outside-loop.stderr b/src/test/ui/break-outside-loop.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/break-outside-loop.stderr rename to src/test/ui/break-outside-loop.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/trait_superkinds_in_metadata.rs b/src/test/ui/builtin-superkinds/auxiliary/trait_superkinds_in_metadata.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/trait_superkinds_in_metadata.rs rename to src/test/ui/builtin-superkinds/auxiliary/trait_superkinds_in_metadata.rs diff --git a/src/test/ui/compile-fail-migration/builtin-superkinds-double-superkind.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.rs similarity index 100% rename from src/test/ui/compile-fail-migration/builtin-superkinds-double-superkind.rs rename to src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.rs diff --git a/src/test/ui/compile-fail-migration/builtin-superkinds-double-superkind.stderr b/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/builtin-superkinds-double-superkind.stderr rename to src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.stderr diff --git a/src/test/ui/compile-fail-migration/builtin-superkinds-in-metadata.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.rs similarity index 100% rename from src/test/ui/compile-fail-migration/builtin-superkinds-in-metadata.rs rename to src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.rs diff --git a/src/test/ui/compile-fail-migration/builtin-superkinds-in-metadata.stderr b/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/builtin-superkinds-in-metadata.stderr rename to src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr diff --git a/src/test/ui/compile-fail-migration/builtin-superkinds-self-type.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/builtin-superkinds-self-type.rs rename to src/test/ui/builtin-superkinds/builtin-superkinds-self-type.rs diff --git a/src/test/ui/compile-fail-migration/builtin-superkinds-self-type.stderr b/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/builtin-superkinds-self-type.stderr rename to src/test/ui/builtin-superkinds/builtin-superkinds-self-type.stderr diff --git a/src/test/ui/compile-fail-migration/builtin-superkinds-simple.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-simple.rs similarity index 100% rename from src/test/ui/compile-fail-migration/builtin-superkinds-simple.rs rename to src/test/ui/builtin-superkinds/builtin-superkinds-simple.rs diff --git a/src/test/ui/compile-fail-migration/builtin-superkinds-simple.stderr b/src/test/ui/builtin-superkinds/builtin-superkinds-simple.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/builtin-superkinds-simple.stderr rename to src/test/ui/builtin-superkinds/builtin-superkinds-simple.stderr diff --git a/src/test/ui/compile-fail-migration/builtin-superkinds-typaram-not-send.rs b/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.rs similarity index 100% rename from src/test/ui/compile-fail-migration/builtin-superkinds-typaram-not-send.rs rename to src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.rs diff --git a/src/test/ui/compile-fail-migration/builtin-superkinds-typaram-not-send.stderr b/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/builtin-superkinds-typaram-not-send.stderr rename to src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.stderr diff --git a/src/test/ui/compile-fail-migration/by-move-pattern-binding.nll.stderr b/src/test/ui/by-move-pattern-binding.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/by-move-pattern-binding.nll.stderr rename to src/test/ui/by-move-pattern-binding.nll.stderr diff --git a/src/test/ui/compile-fail-migration/by-move-pattern-binding.rs b/src/test/ui/by-move-pattern-binding.rs similarity index 100% rename from src/test/ui/compile-fail-migration/by-move-pattern-binding.rs rename to src/test/ui/by-move-pattern-binding.rs diff --git a/src/test/ui/compile-fail-migration/by-move-pattern-binding.stderr b/src/test/ui/by-move-pattern-binding.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/by-move-pattern-binding.stderr rename to src/test/ui/by-move-pattern-binding.stderr diff --git a/src/test/ui/compile-fail-migration/call-fn-never-arg-wrong-type.rs b/src/test/ui/call-fn-never-arg-wrong-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/call-fn-never-arg-wrong-type.rs rename to src/test/ui/call-fn-never-arg-wrong-type.rs diff --git a/src/test/ui/compile-fail-migration/call-fn-never-arg-wrong-type.stderr b/src/test/ui/call-fn-never-arg-wrong-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/call-fn-never-arg-wrong-type.stderr rename to src/test/ui/call-fn-never-arg-wrong-type.stderr diff --git a/src/test/ui/compile-fail-migration/can-begin-expr-check.rs b/src/test/ui/can-begin-expr-check.rs similarity index 100% rename from src/test/ui/compile-fail-migration/can-begin-expr-check.rs rename to src/test/ui/can-begin-expr-check.rs diff --git a/src/test/ui/compile-fail-migration/can-begin-expr-check.stderr b/src/test/ui/can-begin-expr-check.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/can-begin-expr-check.stderr rename to src/test/ui/can-begin-expr-check.stderr diff --git a/src/test/ui/compile-fail-migration/cannot-mutate-captured-non-mut-var.ast.nll.stderr b/src/test/ui/cannot-mutate-captured-non-mut-var.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cannot-mutate-captured-non-mut-var.ast.nll.stderr rename to src/test/ui/cannot-mutate-captured-non-mut-var.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/cannot-mutate-captured-non-mut-var.ast.stderr b/src/test/ui/cannot-mutate-captured-non-mut-var.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cannot-mutate-captured-non-mut-var.ast.stderr rename to src/test/ui/cannot-mutate-captured-non-mut-var.ast.stderr diff --git a/src/test/ui/compile-fail-migration/cannot-mutate-captured-non-mut-var.mir.stderr b/src/test/ui/cannot-mutate-captured-non-mut-var.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cannot-mutate-captured-non-mut-var.mir.stderr rename to src/test/ui/cannot-mutate-captured-non-mut-var.mir.stderr diff --git a/src/test/ui/compile-fail-migration/cannot-mutate-captured-non-mut-var.rs b/src/test/ui/cannot-mutate-captured-non-mut-var.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cannot-mutate-captured-non-mut-var.rs rename to src/test/ui/cannot-mutate-captured-non-mut-var.rs diff --git a/src/test/ui/compile-fail-migration/capture1.rs b/src/test/ui/capture1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/capture1.rs rename to src/test/ui/capture1.rs diff --git a/src/test/ui/compile-fail-migration/capture1.stderr b/src/test/ui/capture1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/capture1.stderr rename to src/test/ui/capture1.stderr diff --git a/src/test/ui/cast-as-bool.rs b/src/test/ui/cast/cast-as-bool.rs similarity index 100% rename from src/test/ui/cast-as-bool.rs rename to src/test/ui/cast/cast-as-bool.rs diff --git a/src/test/ui/cast-as-bool.stderr b/src/test/ui/cast/cast-as-bool.stderr similarity index 100% rename from src/test/ui/cast-as-bool.stderr rename to src/test/ui/cast/cast-as-bool.stderr diff --git a/src/test/ui/cast-errors-issue-43825.rs b/src/test/ui/cast/cast-errors-issue-43825.rs similarity index 100% rename from src/test/ui/cast-errors-issue-43825.rs rename to src/test/ui/cast/cast-errors-issue-43825.rs diff --git a/src/test/ui/cast-errors-issue-43825.stderr b/src/test/ui/cast/cast-errors-issue-43825.stderr similarity index 100% rename from src/test/ui/cast-errors-issue-43825.stderr rename to src/test/ui/cast/cast-errors-issue-43825.stderr diff --git a/src/test/ui/compile-fail-migration/cast-from-nil.rs b/src/test/ui/cast/cast-from-nil.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cast-from-nil.rs rename to src/test/ui/cast/cast-from-nil.rs diff --git a/src/test/ui/compile-fail-migration/cast-from-nil.stderr b/src/test/ui/cast/cast-from-nil.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cast-from-nil.stderr rename to src/test/ui/cast/cast-from-nil.stderr diff --git a/src/test/ui/compile-fail-migration/cast-ptr-to-int-const.rs b/src/test/ui/cast/cast-ptr-to-int-const.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cast-ptr-to-int-const.rs rename to src/test/ui/cast/cast-ptr-to-int-const.rs diff --git a/src/test/ui/compile-fail-migration/cast-ptr-to-int-const.stderr b/src/test/ui/cast/cast-ptr-to-int-const.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cast-ptr-to-int-const.stderr rename to src/test/ui/cast/cast-ptr-to-int-const.stderr diff --git a/src/test/ui/cast-rfc0401-2.rs b/src/test/ui/cast/cast-rfc0401-2.rs similarity index 100% rename from src/test/ui/cast-rfc0401-2.rs rename to src/test/ui/cast/cast-rfc0401-2.rs diff --git a/src/test/ui/cast-rfc0401-2.stderr b/src/test/ui/cast/cast-rfc0401-2.stderr similarity index 100% rename from src/test/ui/cast-rfc0401-2.stderr rename to src/test/ui/cast/cast-rfc0401-2.stderr diff --git a/src/test/ui/compile-fail-migration/cast-to-bare-fn.rs b/src/test/ui/cast/cast-to-bare-fn.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cast-to-bare-fn.rs rename to src/test/ui/cast/cast-to-bare-fn.rs diff --git a/src/test/ui/compile-fail-migration/cast-to-bare-fn.stderr b/src/test/ui/cast/cast-to-bare-fn.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cast-to-bare-fn.stderr rename to src/test/ui/cast/cast-to-bare-fn.stderr diff --git a/src/test/ui/compile-fail-migration/cast-to-nil.rs b/src/test/ui/cast/cast-to-nil.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cast-to-nil.rs rename to src/test/ui/cast/cast-to-nil.rs diff --git a/src/test/ui/compile-fail-migration/cast-to-nil.stderr b/src/test/ui/cast/cast-to-nil.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cast-to-nil.stderr rename to src/test/ui/cast/cast-to-nil.stderr diff --git a/src/test/ui/cast-to-unsized-trait-object-suggestion.rs b/src/test/ui/cast/cast-to-unsized-trait-object-suggestion.rs similarity index 100% rename from src/test/ui/cast-to-unsized-trait-object-suggestion.rs rename to src/test/ui/cast/cast-to-unsized-trait-object-suggestion.rs diff --git a/src/test/ui/cast-to-unsized-trait-object-suggestion.stderr b/src/test/ui/cast/cast-to-unsized-trait-object-suggestion.stderr similarity index 100% rename from src/test/ui/cast-to-unsized-trait-object-suggestion.stderr rename to src/test/ui/cast/cast-to-unsized-trait-object-suggestion.stderr diff --git a/src/test/ui/compile-fail-migration/catch-bad-lifetime.nll.stderr b/src/test/ui/catch/catch-bad-lifetime.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/catch-bad-lifetime.nll.stderr rename to src/test/ui/catch/catch-bad-lifetime.nll.stderr diff --git a/src/test/ui/compile-fail-migration/catch-bad-lifetime.rs b/src/test/ui/catch/catch-bad-lifetime.rs similarity index 100% rename from src/test/ui/compile-fail-migration/catch-bad-lifetime.rs rename to src/test/ui/catch/catch-bad-lifetime.rs diff --git a/src/test/ui/compile-fail-migration/catch-bad-lifetime.stderr b/src/test/ui/catch/catch-bad-lifetime.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/catch-bad-lifetime.stderr rename to src/test/ui/catch/catch-bad-lifetime.stderr diff --git a/src/test/ui/compile-fail-migration/catch-bad-type.rs b/src/test/ui/catch/catch-bad-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/catch-bad-type.rs rename to src/test/ui/catch/catch-bad-type.rs diff --git a/src/test/ui/compile-fail-migration/catch-bad-type.stderr b/src/test/ui/catch/catch-bad-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/catch-bad-type.stderr rename to src/test/ui/catch/catch-bad-type.stderr diff --git a/src/test/ui/catch-block-type-error.rs b/src/test/ui/catch/catch-block-type-error.rs similarity index 100% rename from src/test/ui/catch-block-type-error.rs rename to src/test/ui/catch/catch-block-type-error.rs diff --git a/src/test/ui/catch-block-type-error.stderr b/src/test/ui/catch/catch-block-type-error.stderr similarity index 100% rename from src/test/ui/catch-block-type-error.stderr rename to src/test/ui/catch/catch-block-type-error.stderr diff --git a/src/test/ui/compile-fail-migration/catch-in-match.rs b/src/test/ui/catch/catch-in-match.rs similarity index 100% rename from src/test/ui/compile-fail-migration/catch-in-match.rs rename to src/test/ui/catch/catch-in-match.rs diff --git a/src/test/ui/compile-fail-migration/catch-in-match.stderr b/src/test/ui/catch/catch-in-match.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/catch-in-match.stderr rename to src/test/ui/catch/catch-in-match.stderr diff --git a/src/test/ui/compile-fail-migration/catch-in-while.rs b/src/test/ui/catch/catch-in-while.rs similarity index 100% rename from src/test/ui/compile-fail-migration/catch-in-while.rs rename to src/test/ui/catch/catch-in-while.rs diff --git a/src/test/ui/compile-fail-migration/catch-in-while.stderr b/src/test/ui/catch/catch-in-while.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/catch-in-while.stderr rename to src/test/ui/catch/catch-in-while.stderr diff --git a/src/test/ui/compile-fail-migration/catch-maybe-bad-lifetime.nll.stderr b/src/test/ui/catch/catch-maybe-bad-lifetime.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/catch-maybe-bad-lifetime.nll.stderr rename to src/test/ui/catch/catch-maybe-bad-lifetime.nll.stderr diff --git a/src/test/ui/compile-fail-migration/catch-maybe-bad-lifetime.rs b/src/test/ui/catch/catch-maybe-bad-lifetime.rs similarity index 100% rename from src/test/ui/compile-fail-migration/catch-maybe-bad-lifetime.rs rename to src/test/ui/catch/catch-maybe-bad-lifetime.rs diff --git a/src/test/ui/compile-fail-migration/catch-maybe-bad-lifetime.stderr b/src/test/ui/catch/catch-maybe-bad-lifetime.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/catch-maybe-bad-lifetime.stderr rename to src/test/ui/catch/catch-maybe-bad-lifetime.stderr diff --git a/src/test/ui/compile-fail-migration/catch-opt-init.nll.stderr b/src/test/ui/catch/catch-opt-init.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/catch-opt-init.nll.stderr rename to src/test/ui/catch/catch-opt-init.nll.stderr diff --git a/src/test/ui/compile-fail-migration/catch-opt-init.rs b/src/test/ui/catch/catch-opt-init.rs similarity index 100% rename from src/test/ui/compile-fail-migration/catch-opt-init.rs rename to src/test/ui/catch/catch-opt-init.rs diff --git a/src/test/ui/compile-fail-migration/catch-opt-init.stderr b/src/test/ui/catch/catch-opt-init.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/catch-opt-init.stderr rename to src/test/ui/catch/catch-opt-init.stderr diff --git a/src/test/ui/compile-fail-migration/cdylib-deps-must-be-static.rs b/src/test/ui/cdylib-deps-must-be-static.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cdylib-deps-must-be-static.rs rename to src/test/ui/cdylib-deps-must-be-static.rs diff --git a/src/test/ui/compile-fail-migration/cdylib-deps-must-be-static.stderr b/src/test/ui/cdylib-deps-must-be-static.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cdylib-deps-must-be-static.stderr rename to src/test/ui/cdylib-deps-must-be-static.stderr diff --git a/src/test/ui/compile-fail-migration/cfg-arg-invalid.rs b/src/test/ui/cfg-arg-invalid.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cfg-arg-invalid.rs rename to src/test/ui/cfg-arg-invalid.rs diff --git a/src/test/ui/compile-fail-migration/cfg-attr-cfg-2.rs b/src/test/ui/cfg-attr-cfg-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cfg-attr-cfg-2.rs rename to src/test/ui/cfg-attr-cfg-2.rs diff --git a/src/test/ui/compile-fail-migration/cfg-attr-cfg-2.stderr b/src/test/ui/cfg-attr-cfg-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cfg-attr-cfg-2.stderr rename to src/test/ui/cfg-attr-cfg-2.stderr diff --git a/src/test/ui/compile-fail-migration/cfg-attr-crate-2.rs b/src/test/ui/cfg-attr-crate-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cfg-attr-crate-2.rs rename to src/test/ui/cfg-attr-crate-2.rs diff --git a/src/test/ui/compile-fail-migration/cfg-attr-crate-2.stderr b/src/test/ui/cfg-attr-crate-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cfg-attr-crate-2.stderr rename to src/test/ui/cfg-attr-crate-2.stderr diff --git a/src/test/ui/compile-fail-migration/cfg-attr-invalid-predicate.rs b/src/test/ui/cfg-attr-invalid-predicate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cfg-attr-invalid-predicate.rs rename to src/test/ui/cfg-attr-invalid-predicate.rs diff --git a/src/test/ui/compile-fail-migration/cfg-attr-invalid-predicate.stderr b/src/test/ui/cfg-attr-invalid-predicate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cfg-attr-invalid-predicate.stderr rename to src/test/ui/cfg-attr-invalid-predicate.stderr diff --git a/src/test/ui/compile-fail-migration/cfg-attr-unknown-attribute-macro-expansion.rs b/src/test/ui/cfg-attr-unknown-attribute-macro-expansion.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cfg-attr-unknown-attribute-macro-expansion.rs rename to src/test/ui/cfg-attr-unknown-attribute-macro-expansion.rs diff --git a/src/test/ui/compile-fail-migration/cfg-attr-unknown-attribute-macro-expansion.stderr b/src/test/ui/cfg-attr-unknown-attribute-macro-expansion.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cfg-attr-unknown-attribute-macro-expansion.stderr rename to src/test/ui/cfg-attr-unknown-attribute-macro-expansion.stderr diff --git a/src/test/ui/compile-fail-migration/cfg-empty-codemap.rs b/src/test/ui/cfg-empty-codemap.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cfg-empty-codemap.rs rename to src/test/ui/cfg-empty-codemap.rs diff --git a/src/test/ui/compile-fail-migration/cfg-in-crate-1.rs b/src/test/ui/cfg-in-crate-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cfg-in-crate-1.rs rename to src/test/ui/cfg-in-crate-1.rs diff --git a/src/test/ui/compile-fail-migration/cfg-in-crate-1.stderr b/src/test/ui/cfg-in-crate-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cfg-in-crate-1.stderr rename to src/test/ui/cfg-in-crate-1.stderr diff --git a/src/test/ui/compile-fail-migration/cfg-non-opt-expr.rs b/src/test/ui/cfg-non-opt-expr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cfg-non-opt-expr.rs rename to src/test/ui/cfg-non-opt-expr.rs diff --git a/src/test/ui/compile-fail-migration/cfg-non-opt-expr.stderr b/src/test/ui/cfg-non-opt-expr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cfg-non-opt-expr.stderr rename to src/test/ui/cfg-non-opt-expr.stderr diff --git a/src/test/ui/compile-fail-migration/cfg_attr_path.rs b/src/test/ui/cfg_attr_path.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cfg_attr_path.rs rename to src/test/ui/cfg_attr_path.rs diff --git a/src/test/ui/compile-fail-migration/cfg_attr_path.stderr b/src/test/ui/cfg_attr_path.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cfg_attr_path.stderr rename to src/test/ui/cfg_attr_path.stderr diff --git a/src/test/ui/compile-fail-migration/check-static-immutable-mut-slices.rs b/src/test/ui/check-static-immutable-mut-slices.rs similarity index 100% rename from src/test/ui/compile-fail-migration/check-static-immutable-mut-slices.rs rename to src/test/ui/check-static-immutable-mut-slices.rs diff --git a/src/test/ui/compile-fail-migration/check-static-immutable-mut-slices.stderr b/src/test/ui/check-static-immutable-mut-slices.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/check-static-immutable-mut-slices.stderr rename to src/test/ui/check-static-immutable-mut-slices.stderr diff --git a/src/test/ui/compile-fail-migration/check-static-values-constraints.nll.stderr b/src/test/ui/check-static-values-constraints.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/check-static-values-constraints.nll.stderr rename to src/test/ui/check-static-values-constraints.nll.stderr diff --git a/src/test/ui/compile-fail-migration/check-static-values-constraints.rs b/src/test/ui/check-static-values-constraints.rs similarity index 100% rename from src/test/ui/compile-fail-migration/check-static-values-constraints.rs rename to src/test/ui/check-static-values-constraints.rs diff --git a/src/test/ui/compile-fail-migration/check-static-values-constraints.stderr b/src/test/ui/check-static-values-constraints.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/check-static-values-constraints.stderr rename to src/test/ui/check-static-values-constraints.stderr diff --git a/src/test/ui/compile-fail-migration/class-cast-to-trait.rs b/src/test/ui/class-cast-to-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/class-cast-to-trait.rs rename to src/test/ui/class-cast-to-trait.rs diff --git a/src/test/ui/compile-fail-migration/class-cast-to-trait.stderr b/src/test/ui/class-cast-to-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/class-cast-to-trait.stderr rename to src/test/ui/class-cast-to-trait.stderr diff --git a/src/test/ui/compile-fail-migration/class-method-missing.rs b/src/test/ui/class-method-missing.rs similarity index 100% rename from src/test/ui/compile-fail-migration/class-method-missing.rs rename to src/test/ui/class-method-missing.rs diff --git a/src/test/ui/compile-fail-migration/class-method-missing.stderr b/src/test/ui/class-method-missing.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/class-method-missing.stderr rename to src/test/ui/class-method-missing.stderr diff --git a/src/test/ui/compile-fail-migration/class-missing-self.rs b/src/test/ui/class-missing-self.rs similarity index 100% rename from src/test/ui/compile-fail-migration/class-missing-self.rs rename to src/test/ui/class-missing-self.rs diff --git a/src/test/ui/compile-fail-migration/class-missing-self.stderr b/src/test/ui/class-missing-self.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/class-missing-self.stderr rename to src/test/ui/class-missing-self.stderr diff --git a/src/test/ui/compile-fail-migration/cleanup-rvalue-scopes-cf.rs b/src/test/ui/cleanup-rvalue-scopes-cf.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cleanup-rvalue-scopes-cf.rs rename to src/test/ui/cleanup-rvalue-scopes-cf.rs diff --git a/src/test/ui/compile-fail-migration/cleanup-rvalue-scopes-cf.stderr b/src/test/ui/cleanup-rvalue-scopes-cf.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cleanup-rvalue-scopes-cf.stderr rename to src/test/ui/cleanup-rvalue-scopes-cf.stderr diff --git a/src/test/ui/compile-fail-migration/closure-expected-type/README.md b/src/test/ui/closure-expected-type/README.md similarity index 100% rename from src/test/ui/compile-fail-migration/closure-expected-type/README.md rename to src/test/ui/closure-expected-type/README.md diff --git a/src/test/ui/compile-fail-migration/closure-expected-type/expect-fn-supply-fn-multiple.rs b/src/test/ui/closure-expected-type/expect-fn-supply-fn-multiple.rs similarity index 100% rename from src/test/ui/compile-fail-migration/closure-expected-type/expect-fn-supply-fn-multiple.rs rename to src/test/ui/closure-expected-type/expect-fn-supply-fn-multiple.rs diff --git a/src/test/ui/compile-fail-migration/closure-expected-type/expect-fn-supply-fn.nll.stderr b/src/test/ui/closure-expected-type/expect-fn-supply-fn.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/closure-expected-type/expect-fn-supply-fn.nll.stderr rename to src/test/ui/closure-expected-type/expect-fn-supply-fn.nll.stderr diff --git a/src/test/ui/compile-fail-migration/closure-expected-type/expect-fn-supply-fn.rs b/src/test/ui/closure-expected-type/expect-fn-supply-fn.rs similarity index 100% rename from src/test/ui/compile-fail-migration/closure-expected-type/expect-fn-supply-fn.rs rename to src/test/ui/closure-expected-type/expect-fn-supply-fn.rs diff --git a/src/test/ui/compile-fail-migration/closure-expected-type/expect-fn-supply-fn.stderr b/src/test/ui/closure-expected-type/expect-fn-supply-fn.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/closure-expected-type/expect-fn-supply-fn.stderr rename to src/test/ui/closure-expected-type/expect-fn-supply-fn.stderr diff --git a/src/test/ui/compile-fail-migration/closure-expected-type/expect-infer-var-appearing-twice.rs b/src/test/ui/closure-expected-type/expect-infer-var-appearing-twice.rs similarity index 100% rename from src/test/ui/compile-fail-migration/closure-expected-type/expect-infer-var-appearing-twice.rs rename to src/test/ui/closure-expected-type/expect-infer-var-appearing-twice.rs diff --git a/src/test/ui/compile-fail-migration/closure-expected-type/expect-infer-var-appearing-twice.stderr b/src/test/ui/closure-expected-type/expect-infer-var-appearing-twice.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/closure-expected-type/expect-infer-var-appearing-twice.stderr rename to src/test/ui/closure-expected-type/expect-infer-var-appearing-twice.stderr diff --git a/src/test/ui/compile-fail-migration/closure-expected-type/expect-infer-var-supply-ty-with-bound-region.rs b/src/test/ui/closure-expected-type/expect-infer-var-supply-ty-with-bound-region.rs similarity index 100% rename from src/test/ui/compile-fail-migration/closure-expected-type/expect-infer-var-supply-ty-with-bound-region.rs rename to src/test/ui/closure-expected-type/expect-infer-var-supply-ty-with-bound-region.rs diff --git a/src/test/ui/compile-fail-migration/closure-expected-type/expect-infer-var-supply-ty-with-free-region.rs b/src/test/ui/closure-expected-type/expect-infer-var-supply-ty-with-free-region.rs similarity index 100% rename from src/test/ui/compile-fail-migration/closure-expected-type/expect-infer-var-supply-ty-with-free-region.rs rename to src/test/ui/closure-expected-type/expect-infer-var-supply-ty-with-free-region.rs diff --git a/src/test/ui/compile-fail-migration/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.rs b/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.rs similarity index 100% rename from src/test/ui/compile-fail-migration/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.rs rename to src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.rs diff --git a/src/test/ui/compile-fail-migration/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.stderr b/src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.stderr rename to src/test/ui/closure-expected-type/expect-two-infer-vars-supply-ty-with-bound-region.stderr diff --git a/src/test/ui/compile-fail-migration/closure_promotion.rs b/src/test/ui/closure_promotion.rs similarity index 100% rename from src/test/ui/compile-fail-migration/closure_promotion.rs rename to src/test/ui/closure_promotion.rs diff --git a/src/test/ui/compile-fail-migration/closure_promotion.stderr b/src/test/ui/closure_promotion.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/closure_promotion.stderr rename to src/test/ui/closure_promotion.stderr diff --git a/src/test/ui/closure-array-break-length.rs b/src/test/ui/closures/closure-array-break-length.rs similarity index 100% rename from src/test/ui/closure-array-break-length.rs rename to src/test/ui/closures/closure-array-break-length.rs diff --git a/src/test/ui/closure-array-break-length.stderr b/src/test/ui/closures/closure-array-break-length.stderr similarity index 100% rename from src/test/ui/closure-array-break-length.stderr rename to src/test/ui/closures/closure-array-break-length.stderr diff --git a/src/test/ui/compile-fail-migration/closure-bounds-cant-promote-superkind-in-struct.rs b/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/closure-bounds-cant-promote-superkind-in-struct.rs rename to src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.rs diff --git a/src/test/ui/compile-fail-migration/closure-bounds-cant-promote-superkind-in-struct.stderr b/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/closure-bounds-cant-promote-superkind-in-struct.stderr rename to src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.stderr diff --git a/src/test/ui/compile-fail-migration/closure-bounds-static-cant-capture-borrowed.nll.stderr b/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/closure-bounds-static-cant-capture-borrowed.nll.stderr rename to src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.nll.stderr diff --git a/src/test/ui/compile-fail-migration/closure-bounds-static-cant-capture-borrowed.rs b/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.rs similarity index 100% rename from src/test/ui/compile-fail-migration/closure-bounds-static-cant-capture-borrowed.rs rename to src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.rs diff --git a/src/test/ui/compile-fail-migration/closure-bounds-static-cant-capture-borrowed.stderr b/src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/closure-bounds-static-cant-capture-borrowed.stderr rename to src/test/ui/closures/closure-bounds-static-cant-capture-borrowed.stderr diff --git a/src/test/ui/compile-fail-migration/closure-bounds-subtype.rs b/src/test/ui/closures/closure-bounds-subtype.rs similarity index 100% rename from src/test/ui/compile-fail-migration/closure-bounds-subtype.rs rename to src/test/ui/closures/closure-bounds-subtype.rs diff --git a/src/test/ui/compile-fail-migration/closure-bounds-subtype.stderr b/src/test/ui/closures/closure-bounds-subtype.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/closure-bounds-subtype.stderr rename to src/test/ui/closures/closure-bounds-subtype.stderr diff --git a/src/test/ui/closure-expected-type/expect-region-supply-region.nll.stderr b/src/test/ui/closures/closure-expected-type/expect-region-supply-region.nll.stderr similarity index 100% rename from src/test/ui/closure-expected-type/expect-region-supply-region.nll.stderr rename to src/test/ui/closures/closure-expected-type/expect-region-supply-region.nll.stderr diff --git a/src/test/ui/closure-expected-type/expect-region-supply-region.rs b/src/test/ui/closures/closure-expected-type/expect-region-supply-region.rs similarity index 100% rename from src/test/ui/closure-expected-type/expect-region-supply-region.rs rename to src/test/ui/closures/closure-expected-type/expect-region-supply-region.rs diff --git a/src/test/ui/closure-expected-type/expect-region-supply-region.stderr b/src/test/ui/closures/closure-expected-type/expect-region-supply-region.stderr similarity index 100% rename from src/test/ui/closure-expected-type/expect-region-supply-region.stderr rename to src/test/ui/closures/closure-expected-type/expect-region-supply-region.stderr diff --git a/src/test/ui/closure-immutable-outer-variable.fixed b/src/test/ui/closures/closure-immutable-outer-variable.fixed similarity index 100% rename from src/test/ui/closure-immutable-outer-variable.fixed rename to src/test/ui/closures/closure-immutable-outer-variable.fixed diff --git a/src/test/ui/closure-immutable-outer-variable.nll.stderr b/src/test/ui/closures/closure-immutable-outer-variable.nll.stderr similarity index 100% rename from src/test/ui/closure-immutable-outer-variable.nll.stderr rename to src/test/ui/closures/closure-immutable-outer-variable.nll.stderr diff --git a/src/test/ui/closure-immutable-outer-variable.rs b/src/test/ui/closures/closure-immutable-outer-variable.rs similarity index 100% rename from src/test/ui/closure-immutable-outer-variable.rs rename to src/test/ui/closures/closure-immutable-outer-variable.rs diff --git a/src/test/ui/closure-immutable-outer-variable.rs.fixed b/src/test/ui/closures/closure-immutable-outer-variable.rs.fixed similarity index 100% rename from src/test/ui/closure-immutable-outer-variable.rs.fixed rename to src/test/ui/closures/closure-immutable-outer-variable.rs.fixed diff --git a/src/test/ui/closure-immutable-outer-variable.stderr b/src/test/ui/closures/closure-immutable-outer-variable.stderr similarity index 100% rename from src/test/ui/closure-immutable-outer-variable.stderr rename to src/test/ui/closures/closure-immutable-outer-variable.stderr diff --git a/src/test/ui/closure-move-sync.rs b/src/test/ui/closures/closure-move-sync.rs similarity index 100% rename from src/test/ui/closure-move-sync.rs rename to src/test/ui/closures/closure-move-sync.rs diff --git a/src/test/ui/closure-move-sync.stderr b/src/test/ui/closures/closure-move-sync.stderr similarity index 100% rename from src/test/ui/closure-move-sync.stderr rename to src/test/ui/closures/closure-move-sync.stderr diff --git a/src/test/ui/compile-fail-migration/closure-no-fn-1.rs b/src/test/ui/closures/closure-no-fn-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/closure-no-fn-1.rs rename to src/test/ui/closures/closure-no-fn-1.rs diff --git a/src/test/ui/compile-fail-migration/closure-no-fn-1.stderr b/src/test/ui/closures/closure-no-fn-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/closure-no-fn-1.stderr rename to src/test/ui/closures/closure-no-fn-1.stderr diff --git a/src/test/ui/compile-fail-migration/closure-no-fn-2.rs b/src/test/ui/closures/closure-no-fn-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/closure-no-fn-2.rs rename to src/test/ui/closures/closure-no-fn-2.rs diff --git a/src/test/ui/compile-fail-migration/closure-no-fn-2.stderr b/src/test/ui/closures/closure-no-fn-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/closure-no-fn-2.stderr rename to src/test/ui/closures/closure-no-fn-2.stderr diff --git a/src/test/ui/compile-fail-migration/closure-no-fn-3.rs b/src/test/ui/closures/closure-no-fn-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/closure-no-fn-3.rs rename to src/test/ui/closures/closure-no-fn-3.rs diff --git a/src/test/ui/compile-fail-migration/closure-no-fn-3.stderr b/src/test/ui/closures/closure-no-fn-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/closure-no-fn-3.stderr rename to src/test/ui/closures/closure-no-fn-3.stderr diff --git a/src/test/ui/compile-fail-migration/closure-referencing-itself-issue-25954.rs b/src/test/ui/closures/closure-referencing-itself-issue-25954.rs similarity index 100% rename from src/test/ui/compile-fail-migration/closure-referencing-itself-issue-25954.rs rename to src/test/ui/closures/closure-referencing-itself-issue-25954.rs diff --git a/src/test/ui/compile-fail-migration/closure-referencing-itself-issue-25954.stderr b/src/test/ui/closures/closure-referencing-itself-issue-25954.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/closure-referencing-itself-issue-25954.stderr rename to src/test/ui/closures/closure-referencing-itself-issue-25954.stderr diff --git a/src/test/ui/compile-fail-migration/closure-reform-bad.rs b/src/test/ui/closures/closure-reform-bad.rs similarity index 100% rename from src/test/ui/compile-fail-migration/closure-reform-bad.rs rename to src/test/ui/closures/closure-reform-bad.rs diff --git a/src/test/ui/compile-fail-migration/closure-reform-bad.stderr b/src/test/ui/closures/closure-reform-bad.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/closure-reform-bad.stderr rename to src/test/ui/closures/closure-reform-bad.stderr diff --git a/src/test/ui/compile-fail-migration/closure-wrong-kind.rs b/src/test/ui/closures/closure-wrong-kind.rs similarity index 100% rename from src/test/ui/compile-fail-migration/closure-wrong-kind.rs rename to src/test/ui/closures/closure-wrong-kind.rs diff --git a/src/test/ui/compile-fail-migration/closure-wrong-kind.stderr b/src/test/ui/closures/closure-wrong-kind.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/closure-wrong-kind.stderr rename to src/test/ui/closures/closure-wrong-kind.stderr diff --git a/src/test/ui/compile-fail-migration/coerce-expect-unsized-ascribed.rs b/src/test/ui/coercion/coerce-expect-unsized-ascribed.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coerce-expect-unsized-ascribed.rs rename to src/test/ui/coercion/coerce-expect-unsized-ascribed.rs diff --git a/src/test/ui/compile-fail-migration/coerce-expect-unsized-ascribed.stderr b/src/test/ui/coercion/coerce-expect-unsized-ascribed.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coerce-expect-unsized-ascribed.stderr rename to src/test/ui/coercion/coerce-expect-unsized-ascribed.stderr diff --git a/src/test/ui/compile-fail-migration/coerce-mut.rs b/src/test/ui/coercion/coerce-mut.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coerce-mut.rs rename to src/test/ui/coercion/coerce-mut.rs diff --git a/src/test/ui/compile-fail-migration/coerce-mut.stderr b/src/test/ui/coercion/coerce-mut.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coerce-mut.stderr rename to src/test/ui/coercion/coerce-mut.stderr diff --git a/src/test/ui/compile-fail-migration/coerce-overloaded-autoderef.ast.nll.stderr b/src/test/ui/coercion/coerce-overloaded-autoderef.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coerce-overloaded-autoderef.ast.nll.stderr rename to src/test/ui/coercion/coerce-overloaded-autoderef.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/coerce-overloaded-autoderef.ast.stderr b/src/test/ui/coercion/coerce-overloaded-autoderef.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coerce-overloaded-autoderef.ast.stderr rename to src/test/ui/coercion/coerce-overloaded-autoderef.ast.stderr diff --git a/src/test/ui/compile-fail-migration/coerce-overloaded-autoderef.mir.nll.stderr b/src/test/ui/coercion/coerce-overloaded-autoderef.mir.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coerce-overloaded-autoderef.mir.nll.stderr rename to src/test/ui/coercion/coerce-overloaded-autoderef.mir.nll.stderr diff --git a/src/test/ui/compile-fail-migration/coerce-overloaded-autoderef.mir.stderr b/src/test/ui/coercion/coerce-overloaded-autoderef.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coerce-overloaded-autoderef.mir.stderr rename to src/test/ui/coercion/coerce-overloaded-autoderef.mir.stderr diff --git a/src/test/ui/compile-fail-migration/coerce-overloaded-autoderef.rs b/src/test/ui/coercion/coerce-overloaded-autoderef.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coerce-overloaded-autoderef.rs rename to src/test/ui/coercion/coerce-overloaded-autoderef.rs diff --git a/src/test/ui/compile-fail-migration/coerce-to-bang-cast.rs b/src/test/ui/coercion/coerce-to-bang-cast.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coerce-to-bang-cast.rs rename to src/test/ui/coercion/coerce-to-bang-cast.rs diff --git a/src/test/ui/compile-fail-migration/coerce-to-bang-cast.stderr b/src/test/ui/coercion/coerce-to-bang-cast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coerce-to-bang-cast.stderr rename to src/test/ui/coercion/coerce-to-bang-cast.stderr diff --git a/src/test/ui/compile-fail-migration/coerce-to-bang.rs b/src/test/ui/coercion/coerce-to-bang.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coerce-to-bang.rs rename to src/test/ui/coercion/coerce-to-bang.rs diff --git a/src/test/ui/compile-fail-migration/coerce-to-bang.stderr b/src/test/ui/coercion/coerce-to-bang.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coerce-to-bang.stderr rename to src/test/ui/coercion/coerce-to-bang.stderr diff --git a/src/test/ui/compile-fail-migration/coerce-unsafe-to-closure.rs b/src/test/ui/coercion/coerce-unsafe-to-closure.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coerce-unsafe-to-closure.rs rename to src/test/ui/coercion/coerce-unsafe-to-closure.rs diff --git a/src/test/ui/compile-fail-migration/coerce-unsafe-to-closure.stderr b/src/test/ui/coercion/coerce-unsafe-to-closure.stderr similarity index 73% rename from src/test/ui/compile-fail-migration/coerce-unsafe-to-closure.stderr rename to src/test/ui/coercion/coerce-unsafe-to-closure.stderr index ca402b25585..bf355b4e9d9 100644 --- a/src/test/ui/compile-fail-migration/coerce-unsafe-to-closure.stderr +++ b/src/test/ui/coercion/coerce-unsafe-to-closure.stderr @@ -1,8 +1,8 @@ -error[E0277]: the trait bound `unsafe extern "rust-intrinsic" fn(_) -> _ {std::intrinsics::transmute::<_, _>}: std::ops::FnOnce<(&str,)>` is not satisfied +error[E0277]: the trait bound `unsafe extern "rust-intrinsic" fn(_) -> _ {std::mem::transmute::<_, _>}: std::ops::FnOnce<(&str,)>` is not satisfied --> $DIR/coerce-unsafe-to-closure.rs:12:40 | LL | let x: Option<&[u8]> = Some("foo").map(std::mem::transmute); - | ^^^ the trait `std::ops::FnOnce<(&str,)>` is not implemented for `unsafe extern "rust-intrinsic" fn(_) -> _ {std::intrinsics::transmute::<_, _>}` + | ^^^ the trait `std::ops::FnOnce<(&str,)>` is not implemented for `unsafe extern "rust-intrinsic" fn(_) -> _ {std::mem::transmute::<_, _>}` error: aborting due to previous error diff --git a/src/test/ui/coercion-missing-tail-expected-type.rs b/src/test/ui/coercion/coercion-missing-tail-expected-type.rs similarity index 100% rename from src/test/ui/coercion-missing-tail-expected-type.rs rename to src/test/ui/coercion/coercion-missing-tail-expected-type.rs diff --git a/src/test/ui/coercion-missing-tail-expected-type.stderr b/src/test/ui/coercion/coercion-missing-tail-expected-type.stderr similarity index 100% rename from src/test/ui/coercion-missing-tail-expected-type.stderr rename to src/test/ui/coercion/coercion-missing-tail-expected-type.stderr diff --git a/src/test/ui/compile-fail-migration/coercion-slice.rs b/src/test/ui/coercion/coercion-slice.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coercion-slice.rs rename to src/test/ui/coercion/coercion-slice.rs diff --git a/src/test/ui/compile-fail-migration/coercion-slice.stderr b/src/test/ui/coercion/coercion-slice.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coercion-slice.stderr rename to src/test/ui/coercion/coercion-slice.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/coherence_copy_like_lib.rs b/src/test/ui/coherence/auxiliary/coherence_copy_like_lib.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/coherence_copy_like_lib.rs rename to src/test/ui/coherence/auxiliary/coherence_copy_like_lib.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/coherence_inherent_cc_lib.rs b/src/test/ui/coherence/auxiliary/coherence_inherent_cc_lib.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/coherence_inherent_cc_lib.rs rename to src/test/ui/coherence/auxiliary/coherence_inherent_cc_lib.rs diff --git a/src/test/ui/auxiliary/coherence_lib.rs b/src/test/ui/coherence/auxiliary/coherence_lib.rs similarity index 100% rename from src/test/ui/auxiliary/coherence_lib.rs rename to src/test/ui/coherence/auxiliary/coherence_lib.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/coherence_orphan_lib.rs b/src/test/ui/coherence/auxiliary/coherence_orphan_lib.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/coherence_orphan_lib.rs rename to src/test/ui/coherence/auxiliary/coherence_orphan_lib.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/go_trait.rs b/src/test/ui/coherence/auxiliary/go_trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/go_trait.rs rename to src/test/ui/coherence/auxiliary/go_trait.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/trait_impl_conflict.rs b/src/test/ui/coherence/auxiliary/trait_impl_conflict.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/trait_impl_conflict.rs rename to src/test/ui/coherence/auxiliary/trait_impl_conflict.rs diff --git a/src/test/ui/compile-fail-migration/coherence-all-remote.rs b/src/test/ui/coherence/coherence-all-remote.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-all-remote.rs rename to src/test/ui/coherence/coherence-all-remote.rs diff --git a/src/test/ui/compile-fail-migration/coherence-all-remote.stderr b/src/test/ui/coherence/coherence-all-remote.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-all-remote.stderr rename to src/test/ui/coherence/coherence-all-remote.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-bigint-param.rs b/src/test/ui/coherence/coherence-bigint-param.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-bigint-param.rs rename to src/test/ui/coherence/coherence-bigint-param.rs diff --git a/src/test/ui/compile-fail-migration/coherence-bigint-param.stderr b/src/test/ui/coherence/coherence-bigint-param.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-bigint-param.stderr rename to src/test/ui/coherence/coherence-bigint-param.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-blanket-implemented.rs b/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-blanket-implemented.rs rename to src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.rs diff --git a/src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-blanket-implemented.stderr b/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-blanket-implemented.stderr rename to src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-blanket-unimplemented.rs b/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-blanket-unimplemented.rs rename to src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.rs diff --git a/src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-blanket-unimplemented.stderr b/src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-blanket-unimplemented.stderr rename to src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific-cross-crate.rs b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific-cross-crate.rs rename to src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.rs diff --git a/src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific-cross-crate.stderr b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific-cross-crate.stderr rename to src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific-multidispatch.rs b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific-multidispatch.rs rename to src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs diff --git a/src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific-multidispatch.stderr b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific-multidispatch.stderr rename to src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific-trait.rs b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific-trait.rs rename to src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.rs diff --git a/src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific-trait.stderr b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific-trait.stderr rename to src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific.rs b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific.rs rename to src/test/ui/coherence/coherence-blanket-conflicts-with-specific.rs diff --git a/src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific.stderr b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific.stderr rename to src/test/ui/coherence/coherence-blanket-conflicts-with-specific.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-conflicting-negative-trait-impl.rs b/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-conflicting-negative-trait-impl.rs rename to src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs diff --git a/src/test/ui/compile-fail-migration/coherence-conflicting-negative-trait-impl.stderr b/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-conflicting-negative-trait-impl.stderr rename to src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-cow.a.stderr b/src/test/ui/coherence/coherence-cow.a.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-cow.a.stderr rename to src/test/ui/coherence/coherence-cow.a.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-cow.b.stderr b/src/test/ui/coherence/coherence-cow.b.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-cow.b.stderr rename to src/test/ui/coherence/coherence-cow.b.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-cow.c.stderr b/src/test/ui/coherence/coherence-cow.c.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-cow.c.stderr rename to src/test/ui/coherence/coherence-cow.c.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-cow.rs b/src/test/ui/coherence/coherence-cow.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-cow.rs rename to src/test/ui/coherence/coherence-cow.rs diff --git a/src/test/ui/compile-fail-migration/coherence-cross-crate-conflict.rs b/src/test/ui/coherence/coherence-cross-crate-conflict.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-cross-crate-conflict.rs rename to src/test/ui/coherence/coherence-cross-crate-conflict.rs diff --git a/src/test/ui/compile-fail-migration/coherence-cross-crate-conflict.stderr b/src/test/ui/coherence/coherence-cross-crate-conflict.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-cross-crate-conflict.stderr rename to src/test/ui/coherence/coherence-cross-crate-conflict.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-default-trait-impl.rs b/src/test/ui/coherence/coherence-default-trait-impl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-default-trait-impl.rs rename to src/test/ui/coherence/coherence-default-trait-impl.rs diff --git a/src/test/ui/compile-fail-migration/coherence-default-trait-impl.stderr b/src/test/ui/coherence/coherence-default-trait-impl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-default-trait-impl.stderr rename to src/test/ui/coherence/coherence-default-trait-impl.stderr diff --git a/src/test/ui/coherence-error-suppression.rs b/src/test/ui/coherence/coherence-error-suppression.rs similarity index 100% rename from src/test/ui/coherence-error-suppression.rs rename to src/test/ui/coherence/coherence-error-suppression.rs diff --git a/src/test/ui/coherence-error-suppression.stderr b/src/test/ui/coherence/coherence-error-suppression.stderr similarity index 100% rename from src/test/ui/coherence-error-suppression.stderr rename to src/test/ui/coherence/coherence-error-suppression.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-impl-trait-for-trait-object-safe.rs b/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-impl-trait-for-trait-object-safe.rs rename to src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs diff --git a/src/test/ui/compile-fail-migration/coherence-impl-trait-for-trait-object-safe.stderr b/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-impl-trait-for-trait-object-safe.stderr rename to src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-impl-trait-for-trait.rs b/src/test/ui/coherence/coherence-impl-trait-for-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-impl-trait-for-trait.rs rename to src/test/ui/coherence/coherence-impl-trait-for-trait.rs diff --git a/src/test/ui/compile-fail-migration/coherence-impl-trait-for-trait.stderr b/src/test/ui/coherence/coherence-impl-trait-for-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-impl-trait-for-trait.stderr rename to src/test/ui/coherence/coherence-impl-trait-for-trait.stderr diff --git a/src/test/ui/coherence-impls-copy.rs b/src/test/ui/coherence/coherence-impls-copy.rs similarity index 100% rename from src/test/ui/coherence-impls-copy.rs rename to src/test/ui/coherence/coherence-impls-copy.rs diff --git a/src/test/ui/coherence-impls-copy.stderr b/src/test/ui/coherence/coherence-impls-copy.stderr similarity index 100% rename from src/test/ui/coherence-impls-copy.stderr rename to src/test/ui/coherence/coherence-impls-copy.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-impls-send.rs b/src/test/ui/coherence/coherence-impls-send.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-impls-send.rs rename to src/test/ui/coherence/coherence-impls-send.rs diff --git a/src/test/ui/compile-fail-migration/coherence-impls-send.stderr b/src/test/ui/coherence/coherence-impls-send.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-impls-send.stderr rename to src/test/ui/coherence/coherence-impls-send.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-impls-sized.rs b/src/test/ui/coherence/coherence-impls-sized.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-impls-sized.rs rename to src/test/ui/coherence/coherence-impls-sized.rs diff --git a/src/test/ui/compile-fail-migration/coherence-impls-sized.stderr b/src/test/ui/coherence/coherence-impls-sized.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-impls-sized.stderr rename to src/test/ui/coherence/coherence-impls-sized.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-inherited-assoc-ty-cycle-err.rs b/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-inherited-assoc-ty-cycle-err.rs rename to src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.rs diff --git a/src/test/ui/compile-fail-migration/coherence-inherited-assoc-ty-cycle-err.stderr b/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-inherited-assoc-ty-cycle-err.stderr rename to src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-lone-type-parameter.rs b/src/test/ui/coherence/coherence-lone-type-parameter.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-lone-type-parameter.rs rename to src/test/ui/coherence/coherence-lone-type-parameter.rs diff --git a/src/test/ui/compile-fail-migration/coherence-lone-type-parameter.stderr b/src/test/ui/coherence/coherence-lone-type-parameter.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-lone-type-parameter.stderr rename to src/test/ui/coherence/coherence-lone-type-parameter.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-negative-impls-safe.rs b/src/test/ui/coherence/coherence-negative-impls-safe.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-negative-impls-safe.rs rename to src/test/ui/coherence/coherence-negative-impls-safe.rs diff --git a/src/test/ui/compile-fail-migration/coherence-negative-impls-safe.stderr b/src/test/ui/coherence/coherence-negative-impls-safe.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-negative-impls-safe.stderr rename to src/test/ui/coherence/coherence-negative-impls-safe.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-no-direct-lifetime-dispatch.rs b/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-no-direct-lifetime-dispatch.rs rename to src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.rs diff --git a/src/test/ui/compile-fail-migration/coherence-no-direct-lifetime-dispatch.stderr b/src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-no-direct-lifetime-dispatch.stderr rename to src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-orphan.rs b/src/test/ui/coherence/coherence-orphan.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-orphan.rs rename to src/test/ui/coherence/coherence-orphan.rs diff --git a/src/test/ui/compile-fail-migration/coherence-orphan.stderr b/src/test/ui/coherence/coherence-orphan.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-orphan.stderr rename to src/test/ui/coherence/coherence-orphan.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-overlap-all-t-and-tuple.rs b/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-overlap-all-t-and-tuple.rs rename to src/test/ui/coherence/coherence-overlap-all-t-and-tuple.rs diff --git a/src/test/ui/compile-fail-migration/coherence-overlap-all-t-and-tuple.stderr b/src/test/ui/coherence/coherence-overlap-all-t-and-tuple.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-overlap-all-t-and-tuple.stderr rename to src/test/ui/coherence/coherence-overlap-all-t-and-tuple.stderr diff --git a/src/test/ui/coherence-overlap-downstream-inherent.rs b/src/test/ui/coherence/coherence-overlap-downstream-inherent.rs similarity index 100% rename from src/test/ui/coherence-overlap-downstream-inherent.rs rename to src/test/ui/coherence/coherence-overlap-downstream-inherent.rs diff --git a/src/test/ui/coherence-overlap-downstream-inherent.stderr b/src/test/ui/coherence/coherence-overlap-downstream-inherent.stderr similarity index 100% rename from src/test/ui/coherence-overlap-downstream-inherent.stderr rename to src/test/ui/coherence/coherence-overlap-downstream-inherent.stderr diff --git a/src/test/ui/coherence-overlap-downstream.rs b/src/test/ui/coherence/coherence-overlap-downstream.rs similarity index 100% rename from src/test/ui/coherence-overlap-downstream.rs rename to src/test/ui/coherence/coherence-overlap-downstream.rs diff --git a/src/test/ui/coherence-overlap-downstream.stderr b/src/test/ui/coherence/coherence-overlap-downstream.stderr similarity index 100% rename from src/test/ui/coherence-overlap-downstream.stderr rename to src/test/ui/coherence/coherence-overlap-downstream.stderr diff --git a/src/test/ui/coherence-overlap-issue-23516-inherent.rs b/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.rs similarity index 100% rename from src/test/ui/coherence-overlap-issue-23516-inherent.rs rename to src/test/ui/coherence/coherence-overlap-issue-23516-inherent.rs diff --git a/src/test/ui/coherence-overlap-issue-23516-inherent.stderr b/src/test/ui/coherence/coherence-overlap-issue-23516-inherent.stderr similarity index 100% rename from src/test/ui/coherence-overlap-issue-23516-inherent.stderr rename to src/test/ui/coherence/coherence-overlap-issue-23516-inherent.stderr diff --git a/src/test/ui/coherence-overlap-issue-23516.rs b/src/test/ui/coherence/coherence-overlap-issue-23516.rs similarity index 100% rename from src/test/ui/coherence-overlap-issue-23516.rs rename to src/test/ui/coherence/coherence-overlap-issue-23516.rs diff --git a/src/test/ui/coherence-overlap-issue-23516.stderr b/src/test/ui/coherence/coherence-overlap-issue-23516.stderr similarity index 100% rename from src/test/ui/coherence-overlap-issue-23516.stderr rename to src/test/ui/coherence/coherence-overlap-issue-23516.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-overlap-messages.rs b/src/test/ui/coherence/coherence-overlap-messages.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-overlap-messages.rs rename to src/test/ui/coherence/coherence-overlap-messages.rs diff --git a/src/test/ui/compile-fail-migration/coherence-overlap-messages.stderr b/src/test/ui/coherence/coherence-overlap-messages.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-overlap-messages.stderr rename to src/test/ui/coherence/coherence-overlap-messages.stderr diff --git a/src/test/ui/coherence-overlap-upstream-inherent.rs b/src/test/ui/coherence/coherence-overlap-upstream-inherent.rs similarity index 100% rename from src/test/ui/coherence-overlap-upstream-inherent.rs rename to src/test/ui/coherence/coherence-overlap-upstream-inherent.rs diff --git a/src/test/ui/coherence-overlap-upstream-inherent.stderr b/src/test/ui/coherence/coherence-overlap-upstream-inherent.stderr similarity index 100% rename from src/test/ui/coherence-overlap-upstream-inherent.stderr rename to src/test/ui/coherence/coherence-overlap-upstream-inherent.stderr diff --git a/src/test/ui/coherence-overlap-upstream.rs b/src/test/ui/coherence/coherence-overlap-upstream.rs similarity index 100% rename from src/test/ui/coherence-overlap-upstream.rs rename to src/test/ui/coherence/coherence-overlap-upstream.rs diff --git a/src/test/ui/coherence-overlap-upstream.stderr b/src/test/ui/coherence/coherence-overlap-upstream.stderr similarity index 100% rename from src/test/ui/coherence-overlap-upstream.stderr rename to src/test/ui/coherence/coherence-overlap-upstream.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-overlapping-pairs.rs b/src/test/ui/coherence/coherence-overlapping-pairs.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-overlapping-pairs.rs rename to src/test/ui/coherence/coherence-overlapping-pairs.rs diff --git a/src/test/ui/compile-fail-migration/coherence-overlapping-pairs.stderr b/src/test/ui/coherence/coherence-overlapping-pairs.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-overlapping-pairs.stderr rename to src/test/ui/coherence/coherence-overlapping-pairs.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-pair-covered-uncovered-1.rs b/src/test/ui/coherence/coherence-pair-covered-uncovered-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-pair-covered-uncovered-1.rs rename to src/test/ui/coherence/coherence-pair-covered-uncovered-1.rs diff --git a/src/test/ui/compile-fail-migration/coherence-pair-covered-uncovered-1.stderr b/src/test/ui/coherence/coherence-pair-covered-uncovered-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-pair-covered-uncovered-1.stderr rename to src/test/ui/coherence/coherence-pair-covered-uncovered-1.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-pair-covered-uncovered.rs b/src/test/ui/coherence/coherence-pair-covered-uncovered.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-pair-covered-uncovered.rs rename to src/test/ui/coherence/coherence-pair-covered-uncovered.rs diff --git a/src/test/ui/compile-fail-migration/coherence-pair-covered-uncovered.stderr b/src/test/ui/coherence/coherence-pair-covered-uncovered.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-pair-covered-uncovered.stderr rename to src/test/ui/coherence/coherence-pair-covered-uncovered.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-projection-conflict-orphan.rs b/src/test/ui/coherence/coherence-projection-conflict-orphan.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-projection-conflict-orphan.rs rename to src/test/ui/coherence/coherence-projection-conflict-orphan.rs diff --git a/src/test/ui/compile-fail-migration/coherence-projection-conflict-orphan.stderr b/src/test/ui/coherence/coherence-projection-conflict-orphan.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-projection-conflict-orphan.stderr rename to src/test/ui/coherence/coherence-projection-conflict-orphan.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-projection-conflict-ty-param.rs b/src/test/ui/coherence/coherence-projection-conflict-ty-param.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-projection-conflict-ty-param.rs rename to src/test/ui/coherence/coherence-projection-conflict-ty-param.rs diff --git a/src/test/ui/compile-fail-migration/coherence-projection-conflict-ty-param.stderr b/src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-projection-conflict-ty-param.stderr rename to src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-projection-conflict.rs b/src/test/ui/coherence/coherence-projection-conflict.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-projection-conflict.rs rename to src/test/ui/coherence/coherence-projection-conflict.rs diff --git a/src/test/ui/compile-fail-migration/coherence-projection-conflict.stderr b/src/test/ui/coherence/coherence-projection-conflict.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-projection-conflict.stderr rename to src/test/ui/coherence/coherence-projection-conflict.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-projection-ok-orphan.rs b/src/test/ui/coherence/coherence-projection-ok-orphan.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-projection-ok-orphan.rs rename to src/test/ui/coherence/coherence-projection-ok-orphan.rs diff --git a/src/test/ui/compile-fail-migration/coherence-projection-ok-orphan.stderr b/src/test/ui/coherence/coherence-projection-ok-orphan.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-projection-ok-orphan.stderr rename to src/test/ui/coherence/coherence-projection-ok-orphan.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-projection-ok.rs b/src/test/ui/coherence/coherence-projection-ok.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-projection-ok.rs rename to src/test/ui/coherence/coherence-projection-ok.rs diff --git a/src/test/ui/compile-fail-migration/coherence-projection-ok.stderr b/src/test/ui/coherence/coherence-projection-ok.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-projection-ok.stderr rename to src/test/ui/coherence/coherence-projection-ok.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-tuple-conflict.rs b/src/test/ui/coherence/coherence-tuple-conflict.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-tuple-conflict.rs rename to src/test/ui/coherence/coherence-tuple-conflict.rs diff --git a/src/test/ui/compile-fail-migration/coherence-tuple-conflict.stderr b/src/test/ui/coherence/coherence-tuple-conflict.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-tuple-conflict.stderr rename to src/test/ui/coherence/coherence-tuple-conflict.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-vec-local-2.rs b/src/test/ui/coherence/coherence-vec-local-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-vec-local-2.rs rename to src/test/ui/coherence/coherence-vec-local-2.rs diff --git a/src/test/ui/compile-fail-migration/coherence-vec-local-2.stderr b/src/test/ui/coherence/coherence-vec-local-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-vec-local-2.stderr rename to src/test/ui/coherence/coherence-vec-local-2.stderr diff --git a/src/test/ui/compile-fail-migration/coherence-vec-local.rs b/src/test/ui/coherence/coherence-vec-local.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-vec-local.rs rename to src/test/ui/coherence/coherence-vec-local.rs diff --git a/src/test/ui/compile-fail-migration/coherence-vec-local.stderr b/src/test/ui/coherence/coherence-vec-local.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence-vec-local.stderr rename to src/test/ui/coherence/coherence-vec-local.stderr diff --git a/src/test/ui/compile-fail-migration/coherence_copy_like_err_fundamental_struct.rs b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_copy_like_err_fundamental_struct.rs rename to src/test/ui/coherence/coherence_copy_like_err_fundamental_struct.rs diff --git a/src/test/ui/compile-fail-migration/coherence_copy_like_err_fundamental_struct.stderr b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_copy_like_err_fundamental_struct.stderr rename to src/test/ui/coherence/coherence_copy_like_err_fundamental_struct.stderr diff --git a/src/test/ui/compile-fail-migration/coherence_copy_like_err_fundamental_struct_ref.rs b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_copy_like_err_fundamental_struct_ref.rs rename to src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.rs diff --git a/src/test/ui/compile-fail-migration/coherence_copy_like_err_fundamental_struct_ref.stderr b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_copy_like_err_fundamental_struct_ref.stderr rename to src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_ref.stderr diff --git a/src/test/ui/compile-fail-migration/coherence_copy_like_err_fundamental_struct_tuple.rs b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_copy_like_err_fundamental_struct_tuple.rs rename to src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.rs diff --git a/src/test/ui/compile-fail-migration/coherence_copy_like_err_fundamental_struct_tuple.stderr b/src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_copy_like_err_fundamental_struct_tuple.stderr rename to src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.stderr diff --git a/src/test/ui/compile-fail-migration/coherence_copy_like_err_struct.rs b/src/test/ui/coherence/coherence_copy_like_err_struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_copy_like_err_struct.rs rename to src/test/ui/coherence/coherence_copy_like_err_struct.rs diff --git a/src/test/ui/compile-fail-migration/coherence_copy_like_err_struct.stderr b/src/test/ui/coherence/coherence_copy_like_err_struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_copy_like_err_struct.stderr rename to src/test/ui/coherence/coherence_copy_like_err_struct.stderr diff --git a/src/test/ui/compile-fail-migration/coherence_copy_like_err_tuple.rs b/src/test/ui/coherence/coherence_copy_like_err_tuple.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_copy_like_err_tuple.rs rename to src/test/ui/coherence/coherence_copy_like_err_tuple.rs diff --git a/src/test/ui/compile-fail-migration/coherence_copy_like_err_tuple.stderr b/src/test/ui/coherence/coherence_copy_like_err_tuple.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_copy_like_err_tuple.stderr rename to src/test/ui/coherence/coherence_copy_like_err_tuple.stderr diff --git a/src/test/ui/compile-fail-migration/coherence_inherent.rs b/src/test/ui/coherence/coherence_inherent.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_inherent.rs rename to src/test/ui/coherence/coherence_inherent.rs diff --git a/src/test/ui/compile-fail-migration/coherence_inherent.stderr b/src/test/ui/coherence/coherence_inherent.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_inherent.stderr rename to src/test/ui/coherence/coherence_inherent.stderr diff --git a/src/test/ui/compile-fail-migration/coherence_inherent_cc.rs b/src/test/ui/coherence/coherence_inherent_cc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_inherent_cc.rs rename to src/test/ui/coherence/coherence_inherent_cc.rs diff --git a/src/test/ui/compile-fail-migration/coherence_inherent_cc.stderr b/src/test/ui/coherence/coherence_inherent_cc.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_inherent_cc.stderr rename to src/test/ui/coherence/coherence_inherent_cc.stderr diff --git a/src/test/ui/compile-fail-migration/coherence_local.rs b/src/test/ui/coherence/coherence_local.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_local.rs rename to src/test/ui/coherence/coherence_local.rs diff --git a/src/test/ui/compile-fail-migration/coherence_local.stderr b/src/test/ui/coherence/coherence_local.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_local.stderr rename to src/test/ui/coherence/coherence_local.stderr diff --git a/src/test/ui/compile-fail-migration/coherence_local_err_struct.rs b/src/test/ui/coherence/coherence_local_err_struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_local_err_struct.rs rename to src/test/ui/coherence/coherence_local_err_struct.rs diff --git a/src/test/ui/compile-fail-migration/coherence_local_err_struct.stderr b/src/test/ui/coherence/coherence_local_err_struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_local_err_struct.stderr rename to src/test/ui/coherence/coherence_local_err_struct.stderr diff --git a/src/test/ui/compile-fail-migration/coherence_local_err_tuple.rs b/src/test/ui/coherence/coherence_local_err_tuple.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_local_err_tuple.rs rename to src/test/ui/coherence/coherence_local_err_tuple.rs diff --git a/src/test/ui/compile-fail-migration/coherence_local_err_tuple.stderr b/src/test/ui/coherence/coherence_local_err_tuple.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_local_err_tuple.stderr rename to src/test/ui/coherence/coherence_local_err_tuple.stderr diff --git a/src/test/ui/compile-fail-migration/coherence_local_ref.rs b/src/test/ui/coherence/coherence_local_ref.rs similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_local_ref.rs rename to src/test/ui/coherence/coherence_local_ref.rs diff --git a/src/test/ui/compile-fail-migration/coherence_local_ref.stderr b/src/test/ui/coherence/coherence_local_ref.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/coherence_local_ref.stderr rename to src/test/ui/coherence/coherence_local_ref.stderr diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.nll.stderr b/src/test/ui/compile-fail-migration/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.nll.stderr deleted file mode 100644 index fa448209f2b..00000000000 --- a/src/test/ui/compile-fail-migration/borrowck/borrowck-thread-local-static-borrow-outlives-fn.ast.nll.stderr +++ /dev/null @@ -1,14 +0,0 @@ -error[E0597]: `FOO` does not live long enough - --> $DIR/borrowck-thread-local-static-borrow-outlives-fn.rs:21:20 - | -LL | assert_static(&FOO); //[ast]~ ERROR [E0597] - | ^^^^ borrowed value does not live long enough -LL | //[mir]~^ ERROR [E0597] -LL | } - | - `FOO` dropped here while still borrowed - | - = note: borrowed value must be valid for the static lifetime... - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0597`. diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-thread-local-static-borrow-outlives-fn.mir.stderr b/src/test/ui/compile-fail-migration/borrowck/borrowck-thread-local-static-borrow-outlives-fn.mir.stderr deleted file mode 100644 index fa448209f2b..00000000000 --- a/src/test/ui/compile-fail-migration/borrowck/borrowck-thread-local-static-borrow-outlives-fn.mir.stderr +++ /dev/null @@ -1,14 +0,0 @@ -error[E0597]: `FOO` does not live long enough - --> $DIR/borrowck-thread-local-static-borrow-outlives-fn.rs:21:20 - | -LL | assert_static(&FOO); //[ast]~ ERROR [E0597] - | ^^^^ borrowed value does not live long enough -LL | //[mir]~^ ERROR [E0597] -LL | } - | - `FOO` dropped here while still borrowed - | - = note: borrowed value must be valid for the static lifetime... - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0597`. diff --git a/src/test/ui/compile-fail-migration/gated-attr-literals.stderr b/src/test/ui/compile-fail-migration/gated-attr-literals.stderr deleted file mode 100644 index e123c7cfa1a..00000000000 --- a/src/test/ui/compile-fail-migration/gated-attr-literals.stderr +++ /dev/null @@ -1,195 +0,0 @@ -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/gated-attr-literals.rs:20:1 - | -LL | #[fake_attr] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^ - | - = help: add #![feature(custom_attribute)] to the crate attributes to enable - -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/gated-attr-literals.rs:21:1 - | -LL | #[fake_attr(100)] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(custom_attribute)] to the crate attributes to enable - -error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) - --> $DIR/gated-attr-literals.rs:21:1 - | -LL | #[fake_attr(100)] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(attr_literals)] to the crate attributes to enable - -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/gated-attr-literals.rs:23:1 - | -LL | #[fake_attr(1, 2, 3)] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(custom_attribute)] to the crate attributes to enable - -error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) - --> $DIR/gated-attr-literals.rs:23:1 - | -LL | #[fake_attr(1, 2, 3)] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(attr_literals)] to the crate attributes to enable - -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/gated-attr-literals.rs:25:1 - | -LL | #[fake_attr("hello")] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(custom_attribute)] to the crate attributes to enable - -error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) - --> $DIR/gated-attr-literals.rs:25:1 - | -LL | #[fake_attr("hello")] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(attr_literals)] to the crate attributes to enable - -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/gated-attr-literals.rs:27:1 - | -LL | #[fake_attr(name = "hello")] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(custom_attribute)] to the crate attributes to enable - -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/gated-attr-literals.rs:28:1 - | -LL | #[fake_attr(1, "hi", key = 12, true, false)] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(custom_attribute)] to the crate attributes to enable - -error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) - --> $DIR/gated-attr-literals.rs:28:1 - | -LL | #[fake_attr(1, "hi", key = 12, true, false)] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(attr_literals)] to the crate attributes to enable - -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/gated-attr-literals.rs:30:1 - | -LL | #[fake_attr(key = "hello", val = 10)] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(custom_attribute)] to the crate attributes to enable - -error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) - --> $DIR/gated-attr-literals.rs:30:1 - | -LL | #[fake_attr(key = "hello", val = 10)] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(attr_literals)] to the crate attributes to enable - -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/gated-attr-literals.rs:32:1 - | -LL | #[fake_attr(key("hello"), val(10))] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(custom_attribute)] to the crate attributes to enable - -error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) - --> $DIR/gated-attr-literals.rs:32:1 - | -LL | #[fake_attr(key("hello"), val(10))] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(attr_literals)] to the crate attributes to enable - -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/gated-attr-literals.rs:34:1 - | -LL | #[fake_attr(enabled = true, disabled = false)] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(custom_attribute)] to the crate attributes to enable - -error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) - --> $DIR/gated-attr-literals.rs:34:1 - | -LL | #[fake_attr(enabled = true, disabled = false)] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(attr_literals)] to the crate attributes to enable - -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/gated-attr-literals.rs:36:1 - | -LL | #[fake_attr(true)] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(custom_attribute)] to the crate attributes to enable - -error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) - --> $DIR/gated-attr-literals.rs:36:1 - | -LL | #[fake_attr(true)] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(attr_literals)] to the crate attributes to enable - -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/gated-attr-literals.rs:38:1 - | -LL | #[fake_attr(pi = 3.14159)] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(custom_attribute)] to the crate attributes to enable - -error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) - --> $DIR/gated-attr-literals.rs:38:1 - | -LL | #[fake_attr(pi = 3.14159)] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(attr_literals)] to the crate attributes to enable - -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/gated-attr-literals.rs:40:1 - | -LL | #[fake_attr(b"hi")] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(custom_attribute)] to the crate attributes to enable - -error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) - --> $DIR/gated-attr-literals.rs:40:1 - | -LL | #[fake_attr(b"hi")] //~ ERROR attribute `fake_attr` is currently unknown - | ^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(attr_literals)] to the crate attributes to enable - -error[E0658]: The attribute `fake_doc` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/gated-attr-literals.rs:42:1 - | -LL | #[fake_doc(r"doc")] //~ ERROR attribute `fake_doc` is currently unknown - | ^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(custom_attribute)] to the crate attributes to enable - -error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) - --> $DIR/gated-attr-literals.rs:42:1 - | -LL | #[fake_doc(r"doc")] //~ ERROR attribute `fake_doc` is currently unknown - | ^^^^^^^^^^^^^^^^^^^ - | - = help: add #![feature(attr_literals)] to the crate attributes to enable - -error: aborting due to 24 previous errors - -For more information about this error, try `rustc --explain E0658`. diff --git a/src/test/ui/compile-fail-migration/keyword-extern-as-identifier.stderr b/src/test/ui/compile-fail-migration/keyword-extern-as-identifier.stderr deleted file mode 100644 index 0aa5fc08d6f..00000000000 --- a/src/test/ui/compile-fail-migration/keyword-extern-as-identifier.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0532]: expected unit struct/variant or constant, found module `extern` - --> $DIR/keyword-extern-as-identifier.rs:14:9 - | -LL | let extern = 0; //~ ERROR expected unit struct/variant or constant, found module `extern` - | ^^^^^^ not a unit struct/variant or constant - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0532`. diff --git a/src/test/ui/compile-fail-migration/macro-attribute.stderr b/src/test/ui/compile-fail-migration/macro-attribute.stderr deleted file mode 100644 index 8a3eb207953..00000000000 --- a/src/test/ui/compile-fail-migration/macro-attribute.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: unexpected token: `$` - --> $DIR/macro-attribute.rs:11:7 - | -LL | #[doc = $not_there] //~ error: unexpected token: `$` - | ^ - -error: aborting due to previous error - diff --git a/src/test/ui/compile-fail-migration/macro-with-seps-err-msg.stderr b/src/test/ui/compile-fail-migration/macro-with-seps-err-msg.stderr deleted file mode 100644 index a19d3337282..00000000000 --- a/src/test/ui/compile-fail-migration/macro-with-seps-err-msg.stderr +++ /dev/null @@ -1,27 +0,0 @@ -error[E0658]: non-ident macro paths are experimental (see issue #35896) - --> $DIR/macro-with-seps-err-msg.rs:16:5 - | -LL | globnar::brotz!(); //~ ERROR non-ident macro paths are experimental - | ^^^^^^^^^^^^^^ - | - = help: add #![feature(use_extern_macros)] to the crate attributes to enable - -error[E0658]: non-ident macro paths are experimental (see issue #35896) - --> $DIR/macro-with-seps-err-msg.rs:17:14 - | -LL | #[derive(foo::Bar)] struct T; //~ ERROR non-ident macro paths are experimental - | ^^^^^^^^ - | - = help: add #![feature(use_extern_macros)] to the crate attributes to enable - -error[E0658]: non-ident macro paths are experimental (see issue #35896) - --> $DIR/macro-with-seps-err-msg.rs:18:5 - | -LL | ::foo!(); //~ ERROR non-ident macro paths are experimental - | ^^^^^ - | - = help: add #![feature(use_extern_macros)] to the crate attributes to enable - -error: aborting due to 3 previous errors - -For more information about this error, try `rustc --explain E0658`. diff --git a/src/test/ui/compile-fail-migration/nolink-with-link-args.nll.stderr b/src/test/ui/compile-fail-migration/nolink-with-link-args.nll.stderr deleted file mode 100644 index df666db753d..00000000000 --- a/src/test/ui/compile-fail-migration/nolink-with-link-args.nll.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error: linking with `ld` failed: exit code: 1 - | - = note: "ld" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/compile-fail-migration/nolink-with-link-args.nll/a.nolink_with_link_args0-317d481089b8c8fe83113de504472633.rs.rcgu.o" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/compile-fail-migration/nolink-with-link-args.nll/a.nolink_with_link_args1-317d481089b8c8fe83113de504472633.rs.rcgu.o" "-o" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/compile-fail-migration/nolink-with-link-args.nll/a" "--gc-sections" "-pie" "-zrelro" "-znow" "-O1" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/compile-fail-migration/nolink-with-link-args.nll/auxiliary" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--start-group" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-lstd-e05e3c08f9f6faf5" "--end-group" "-Bstatic" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-ce73107aecc35a63.rlib" "-Bdynamic" "-ldl" "-lrt" "-lpthread" "-lpthread" "-lgcc_s" "-lc" "-lm" "-lrt" "-lpthread" "-lutil" "-lutil" "-Wl,-rpath,$ORIGIN/../../../../stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-Wl,-rpath,/home/david/projects/rust/workdirs/rust1/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-Wl,--enable-new-dtags" "aFdEfSeVEEE" - = note: ld: unrecognized option '-Wl,-rpath,$ORIGIN/../../../../stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib' - ld: use the --help option for usage information - - -error: aborting due to previous error - diff --git a/src/test/ui/compile-fail-migration/nolink-with-link-args.stderr b/src/test/ui/compile-fail-migration/nolink-with-link-args.stderr deleted file mode 100644 index 4c62e556a39..00000000000 --- a/src/test/ui/compile-fail-migration/nolink-with-link-args.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error: linking with `ld` failed: exit code: 1 - | - = note: "ld" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/compile-fail-migration/nolink-with-link-args/a.nolink_with_link_args0-317d481089b8c8fe83113de504472633.rs.rcgu.o" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/compile-fail-migration/nolink-with-link-args/a.nolink_with_link_args1-317d481089b8c8fe83113de504472633.rs.rcgu.o" "-o" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/compile-fail-migration/nolink-with-link-args/a" "--gc-sections" "-pie" "-zrelro" "-znow" "-O1" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/compile-fail-migration/nolink-with-link-args/auxiliary" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--start-group" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-lstd-e05e3c08f9f6faf5" "--end-group" "-Bstatic" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-ce73107aecc35a63.rlib" "-Bdynamic" "-ldl" "-lrt" "-lpthread" "-lpthread" "-lgcc_s" "-lc" "-lm" "-lrt" "-lpthread" "-lutil" "-lutil" "-Wl,-rpath,$ORIGIN/../../../../stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-Wl,-rpath,/home/david/projects/rust/workdirs/rust1/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-Wl,--enable-new-dtags" "aFdEfSeVEEE" - = note: ld: unrecognized option '-Wl,-rpath,$ORIGIN/../../../../stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib' - ld: use the --help option for usage information - - -error: aborting due to previous error - diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/single-segment.stderr b/src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/single-segment.stderr deleted file mode 100644 index 02363a01e3c..00000000000 --- a/src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/single-segment.stderr +++ /dev/null @@ -1,22 +0,0 @@ -error[E0432]: unresolved import `*` - --> $DIR/single-segment.rs:16:5 - | -LL | use *; //~ ERROR unresolved import `*` - | ^ cannot glob-import all possible crates - -error[E0432]: unresolved import `crate` - --> $DIR/single-segment.rs:14:5 - | -LL | use crate; //~ ERROR unresolved import `crate` - | ^^^^^ crate root imports need to be explicitly named: `use crate as name;` - -error[E0423]: expected value, found module `xcrate` - --> $DIR/single-segment.rs:20:13 - | -LL | let s = ::xcrate; //~ ERROR expected value, found module `xcrate` - | ^^^^^^^^ not a value - -error: aborting due to 3 previous errors - -Some errors occurred: E0423, E0432. -For more information about an error, try `rustc --explain E0423`. diff --git a/src/test/ui/compile-fail-migration/static-priv-by-default.stderr b/src/test/ui/compile-fail-migration/static-priv-by-default.stderr deleted file mode 100644 index 4e47f7d8c97..00000000000 --- a/src/test/ui/compile-fail-migration/static-priv-by-default.stderr +++ /dev/null @@ -1,21 +0,0 @@ -error[E0603]: static `private` is private - --> $DIR/static-priv-by-default.rs:25:9 - | -LL | foo(static_priv_by_default::private); //~ ERROR: static `private` is private - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -error[E0603]: static `private` is private - --> $DIR/static-priv-by-default.rs:27:9 - | -LL | foo(child::childs_child::private); //~ ERROR: static `private` is private - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -error[E0603]: static `private` is private - --> $DIR/static-priv-by-default.rs:33:9 - | -LL | foo(childs_child::private); //~ ERROR: static `private` is private - | ^^^^^^^^^^^^^^^^^^^^^ - -error: aborting due to 3 previous errors - -For more information about this error, try `rustc --explain E0603`. diff --git a/src/test/ui/compile-fail-migration/compile_error_macro.rs b/src/test/ui/compile_error_macro.rs similarity index 100% rename from src/test/ui/compile-fail-migration/compile_error_macro.rs rename to src/test/ui/compile_error_macro.rs diff --git a/src/test/ui/compile-fail-migration/compile_error_macro.stderr b/src/test/ui/compile_error_macro.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/compile_error_macro.stderr rename to src/test/ui/compile_error_macro.stderr diff --git a/src/test/ui/compile-fail-migration/concat.rs b/src/test/ui/concat.rs similarity index 100% rename from src/test/ui/compile-fail-migration/concat.rs rename to src/test/ui/concat.rs diff --git a/src/test/ui/compile-fail-migration/concat.stderr b/src/test/ui/concat.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/concat.stderr rename to src/test/ui/concat.stderr diff --git a/src/test/ui/compile-fail-migration/conflicting-repr-hints.rs b/src/test/ui/conflicting-repr-hints.rs similarity index 100% rename from src/test/ui/compile-fail-migration/conflicting-repr-hints.rs rename to src/test/ui/conflicting-repr-hints.rs diff --git a/src/test/ui/compile-fail-migration/conflicting-repr-hints.stderr b/src/test/ui/conflicting-repr-hints.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/conflicting-repr-hints.stderr rename to src/test/ui/conflicting-repr-hints.stderr diff --git a/src/test/ui/compile-fail-migration/conservative_impl_trait.rs b/src/test/ui/conservative_impl_trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/conservative_impl_trait.rs rename to src/test/ui/conservative_impl_trait.rs diff --git a/src/test/ui/compile-fail-migration/conservative_impl_trait.stderr b/src/test/ui/conservative_impl_trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/conservative_impl_trait.stderr rename to src/test/ui/conservative_impl_trait.stderr diff --git a/src/test/ui/compile-fail-migration/constructor-lifetime-args.rs b/src/test/ui/constructor-lifetime-args.rs similarity index 100% rename from src/test/ui/compile-fail-migration/constructor-lifetime-args.rs rename to src/test/ui/constructor-lifetime-args.rs diff --git a/src/test/ui/compile-fail-migration/constructor-lifetime-args.stderr b/src/test/ui/constructor-lifetime-args.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/constructor-lifetime-args.stderr rename to src/test/ui/constructor-lifetime-args.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/const_fn_lib.rs b/src/test/ui/consts/auxiliary/const_fn_lib.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/const_fn_lib.rs rename to src/test/ui/consts/auxiliary/const_fn_lib.rs diff --git a/src/test/ui/compile-fail-migration/const-array-oob-arith.rs b/src/test/ui/consts/const-array-oob-arith.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-array-oob-arith.rs rename to src/test/ui/consts/const-array-oob-arith.rs diff --git a/src/test/ui/compile-fail-migration/const-array-oob-arith.stderr b/src/test/ui/consts/const-array-oob-arith.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-array-oob-arith.stderr rename to src/test/ui/consts/const-array-oob-arith.stderr diff --git a/src/test/ui/compile-fail-migration/const-array-oob.rs b/src/test/ui/consts/const-array-oob.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-array-oob.rs rename to src/test/ui/consts/const-array-oob.rs diff --git a/src/test/ui/compile-fail-migration/const-array-oob.stderr b/src/test/ui/consts/const-array-oob.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-array-oob.stderr rename to src/test/ui/consts/const-array-oob.stderr diff --git a/src/test/ui/compile-fail-migration/const-block-non-item-statement-2.rs b/src/test/ui/consts/const-block-non-item-statement-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-block-non-item-statement-2.rs rename to src/test/ui/consts/const-block-non-item-statement-2.rs diff --git a/src/test/ui/compile-fail-migration/const-block-non-item-statement-2.stderr b/src/test/ui/consts/const-block-non-item-statement-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-block-non-item-statement-2.stderr rename to src/test/ui/consts/const-block-non-item-statement-2.stderr diff --git a/src/test/ui/compile-fail-migration/const-block-non-item-statement-3.rs b/src/test/ui/consts/const-block-non-item-statement-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-block-non-item-statement-3.rs rename to src/test/ui/consts/const-block-non-item-statement-3.rs diff --git a/src/test/ui/compile-fail-migration/const-block-non-item-statement-3.stderr b/src/test/ui/consts/const-block-non-item-statement-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-block-non-item-statement-3.stderr rename to src/test/ui/consts/const-block-non-item-statement-3.stderr diff --git a/src/test/ui/compile-fail-migration/const-block-non-item-statement.rs b/src/test/ui/consts/const-block-non-item-statement.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-block-non-item-statement.rs rename to src/test/ui/consts/const-block-non-item-statement.rs diff --git a/src/test/ui/compile-fail-migration/const-block-non-item-statement.stderr b/src/test/ui/consts/const-block-non-item-statement.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-block-non-item-statement.stderr rename to src/test/ui/consts/const-block-non-item-statement.stderr diff --git a/src/test/ui/compile-fail-migration/const-call.rs b/src/test/ui/consts/const-call.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-call.rs rename to src/test/ui/consts/const-call.rs diff --git a/src/test/ui/compile-fail-migration/const-call.stderr b/src/test/ui/consts/const-call.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-call.stderr rename to src/test/ui/consts/const-call.stderr diff --git a/src/test/ui/compile-fail-migration/const-cast-different-types.rs b/src/test/ui/consts/const-cast-different-types.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-cast-different-types.rs rename to src/test/ui/consts/const-cast-different-types.rs diff --git a/src/test/ui/compile-fail-migration/const-cast-different-types.stderr b/src/test/ui/consts/const-cast-different-types.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-cast-different-types.stderr rename to src/test/ui/consts/const-cast-different-types.stderr diff --git a/src/test/ui/compile-fail-migration/const-cast-wrong-type.rs b/src/test/ui/consts/const-cast-wrong-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-cast-wrong-type.rs rename to src/test/ui/consts/const-cast-wrong-type.rs diff --git a/src/test/ui/compile-fail-migration/const-cast-wrong-type.stderr b/src/test/ui/consts/const-cast-wrong-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-cast-wrong-type.stderr rename to src/test/ui/consts/const-cast-wrong-type.stderr diff --git a/src/test/ui/const-deref-ptr.rs b/src/test/ui/consts/const-deref-ptr.rs similarity index 100% rename from src/test/ui/const-deref-ptr.rs rename to src/test/ui/consts/const-deref-ptr.rs diff --git a/src/test/ui/const-deref-ptr.stderr b/src/test/ui/consts/const-deref-ptr.stderr similarity index 100% rename from src/test/ui/const-deref-ptr.stderr rename to src/test/ui/consts/const-deref-ptr.stderr diff --git a/src/test/ui/compile-fail-migration/const-err-early.rs b/src/test/ui/consts/const-err-early.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-err-early.rs rename to src/test/ui/consts/const-err-early.rs diff --git a/src/test/ui/compile-fail-migration/const-err-early.stderr b/src/test/ui/consts/const-err-early.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-err-early.stderr rename to src/test/ui/consts/const-err-early.stderr diff --git a/src/test/ui/compile-fail-migration/const-err-multi.rs b/src/test/ui/consts/const-err-multi.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-err-multi.rs rename to src/test/ui/consts/const-err-multi.rs diff --git a/src/test/ui/compile-fail-migration/const-err-multi.stderr b/src/test/ui/consts/const-err-multi.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-err-multi.stderr rename to src/test/ui/consts/const-err-multi.stderr diff --git a/src/test/ui/compile-fail-migration/const-err.rs b/src/test/ui/consts/const-err.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-err.rs rename to src/test/ui/consts/const-err.rs diff --git a/src/test/ui/compile-fail-migration/const-err.stderr b/src/test/ui/consts/const-err.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-err.stderr rename to src/test/ui/consts/const-err.stderr diff --git a/src/test/ui/compile-fail-migration/const-err2.rs b/src/test/ui/consts/const-err2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-err2.rs rename to src/test/ui/consts/const-err2.rs diff --git a/src/test/ui/compile-fail-migration/const-err2.stderr b/src/test/ui/consts/const-err2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-err2.stderr rename to src/test/ui/consts/const-err2.stderr diff --git a/src/test/ui/compile-fail-migration/const-err3.rs b/src/test/ui/consts/const-err3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-err3.rs rename to src/test/ui/consts/const-err3.rs diff --git a/src/test/ui/compile-fail-migration/const-err3.stderr b/src/test/ui/consts/const-err3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-err3.stderr rename to src/test/ui/consts/const-err3.stderr diff --git a/src/test/ui/compile-fail-migration/const-err4.rs b/src/test/ui/consts/const-err4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-err4.rs rename to src/test/ui/consts/const-err4.rs diff --git a/src/test/ui/compile-fail-migration/const-err4.stderr b/src/test/ui/consts/const-err4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-err4.stderr rename to src/test/ui/consts/const-err4.stderr diff --git a/src/test/ui/const-eval/conditional_array_execution.nll.stderr b/src/test/ui/consts/const-eval/conditional_array_execution.nll.stderr similarity index 100% rename from src/test/ui/const-eval/conditional_array_execution.nll.stderr rename to src/test/ui/consts/const-eval/conditional_array_execution.nll.stderr diff --git a/src/test/ui/const-eval/conditional_array_execution.rs b/src/test/ui/consts/const-eval/conditional_array_execution.rs similarity index 100% rename from src/test/ui/const-eval/conditional_array_execution.rs rename to src/test/ui/consts/const-eval/conditional_array_execution.rs diff --git a/src/test/ui/const-eval/conditional_array_execution.stderr b/src/test/ui/consts/const-eval/conditional_array_execution.stderr similarity index 100% rename from src/test/ui/const-eval/conditional_array_execution.stderr rename to src/test/ui/consts/const-eval/conditional_array_execution.stderr diff --git a/src/test/ui/const-eval-overflow-2.rs b/src/test/ui/consts/const-eval/const-eval-overflow-2.rs similarity index 100% rename from src/test/ui/const-eval-overflow-2.rs rename to src/test/ui/consts/const-eval/const-eval-overflow-2.rs diff --git a/src/test/ui/const-eval-overflow-2.stderr b/src/test/ui/consts/const-eval/const-eval-overflow-2.stderr similarity index 100% rename from src/test/ui/const-eval-overflow-2.stderr rename to src/test/ui/consts/const-eval/const-eval-overflow-2.stderr diff --git a/src/test/ui/compile-fail-migration/const-eval-overflow-3.rs b/src/test/ui/consts/const-eval/const-eval-overflow-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-eval-overflow-3.rs rename to src/test/ui/consts/const-eval/const-eval-overflow-3.rs diff --git a/src/test/ui/compile-fail-migration/const-eval-overflow-3.stderr b/src/test/ui/consts/const-eval/const-eval-overflow-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-eval-overflow-3.stderr rename to src/test/ui/consts/const-eval/const-eval-overflow-3.stderr diff --git a/src/test/ui/compile-fail-migration/const-eval-overflow-3b.rs b/src/test/ui/consts/const-eval/const-eval-overflow-3b.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-eval-overflow-3b.rs rename to src/test/ui/consts/const-eval/const-eval-overflow-3b.rs diff --git a/src/test/ui/compile-fail-migration/const-eval-overflow-3b.stderr b/src/test/ui/consts/const-eval/const-eval-overflow-3b.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-eval-overflow-3b.stderr rename to src/test/ui/consts/const-eval/const-eval-overflow-3b.stderr diff --git a/src/test/ui/const-eval-overflow-4.rs b/src/test/ui/consts/const-eval/const-eval-overflow-4.rs similarity index 100% rename from src/test/ui/const-eval-overflow-4.rs rename to src/test/ui/consts/const-eval/const-eval-overflow-4.rs diff --git a/src/test/ui/const-eval-overflow-4.stderr b/src/test/ui/consts/const-eval/const-eval-overflow-4.stderr similarity index 100% rename from src/test/ui/const-eval-overflow-4.stderr rename to src/test/ui/consts/const-eval/const-eval-overflow-4.stderr diff --git a/src/test/ui/compile-fail-migration/const-eval-overflow-4b.rs b/src/test/ui/consts/const-eval/const-eval-overflow-4b.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-eval-overflow-4b.rs rename to src/test/ui/consts/const-eval/const-eval-overflow-4b.rs diff --git a/src/test/ui/compile-fail-migration/const-eval-overflow-4b.stderr b/src/test/ui/consts/const-eval/const-eval-overflow-4b.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-eval-overflow-4b.stderr rename to src/test/ui/consts/const-eval/const-eval-overflow-4b.stderr diff --git a/src/test/ui/compile-fail-migration/const-eval-overflow2.rs b/src/test/ui/consts/const-eval/const-eval-overflow2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-eval-overflow2.rs rename to src/test/ui/consts/const-eval/const-eval-overflow2.rs diff --git a/src/test/ui/compile-fail-migration/const-eval-overflow2.stderr b/src/test/ui/consts/const-eval/const-eval-overflow2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-eval-overflow2.stderr rename to src/test/ui/consts/const-eval/const-eval-overflow2.stderr diff --git a/src/test/ui/compile-fail-migration/const-eval-overflow2b.rs b/src/test/ui/consts/const-eval/const-eval-overflow2b.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-eval-overflow2b.rs rename to src/test/ui/consts/const-eval/const-eval-overflow2b.rs diff --git a/src/test/ui/compile-fail-migration/const-eval-overflow2b.stderr b/src/test/ui/consts/const-eval/const-eval-overflow2b.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-eval-overflow2b.stderr rename to src/test/ui/consts/const-eval/const-eval-overflow2b.stderr diff --git a/src/test/ui/compile-fail-migration/const-eval-overflow2c.rs b/src/test/ui/consts/const-eval/const-eval-overflow2c.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-eval-overflow2c.rs rename to src/test/ui/consts/const-eval/const-eval-overflow2c.rs diff --git a/src/test/ui/compile-fail-migration/const-eval-overflow2c.stderr b/src/test/ui/consts/const-eval/const-eval-overflow2c.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-eval-overflow2c.stderr rename to src/test/ui/consts/const-eval/const-eval-overflow2c.stderr diff --git a/src/test/ui/const-eval-span.rs b/src/test/ui/consts/const-eval/const-eval-span.rs similarity index 100% rename from src/test/ui/const-eval-span.rs rename to src/test/ui/consts/const-eval/const-eval-span.rs diff --git a/src/test/ui/const-eval-span.stderr b/src/test/ui/consts/const-eval/const-eval-span.stderr similarity index 100% rename from src/test/ui/const-eval-span.stderr rename to src/test/ui/consts/const-eval/const-eval-span.stderr diff --git a/src/test/ui/const-eval/const_let.rs b/src/test/ui/consts/const-eval/const_let.rs similarity index 100% rename from src/test/ui/const-eval/const_let.rs rename to src/test/ui/consts/const-eval/const_let.rs diff --git a/src/test/ui/const-eval/const_let.stderr b/src/test/ui/consts/const-eval/const_let.stderr similarity index 100% rename from src/test/ui/const-eval/const_let.stderr rename to src/test/ui/consts/const-eval/const_let.stderr diff --git a/src/test/ui/const-eval/const_prop_errors.rs b/src/test/ui/consts/const-eval/const_prop_errors.rs similarity index 100% rename from src/test/ui/const-eval/const_prop_errors.rs rename to src/test/ui/consts/const-eval/const_prop_errors.rs diff --git a/src/test/ui/const-eval/const_raw_ptr_ops.rs b/src/test/ui/consts/const-eval/const_raw_ptr_ops.rs similarity index 100% rename from src/test/ui/const-eval/const_raw_ptr_ops.rs rename to src/test/ui/consts/const-eval/const_raw_ptr_ops.rs diff --git a/src/test/ui/const-eval/const_raw_ptr_ops.stderr b/src/test/ui/consts/const-eval/const_raw_ptr_ops.stderr similarity index 100% rename from src/test/ui/const-eval/const_raw_ptr_ops.stderr rename to src/test/ui/consts/const-eval/const_raw_ptr_ops.stderr diff --git a/src/test/ui/const-eval/const_signed_pat.rs b/src/test/ui/consts/const-eval/const_signed_pat.rs similarity index 100% rename from src/test/ui/const-eval/const_signed_pat.rs rename to src/test/ui/consts/const-eval/const_signed_pat.rs diff --git a/src/test/ui/const-eval/const_transmute.rs b/src/test/ui/consts/const-eval/const_transmute.rs similarity index 100% rename from src/test/ui/const-eval/const_transmute.rs rename to src/test/ui/consts/const-eval/const_transmute.rs diff --git a/src/test/ui/const-eval/dont_promote_unstable_const_fn.nll.stderr b/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.nll.stderr similarity index 100% rename from src/test/ui/const-eval/dont_promote_unstable_const_fn.nll.stderr rename to src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.nll.stderr diff --git a/src/test/ui/const-eval/dont_promote_unstable_const_fn.rs b/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.rs similarity index 100% rename from src/test/ui/const-eval/dont_promote_unstable_const_fn.rs rename to src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.rs diff --git a/src/test/ui/const-eval/dont_promote_unstable_const_fn.stderr b/src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.stderr similarity index 100% rename from src/test/ui/const-eval/dont_promote_unstable_const_fn.stderr rename to src/test/ui/consts/const-eval/dont_promote_unstable_const_fn.stderr diff --git a/src/test/ui/const-eval/double_check.rs b/src/test/ui/consts/const-eval/double_check.rs similarity index 100% rename from src/test/ui/const-eval/double_check.rs rename to src/test/ui/consts/const-eval/double_check.rs diff --git a/src/test/ui/const-eval/double_check2.rs b/src/test/ui/consts/const-eval/double_check2.rs similarity index 100% rename from src/test/ui/const-eval/double_check2.rs rename to src/test/ui/consts/const-eval/double_check2.rs diff --git a/src/test/ui/const-eval/double_check2.stderr b/src/test/ui/consts/const-eval/double_check2.stderr similarity index 100% rename from src/test/ui/const-eval/double_check2.stderr rename to src/test/ui/consts/const-eval/double_check2.stderr diff --git a/src/test/ui/const-eval/duration_conversion.rs b/src/test/ui/consts/const-eval/duration_conversion.rs similarity index 100% rename from src/test/ui/const-eval/duration_conversion.rs rename to src/test/ui/consts/const-eval/duration_conversion.rs diff --git a/src/test/ui/const-eval/enum_discr.rs b/src/test/ui/consts/const-eval/enum_discr.rs similarity index 100% rename from src/test/ui/const-eval/enum_discr.rs rename to src/test/ui/consts/const-eval/enum_discr.rs diff --git a/src/test/ui/const-eval/extern_fat_pointer.rs b/src/test/ui/consts/const-eval/extern_fat_pointer.rs similarity index 100% rename from src/test/ui/const-eval/extern_fat_pointer.rs rename to src/test/ui/consts/const-eval/extern_fat_pointer.rs diff --git a/src/test/ui/const-eval/feature-gate-const_fn_union.rs b/src/test/ui/consts/const-eval/feature-gate-const_fn_union.rs similarity index 100% rename from src/test/ui/const-eval/feature-gate-const_fn_union.rs rename to src/test/ui/consts/const-eval/feature-gate-const_fn_union.rs diff --git a/src/test/ui/const-eval/feature-gate-const_fn_union.stderr b/src/test/ui/consts/const-eval/feature-gate-const_fn_union.stderr similarity index 100% rename from src/test/ui/const-eval/feature-gate-const_fn_union.stderr rename to src/test/ui/consts/const-eval/feature-gate-const_fn_union.stderr diff --git a/src/test/ui/const-eval/ice-generic-assoc-const.rs b/src/test/ui/consts/const-eval/ice-generic-assoc-const.rs similarity index 100% rename from src/test/ui/const-eval/ice-generic-assoc-const.rs rename to src/test/ui/consts/const-eval/ice-generic-assoc-const.rs diff --git a/src/test/ui/const-eval/ice-packed.rs b/src/test/ui/consts/const-eval/ice-packed.rs similarity index 100% rename from src/test/ui/const-eval/ice-packed.rs rename to src/test/ui/consts/const-eval/ice-packed.rs diff --git a/src/test/ui/const-eval/index_out_of_bounds.rs b/src/test/ui/consts/const-eval/index_out_of_bounds.rs similarity index 100% rename from src/test/ui/const-eval/index_out_of_bounds.rs rename to src/test/ui/consts/const-eval/index_out_of_bounds.rs diff --git a/src/test/ui/const-eval/index_out_of_bounds.stderr b/src/test/ui/consts/const-eval/index_out_of_bounds.stderr similarity index 100% rename from src/test/ui/const-eval/index_out_of_bounds.stderr rename to src/test/ui/consts/const-eval/index_out_of_bounds.stderr diff --git a/src/test/ui/const-eval/index_out_of_bounds_propagated.rs b/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.rs similarity index 100% rename from src/test/ui/const-eval/index_out_of_bounds_propagated.rs rename to src/test/ui/consts/const-eval/index_out_of_bounds_propagated.rs diff --git a/src/test/ui/const-eval/index_out_of_bounds_propagated.stderr b/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.stderr similarity index 100% rename from src/test/ui/const-eval/index_out_of_bounds_propagated.stderr rename to src/test/ui/consts/const-eval/index_out_of_bounds_propagated.stderr diff --git a/src/test/ui/const-eval/infinite_loop.rs b/src/test/ui/consts/const-eval/infinite_loop.rs similarity index 100% rename from src/test/ui/const-eval/infinite_loop.rs rename to src/test/ui/consts/const-eval/infinite_loop.rs diff --git a/src/test/ui/const-eval/infinite_loop.stderr b/src/test/ui/consts/const-eval/infinite_loop.stderr similarity index 100% rename from src/test/ui/const-eval/infinite_loop.stderr rename to src/test/ui/consts/const-eval/infinite_loop.stderr diff --git a/src/test/ui/const-eval/issue-43197.nll.stderr b/src/test/ui/consts/const-eval/issue-43197.nll.stderr similarity index 100% rename from src/test/ui/const-eval/issue-43197.nll.stderr rename to src/test/ui/consts/const-eval/issue-43197.nll.stderr diff --git a/src/test/ui/const-eval/issue-43197.rs b/src/test/ui/consts/const-eval/issue-43197.rs similarity index 100% rename from src/test/ui/const-eval/issue-43197.rs rename to src/test/ui/consts/const-eval/issue-43197.rs diff --git a/src/test/ui/const-eval/issue-43197.stderr b/src/test/ui/consts/const-eval/issue-43197.stderr similarity index 100% rename from src/test/ui/const-eval/issue-43197.stderr rename to src/test/ui/consts/const-eval/issue-43197.stderr diff --git a/src/test/ui/const-eval/issue-44578.nll.stderr b/src/test/ui/consts/const-eval/issue-44578.nll.stderr similarity index 100% rename from src/test/ui/const-eval/issue-44578.nll.stderr rename to src/test/ui/consts/const-eval/issue-44578.nll.stderr diff --git a/src/test/ui/const-eval/issue-44578.rs b/src/test/ui/consts/const-eval/issue-44578.rs similarity index 100% rename from src/test/ui/const-eval/issue-44578.rs rename to src/test/ui/consts/const-eval/issue-44578.rs diff --git a/src/test/ui/const-eval/issue-44578.stderr b/src/test/ui/consts/const-eval/issue-44578.stderr similarity index 100% rename from src/test/ui/const-eval/issue-44578.stderr rename to src/test/ui/consts/const-eval/issue-44578.stderr diff --git a/src/test/ui/const-eval/issue-47971.rs b/src/test/ui/consts/const-eval/issue-47971.rs similarity index 100% rename from src/test/ui/const-eval/issue-47971.rs rename to src/test/ui/consts/const-eval/issue-47971.rs diff --git a/src/test/ui/const-eval/issue-50706.rs b/src/test/ui/consts/const-eval/issue-50706.rs similarity index 100% rename from src/test/ui/const-eval/issue-50706.rs rename to src/test/ui/consts/const-eval/issue-50706.rs diff --git a/src/test/ui/const-eval/issue-50814-2.rs b/src/test/ui/consts/const-eval/issue-50814-2.rs similarity index 100% rename from src/test/ui/const-eval/issue-50814-2.rs rename to src/test/ui/consts/const-eval/issue-50814-2.rs diff --git a/src/test/ui/const-eval/issue-50814-2.stderr b/src/test/ui/consts/const-eval/issue-50814-2.stderr similarity index 100% rename from src/test/ui/const-eval/issue-50814-2.stderr rename to src/test/ui/consts/const-eval/issue-50814-2.stderr diff --git a/src/test/ui/const-eval/issue-50814.rs b/src/test/ui/consts/const-eval/issue-50814.rs similarity index 100% rename from src/test/ui/const-eval/issue-50814.rs rename to src/test/ui/consts/const-eval/issue-50814.rs diff --git a/src/test/ui/const-eval/issue-50814.stderr b/src/test/ui/consts/const-eval/issue-50814.stderr similarity index 100% rename from src/test/ui/const-eval/issue-50814.stderr rename to src/test/ui/consts/const-eval/issue-50814.stderr diff --git a/src/test/ui/const-eval/issue-51300.rs b/src/test/ui/consts/const-eval/issue-51300.rs similarity index 100% rename from src/test/ui/const-eval/issue-51300.rs rename to src/test/ui/consts/const-eval/issue-51300.rs diff --git a/src/test/ui/const-eval/issue-52442.rs b/src/test/ui/consts/const-eval/issue-52442.rs similarity index 100% rename from src/test/ui/const-eval/issue-52442.rs rename to src/test/ui/consts/const-eval/issue-52442.rs diff --git a/src/test/ui/const-eval/issue-52442.stderr b/src/test/ui/consts/const-eval/issue-52442.stderr similarity index 100% rename from src/test/ui/const-eval/issue-52442.stderr rename to src/test/ui/consts/const-eval/issue-52442.stderr diff --git a/src/test/ui/const-eval/issue-52443.rs b/src/test/ui/consts/const-eval/issue-52443.rs similarity index 100% rename from src/test/ui/const-eval/issue-52443.rs rename to src/test/ui/consts/const-eval/issue-52443.rs diff --git a/src/test/ui/const-eval/issue-52443.stderr b/src/test/ui/consts/const-eval/issue-52443.stderr similarity index 100% rename from src/test/ui/const-eval/issue-52443.stderr rename to src/test/ui/consts/const-eval/issue-52443.stderr diff --git a/src/test/ui/const-eval/match-test-ptr-null.rs b/src/test/ui/consts/const-eval/match-test-ptr-null.rs similarity index 100% rename from src/test/ui/const-eval/match-test-ptr-null.rs rename to src/test/ui/consts/const-eval/match-test-ptr-null.rs diff --git a/src/test/ui/const-eval/match-test-ptr-null.stderr b/src/test/ui/consts/const-eval/match-test-ptr-null.stderr similarity index 100% rename from src/test/ui/const-eval/match-test-ptr-null.stderr rename to src/test/ui/consts/const-eval/match-test-ptr-null.stderr diff --git a/src/test/ui/const-eval/no_lint_for_statically_known_error.rs b/src/test/ui/consts/const-eval/no_lint_for_statically_known_error.rs similarity index 100% rename from src/test/ui/const-eval/no_lint_for_statically_known_error.rs rename to src/test/ui/consts/const-eval/no_lint_for_statically_known_error.rs diff --git a/src/test/ui/const-eval/promote_mutable_zst_mir_borrowck.rs b/src/test/ui/consts/const-eval/promote_mutable_zst_mir_borrowck.rs similarity index 100% rename from src/test/ui/const-eval/promote_mutable_zst_mir_borrowck.rs rename to src/test/ui/consts/const-eval/promote_mutable_zst_mir_borrowck.rs diff --git a/src/test/ui/const-eval/promoted_const_fn_fail.rs b/src/test/ui/consts/const-eval/promoted_const_fn_fail.rs similarity index 100% rename from src/test/ui/const-eval/promoted_const_fn_fail.rs rename to src/test/ui/consts/const-eval/promoted_const_fn_fail.rs diff --git a/src/test/ui/const-eval/promoted_errors.rs b/src/test/ui/consts/const-eval/promoted_errors.rs similarity index 100% rename from src/test/ui/const-eval/promoted_errors.rs rename to src/test/ui/consts/const-eval/promoted_errors.rs diff --git a/src/test/ui/const-eval/promoted_errors.stderr b/src/test/ui/consts/const-eval/promoted_errors.stderr similarity index 100% rename from src/test/ui/const-eval/promoted_errors.stderr rename to src/test/ui/consts/const-eval/promoted_errors.stderr diff --git a/src/test/ui/const-eval/promoted_raw_ptr_ops.rs b/src/test/ui/consts/const-eval/promoted_raw_ptr_ops.rs similarity index 100% rename from src/test/ui/const-eval/promoted_raw_ptr_ops.rs rename to src/test/ui/consts/const-eval/promoted_raw_ptr_ops.rs diff --git a/src/test/ui/const-eval/promoted_raw_ptr_ops.stderr b/src/test/ui/consts/const-eval/promoted_raw_ptr_ops.stderr similarity index 100% rename from src/test/ui/const-eval/promoted_raw_ptr_ops.stderr rename to src/test/ui/consts/const-eval/promoted_raw_ptr_ops.stderr diff --git a/src/test/ui/const-eval/pub_const_err.rs b/src/test/ui/consts/const-eval/pub_const_err.rs similarity index 100% rename from src/test/ui/const-eval/pub_const_err.rs rename to src/test/ui/consts/const-eval/pub_const_err.rs diff --git a/src/test/ui/const-eval/pub_const_err.stderr b/src/test/ui/consts/const-eval/pub_const_err.stderr similarity index 100% rename from src/test/ui/const-eval/pub_const_err.stderr rename to src/test/ui/consts/const-eval/pub_const_err.stderr diff --git a/src/test/ui/const-eval/pub_const_err_bin.rs b/src/test/ui/consts/const-eval/pub_const_err_bin.rs similarity index 100% rename from src/test/ui/const-eval/pub_const_err_bin.rs rename to src/test/ui/consts/const-eval/pub_const_err_bin.rs diff --git a/src/test/ui/const-eval/pub_const_err_bin.stderr b/src/test/ui/consts/const-eval/pub_const_err_bin.stderr similarity index 100% rename from src/test/ui/const-eval/pub_const_err_bin.stderr rename to src/test/ui/consts/const-eval/pub_const_err_bin.stderr diff --git a/src/test/ui/const-eval/ref_to_float_transmute.rs b/src/test/ui/consts/const-eval/ref_to_float_transmute.rs similarity index 100% rename from src/test/ui/const-eval/ref_to_float_transmute.rs rename to src/test/ui/consts/const-eval/ref_to_float_transmute.rs diff --git a/src/test/ui/const-eval/ref_to_int_match.rs b/src/test/ui/consts/const-eval/ref_to_int_match.rs similarity index 100% rename from src/test/ui/const-eval/ref_to_int_match.rs rename to src/test/ui/consts/const-eval/ref_to_int_match.rs diff --git a/src/test/ui/const-eval/ref_to_int_match.stderr b/src/test/ui/consts/const-eval/ref_to_int_match.stderr similarity index 100% rename from src/test/ui/const-eval/ref_to_int_match.stderr rename to src/test/ui/consts/const-eval/ref_to_int_match.stderr diff --git a/src/test/ui/const-eval/shift_overflow.rs b/src/test/ui/consts/const-eval/shift_overflow.rs similarity index 100% rename from src/test/ui/const-eval/shift_overflow.rs rename to src/test/ui/consts/const-eval/shift_overflow.rs diff --git a/src/test/ui/const-eval/shift_overflow.stderr b/src/test/ui/consts/const-eval/shift_overflow.stderr similarity index 100% rename from src/test/ui/const-eval/shift_overflow.stderr rename to src/test/ui/consts/const-eval/shift_overflow.stderr diff --git a/src/test/ui/const-eval/simple_with_undef.rs b/src/test/ui/consts/const-eval/simple_with_undef.rs similarity index 100% rename from src/test/ui/const-eval/simple_with_undef.rs rename to src/test/ui/consts/const-eval/simple_with_undef.rs diff --git a/src/test/ui/const-eval/strlen.rs b/src/test/ui/consts/const-eval/strlen.rs similarity index 100% rename from src/test/ui/const-eval/strlen.rs rename to src/test/ui/consts/const-eval/strlen.rs diff --git a/src/test/ui/const-eval/ub-enum-ptr.rs b/src/test/ui/consts/const-eval/ub-enum-ptr.rs similarity index 100% rename from src/test/ui/const-eval/ub-enum-ptr.rs rename to src/test/ui/consts/const-eval/ub-enum-ptr.rs diff --git a/src/test/ui/const-eval/ub-enum-ptr.stderr b/src/test/ui/consts/const-eval/ub-enum-ptr.stderr similarity index 100% rename from src/test/ui/const-eval/ub-enum-ptr.stderr rename to src/test/ui/consts/const-eval/ub-enum-ptr.stderr diff --git a/src/test/ui/const-eval/ub-ptr-in-usize.rs b/src/test/ui/consts/const-eval/ub-ptr-in-usize.rs similarity index 100% rename from src/test/ui/const-eval/ub-ptr-in-usize.rs rename to src/test/ui/consts/const-eval/ub-ptr-in-usize.rs diff --git a/src/test/ui/const-eval/ub-uninhabit.rs b/src/test/ui/consts/const-eval/ub-uninhabit.rs similarity index 100% rename from src/test/ui/const-eval/ub-uninhabit.rs rename to src/test/ui/consts/const-eval/ub-uninhabit.rs diff --git a/src/test/ui/const-eval/ub-uninhabit.stderr b/src/test/ui/consts/const-eval/ub-uninhabit.stderr similarity index 100% rename from src/test/ui/const-eval/ub-uninhabit.stderr rename to src/test/ui/consts/const-eval/ub-uninhabit.stderr diff --git a/src/test/ui/const-eval/ub-usize-in-ref.rs b/src/test/ui/consts/const-eval/ub-usize-in-ref.rs similarity index 100% rename from src/test/ui/const-eval/ub-usize-in-ref.rs rename to src/test/ui/consts/const-eval/ub-usize-in-ref.rs diff --git a/src/test/ui/const-eval/union-const-eval-field.rs b/src/test/ui/consts/const-eval/union-const-eval-field.rs similarity index 100% rename from src/test/ui/const-eval/union-const-eval-field.rs rename to src/test/ui/consts/const-eval/union-const-eval-field.rs diff --git a/src/test/ui/const-eval/union-const-eval-field.stderr b/src/test/ui/consts/const-eval/union-const-eval-field.stderr similarity index 100% rename from src/test/ui/const-eval/union-const-eval-field.stderr rename to src/test/ui/consts/const-eval/union-const-eval-field.stderr diff --git a/src/test/ui/const-eval/union-ice.rs b/src/test/ui/consts/const-eval/union-ice.rs similarity index 100% rename from src/test/ui/const-eval/union-ice.rs rename to src/test/ui/consts/const-eval/union-ice.rs diff --git a/src/test/ui/const-eval/union-ice.stderr b/src/test/ui/consts/const-eval/union-ice.stderr similarity index 100% rename from src/test/ui/const-eval/union-ice.stderr rename to src/test/ui/consts/const-eval/union-ice.stderr diff --git a/src/test/ui/const-eval/union-ub.rs b/src/test/ui/consts/const-eval/union-ub.rs similarity index 100% rename from src/test/ui/const-eval/union-ub.rs rename to src/test/ui/consts/const-eval/union-ub.rs diff --git a/src/test/ui/const-eval/union-ub.stderr b/src/test/ui/consts/const-eval/union-ub.stderr similarity index 100% rename from src/test/ui/const-eval/union-ub.stderr rename to src/test/ui/consts/const-eval/union-ub.stderr diff --git a/src/test/ui/const-eval/union_promotion.rs b/src/test/ui/consts/const-eval/union_promotion.rs similarity index 100% rename from src/test/ui/const-eval/union_promotion.rs rename to src/test/ui/consts/const-eval/union_promotion.rs diff --git a/src/test/ui/const-eval/union_promotion.stderr b/src/test/ui/consts/const-eval/union_promotion.stderr similarity index 100% rename from src/test/ui/const-eval/union_promotion.stderr rename to src/test/ui/consts/const-eval/union_promotion.stderr diff --git a/src/test/ui/const-expr-addr-operator.rs b/src/test/ui/consts/const-expr-addr-operator.rs similarity index 100% rename from src/test/ui/const-expr-addr-operator.rs rename to src/test/ui/consts/const-expr-addr-operator.rs diff --git a/src/test/ui/compile-fail-migration/const-fn-destructuring-arg.rs b/src/test/ui/consts/const-fn-destructuring-arg.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-fn-destructuring-arg.rs rename to src/test/ui/consts/const-fn-destructuring-arg.rs diff --git a/src/test/ui/compile-fail-migration/const-fn-destructuring-arg.stderr b/src/test/ui/consts/const-fn-destructuring-arg.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-fn-destructuring-arg.stderr rename to src/test/ui/consts/const-fn-destructuring-arg.stderr diff --git a/src/test/ui/const-fn-error.rs b/src/test/ui/consts/const-fn-error.rs similarity index 100% rename from src/test/ui/const-fn-error.rs rename to src/test/ui/consts/const-fn-error.rs diff --git a/src/test/ui/const-fn-error.stderr b/src/test/ui/consts/const-fn-error.stderr similarity index 100% rename from src/test/ui/const-fn-error.stderr rename to src/test/ui/consts/const-fn-error.stderr diff --git a/src/test/ui/const-fn-mismatch.rs b/src/test/ui/consts/const-fn-mismatch.rs similarity index 100% rename from src/test/ui/const-fn-mismatch.rs rename to src/test/ui/consts/const-fn-mismatch.rs diff --git a/src/test/ui/const-fn-mismatch.stderr b/src/test/ui/consts/const-fn-mismatch.stderr similarity index 100% rename from src/test/ui/const-fn-mismatch.stderr rename to src/test/ui/consts/const-fn-mismatch.stderr diff --git a/src/test/ui/const-fn-not-in-trait.rs b/src/test/ui/consts/const-fn-not-in-trait.rs similarity index 100% rename from src/test/ui/const-fn-not-in-trait.rs rename to src/test/ui/consts/const-fn-not-in-trait.rs diff --git a/src/test/ui/const-fn-not-in-trait.stderr b/src/test/ui/consts/const-fn-not-in-trait.stderr similarity index 100% rename from src/test/ui/const-fn-not-in-trait.stderr rename to src/test/ui/consts/const-fn-not-in-trait.stderr diff --git a/src/test/ui/compile-fail-migration/const-fn-not-safe-for-const.rs b/src/test/ui/consts/const-fn-not-safe-for-const.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-fn-not-safe-for-const.rs rename to src/test/ui/consts/const-fn-not-safe-for-const.rs diff --git a/src/test/ui/compile-fail-migration/const-fn-not-safe-for-const.stderr b/src/test/ui/consts/const-fn-not-safe-for-const.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-fn-not-safe-for-const.stderr rename to src/test/ui/consts/const-fn-not-safe-for-const.stderr diff --git a/src/test/ui/compile-fail-migration/const-fn-stability-calls-3.rs b/src/test/ui/consts/const-fn-stability-calls-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-fn-stability-calls-3.rs rename to src/test/ui/consts/const-fn-stability-calls-3.rs diff --git a/src/test/ui/compile-fail-migration/const-fn-stability-calls-3.stderr b/src/test/ui/consts/const-fn-stability-calls-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-fn-stability-calls-3.stderr rename to src/test/ui/consts/const-fn-stability-calls-3.stderr diff --git a/src/test/ui/compile-fail-migration/const-integer-bool-ops.rs b/src/test/ui/consts/const-integer-bool-ops.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-integer-bool-ops.rs rename to src/test/ui/consts/const-integer-bool-ops.rs diff --git a/src/test/ui/compile-fail-migration/const-integer-bool-ops.stderr b/src/test/ui/consts/const-integer-bool-ops.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-integer-bool-ops.stderr rename to src/test/ui/consts/const-integer-bool-ops.stderr diff --git a/src/test/ui/const-len-underflow-separate-spans.rs b/src/test/ui/consts/const-len-underflow-separate-spans.rs similarity index 100% rename from src/test/ui/const-len-underflow-separate-spans.rs rename to src/test/ui/consts/const-len-underflow-separate-spans.rs diff --git a/src/test/ui/const-len-underflow-separate-spans.stderr b/src/test/ui/consts/const-len-underflow-separate-spans.stderr similarity index 100% rename from src/test/ui/const-len-underflow-separate-spans.stderr rename to src/test/ui/consts/const-len-underflow-separate-spans.stderr diff --git a/src/test/ui/compile-fail-migration/const-len-underflow-subspans.rs b/src/test/ui/consts/const-len-underflow-subspans.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-len-underflow-subspans.rs rename to src/test/ui/consts/const-len-underflow-subspans.rs diff --git a/src/test/ui/compile-fail-migration/const-len-underflow-subspans.stderr b/src/test/ui/consts/const-len-underflow-subspans.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-len-underflow-subspans.stderr rename to src/test/ui/consts/const-len-underflow-subspans.stderr diff --git a/src/test/ui/compile-fail-migration/const-match-check.eval1.stderr b/src/test/ui/consts/const-match-check.eval1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-match-check.eval1.stderr rename to src/test/ui/consts/const-match-check.eval1.stderr diff --git a/src/test/ui/compile-fail-migration/const-match-check.eval2.stderr b/src/test/ui/consts/const-match-check.eval2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-match-check.eval2.stderr rename to src/test/ui/consts/const-match-check.eval2.stderr diff --git a/src/test/ui/compile-fail-migration/const-match-check.matchck.stderr b/src/test/ui/consts/const-match-check.matchck.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-match-check.matchck.stderr rename to src/test/ui/consts/const-match-check.matchck.stderr diff --git a/src/test/ui/compile-fail-migration/const-match-check.rs b/src/test/ui/consts/const-match-check.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-match-check.rs rename to src/test/ui/consts/const-match-check.rs diff --git a/src/test/ui/compile-fail-migration/const-match-pattern-arm.rs b/src/test/ui/consts/const-match-pattern-arm.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-match-pattern-arm.rs rename to src/test/ui/consts/const-match-pattern-arm.rs diff --git a/src/test/ui/compile-fail-migration/const-match-pattern-arm.stderr b/src/test/ui/consts/const-match-pattern-arm.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-match-pattern-arm.stderr rename to src/test/ui/consts/const-match-pattern-arm.stderr diff --git a/src/test/ui/const-pattern-irrefutable.rs b/src/test/ui/consts/const-pattern-irrefutable.rs similarity index 100% rename from src/test/ui/const-pattern-irrefutable.rs rename to src/test/ui/consts/const-pattern-irrefutable.rs diff --git a/src/test/ui/const-pattern-irrefutable.stderr b/src/test/ui/consts/const-pattern-irrefutable.stderr similarity index 100% rename from src/test/ui/const-pattern-irrefutable.stderr rename to src/test/ui/consts/const-pattern-irrefutable.stderr diff --git a/src/test/ui/const-pattern-not-const-evaluable.rs b/src/test/ui/consts/const-pattern-not-const-evaluable.rs similarity index 100% rename from src/test/ui/const-pattern-not-const-evaluable.rs rename to src/test/ui/consts/const-pattern-not-const-evaluable.rs diff --git a/src/test/ui/compile-fail-migration/const-size_of-cycle.rs b/src/test/ui/consts/const-size_of-cycle.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-size_of-cycle.rs rename to src/test/ui/consts/const-size_of-cycle.rs diff --git a/src/test/ui/compile-fail-migration/const-size_of-cycle.stderr b/src/test/ui/consts/const-size_of-cycle.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-size_of-cycle.stderr rename to src/test/ui/consts/const-size_of-cycle.stderr diff --git a/src/test/ui/compile-fail-migration/const-slice-oob.rs b/src/test/ui/consts/const-slice-oob.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-slice-oob.rs rename to src/test/ui/consts/const-slice-oob.rs diff --git a/src/test/ui/compile-fail-migration/const-slice-oob.stderr b/src/test/ui/consts/const-slice-oob.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-slice-oob.stderr rename to src/test/ui/consts/const-slice-oob.stderr diff --git a/src/test/ui/compile-fail-migration/const-tup-index-span.rs b/src/test/ui/consts/const-tup-index-span.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-tup-index-span.rs rename to src/test/ui/consts/const-tup-index-span.rs diff --git a/src/test/ui/compile-fail-migration/const-tup-index-span.stderr b/src/test/ui/consts/const-tup-index-span.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-tup-index-span.stderr rename to src/test/ui/consts/const-tup-index-span.stderr diff --git a/src/test/ui/const-type-mismatch.rs b/src/test/ui/consts/const-type-mismatch.rs similarity index 100% rename from src/test/ui/const-type-mismatch.rs rename to src/test/ui/consts/const-type-mismatch.rs diff --git a/src/test/ui/const-type-mismatch.stderr b/src/test/ui/consts/const-type-mismatch.stderr similarity index 100% rename from src/test/ui/const-type-mismatch.stderr rename to src/test/ui/consts/const-type-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/const-typeid-of.rs b/src/test/ui/consts/const-typeid-of.rs similarity index 100% rename from src/test/ui/compile-fail-migration/const-typeid-of.rs rename to src/test/ui/consts/const-typeid-of.rs diff --git a/src/test/ui/compile-fail-migration/const-typeid-of.stderr b/src/test/ui/consts/const-typeid-of.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/const-typeid-of.stderr rename to src/test/ui/consts/const-typeid-of.stderr diff --git a/src/test/ui/const-unsized.rs b/src/test/ui/consts/const-unsized.rs similarity index 100% rename from src/test/ui/const-unsized.rs rename to src/test/ui/consts/const-unsized.rs diff --git a/src/test/ui/const-unsized.stderr b/src/test/ui/consts/const-unsized.stderr similarity index 100% rename from src/test/ui/const-unsized.stderr rename to src/test/ui/consts/const-unsized.stderr diff --git a/src/test/ui/compile-fail-migration/copy-a-resource.rs b/src/test/ui/copy-a-resource.rs similarity index 100% rename from src/test/ui/compile-fail-migration/copy-a-resource.rs rename to src/test/ui/copy-a-resource.rs diff --git a/src/test/ui/compile-fail-migration/copy-a-resource.stderr b/src/test/ui/copy-a-resource.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/copy-a-resource.stderr rename to src/test/ui/copy-a-resource.stderr diff --git a/src/test/ui/compile-fail-migration/crate-name-mismatch.rs b/src/test/ui/crate-name-mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/crate-name-mismatch.rs rename to src/test/ui/crate-name-mismatch.rs diff --git a/src/test/ui/compile-fail-migration/crate-name-mismatch.stderr b/src/test/ui/crate-name-mismatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/crate-name-mismatch.stderr rename to src/test/ui/crate-name-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/crateresolve1.nll.stderr b/src/test/ui/crateresolve1.nll.stderr similarity index 65% rename from src/test/ui/compile-fail-migration/crateresolve1.nll.stderr rename to src/test/ui/crateresolve1.nll.stderr index 536293e0a5d..c655d657aa0 100644 --- a/src/test/ui/compile-fail-migration/crateresolve1.nll.stderr +++ b/src/test/ui/crateresolve1.nll.stderr @@ -5,9 +5,9 @@ LL | extern crate crateresolve1; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: candidates: - crate `crateresolve1`: /home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/compile-fail-migration/crateresolve1.nll/auxiliary/libcrateresolve1-1.so - crate `crateresolve1`: /home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/compile-fail-migration/crateresolve1.nll/auxiliary/libcrateresolve1-3.so - crate `crateresolve1`: /home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/compile-fail-migration/crateresolve1.nll/auxiliary/libcrateresolve1-2.so + crate `crateresolve1`: /home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/crateresolve1.nll/auxiliary/libcrateresolve1-3.so + crate `crateresolve1`: /home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/crateresolve1.nll/auxiliary/libcrateresolve1-1.so + crate `crateresolve1`: /home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/crateresolve1.nll/auxiliary/libcrateresolve1-2.so error[E0463]: can't find crate for `crateresolve1` --> $DIR/crateresolve1.rs:16:1 diff --git a/src/test/ui/compile-fail-migration/crateresolve1.rs b/src/test/ui/crateresolve1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/crateresolve1.rs rename to src/test/ui/crateresolve1.rs diff --git a/src/test/ui/compile-fail-migration/crateresolve1.stderr b/src/test/ui/crateresolve1.stderr similarity index 66% rename from src/test/ui/compile-fail-migration/crateresolve1.stderr rename to src/test/ui/crateresolve1.stderr index 7dadcfe52ee..edd9a005932 100644 --- a/src/test/ui/compile-fail-migration/crateresolve1.stderr +++ b/src/test/ui/crateresolve1.stderr @@ -5,9 +5,9 @@ LL | extern crate crateresolve1; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: candidates: - crate `crateresolve1`: /home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/compile-fail-migration/crateresolve1/auxiliary/libcrateresolve1-1.so - crate `crateresolve1`: /home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/compile-fail-migration/crateresolve1/auxiliary/libcrateresolve1-3.so - crate `crateresolve1`: /home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/compile-fail-migration/crateresolve1/auxiliary/libcrateresolve1-2.so + crate `crateresolve1`: /home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/crateresolve1/auxiliary/libcrateresolve1-3.so + crate `crateresolve1`: /home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/crateresolve1/auxiliary/libcrateresolve1-1.so + crate `crateresolve1`: /home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/crateresolve1/auxiliary/libcrateresolve1-2.so error[E0463]: can't find crate for `crateresolve1` --> $DIR/crateresolve1.rs:16:1 diff --git a/src/test/ui/compile-fail-migration/cross-borrow-trait.rs b/src/test/ui/cross/cross-borrow-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cross-borrow-trait.rs rename to src/test/ui/cross/cross-borrow-trait.rs diff --git a/src/test/ui/compile-fail-migration/cross-borrow-trait.stderr b/src/test/ui/cross/cross-borrow-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cross-borrow-trait.stderr rename to src/test/ui/cross/cross-borrow-trait.stderr diff --git a/src/test/ui/cross-crate-macro-backtrace/auxiliary/extern_macro_crate.rs b/src/test/ui/cross/cross-crate-macro-backtrace/auxiliary/extern_macro_crate.rs similarity index 100% rename from src/test/ui/cross-crate-macro-backtrace/auxiliary/extern_macro_crate.rs rename to src/test/ui/cross/cross-crate-macro-backtrace/auxiliary/extern_macro_crate.rs diff --git a/src/test/ui/cross-crate-macro-backtrace/main.rs b/src/test/ui/cross/cross-crate-macro-backtrace/main.rs similarity index 100% rename from src/test/ui/cross-crate-macro-backtrace/main.rs rename to src/test/ui/cross/cross-crate-macro-backtrace/main.rs diff --git a/src/test/ui/cross-crate-macro-backtrace/main.stderr b/src/test/ui/cross/cross-crate-macro-backtrace/main.stderr similarity index 100% rename from src/test/ui/cross-crate-macro-backtrace/main.stderr rename to src/test/ui/cross/cross-crate-macro-backtrace/main.stderr diff --git a/src/test/ui/cross-file-errors/main.rs b/src/test/ui/cross/cross-file-errors/main.rs similarity index 100% rename from src/test/ui/cross-file-errors/main.rs rename to src/test/ui/cross/cross-file-errors/main.rs diff --git a/src/test/ui/cross-file-errors/main.stderr b/src/test/ui/cross/cross-file-errors/main.stderr similarity index 100% rename from src/test/ui/cross-file-errors/main.stderr rename to src/test/ui/cross/cross-file-errors/main.stderr diff --git a/src/test/ui/cross-file-errors/underscore.rs b/src/test/ui/cross/cross-file-errors/underscore.rs similarity index 100% rename from src/test/ui/cross-file-errors/underscore.rs rename to src/test/ui/cross/cross-file-errors/underscore.rs diff --git a/src/test/ui/compile-fail-migration/cross-fn-cache-hole.rs b/src/test/ui/cross/cross-fn-cache-hole.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cross-fn-cache-hole.rs rename to src/test/ui/cross/cross-fn-cache-hole.rs diff --git a/src/test/ui/compile-fail-migration/cross-fn-cache-hole.stderr b/src/test/ui/cross/cross-fn-cache-hole.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cross-fn-cache-hole.stderr rename to src/test/ui/cross/cross-fn-cache-hole.stderr diff --git a/src/test/ui/compile-fail-migration/custom_attribute.rs b/src/test/ui/custom_attribute.rs similarity index 100% rename from src/test/ui/compile-fail-migration/custom_attribute.rs rename to src/test/ui/custom_attribute.rs diff --git a/src/test/ui/compile-fail-migration/custom_attribute.stderr b/src/test/ui/custom_attribute.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/custom_attribute.stderr rename to src/test/ui/custom_attribute.stderr index 7d2a23b7054..4adfe1e450e 100644 --- a/src/test/ui/compile-fail-migration/custom_attribute.stderr +++ b/src/test/ui/custom_attribute.stderr @@ -1,3 +1,11 @@ +error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) + --> $DIR/custom_attribute.rs:13:1 + | +LL | #[foo] //~ ERROR The attribute `foo` + | ^^^^^^ + | + = help: add #![feature(custom_attribute)] to the crate attributes to enable + error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) --> $DIR/custom_attribute.rs:15:5 | @@ -14,14 +22,6 @@ LL | #[foo] //~ ERROR The attribute `foo` | = help: add #![feature(custom_attribute)] to the crate attributes to enable -error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642) - --> $DIR/custom_attribute.rs:13:1 - | -LL | #[foo] //~ ERROR The attribute `foo` - | ^^^^^^ - | - = help: add #![feature(custom_attribute)] to the crate attributes to enable - error: aborting due to 3 previous errors For more information about this error, try `rustc --explain E0658`. diff --git a/src/test/ui/compile-fail-migration/cycle-projection-based-on-where-clause.rs b/src/test/ui/cycle-projection-based-on-where-clause.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cycle-projection-based-on-where-clause.rs rename to src/test/ui/cycle-projection-based-on-where-clause.rs diff --git a/src/test/ui/compile-fail-migration/cycle-projection-based-on-where-clause.stderr b/src/test/ui/cycle-projection-based-on-where-clause.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cycle-projection-based-on-where-clause.stderr rename to src/test/ui/cycle-projection-based-on-where-clause.stderr diff --git a/src/test/ui/compile-fail-migration/cycle-trait-default-type-trait.rs b/src/test/ui/cycle-trait/cycle-trait-default-type-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cycle-trait-default-type-trait.rs rename to src/test/ui/cycle-trait/cycle-trait-default-type-trait.rs diff --git a/src/test/ui/compile-fail-migration/cycle-trait-default-type-trait.stderr b/src/test/ui/cycle-trait/cycle-trait-default-type-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cycle-trait-default-type-trait.stderr rename to src/test/ui/cycle-trait/cycle-trait-default-type-trait.stderr diff --git a/src/test/ui/compile-fail-migration/cycle-trait-supertrait-direct.rs b/src/test/ui/cycle-trait/cycle-trait-supertrait-direct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/cycle-trait-supertrait-direct.rs rename to src/test/ui/cycle-trait/cycle-trait-supertrait-direct.rs diff --git a/src/test/ui/compile-fail-migration/cycle-trait-supertrait-direct.stderr b/src/test/ui/cycle-trait/cycle-trait-supertrait-direct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/cycle-trait-supertrait-direct.stderr rename to src/test/ui/cycle-trait/cycle-trait-supertrait-direct.stderr diff --git a/src/test/ui/cycle-trait-supertrait-indirect.rs b/src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.rs similarity index 100% rename from src/test/ui/cycle-trait-supertrait-indirect.rs rename to src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.rs diff --git a/src/test/ui/cycle-trait-supertrait-indirect.stderr b/src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.stderr similarity index 100% rename from src/test/ui/cycle-trait-supertrait-indirect.stderr rename to src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.stderr diff --git a/src/test/ui/compile-fail-migration/dead-code-closure-bang.rs b/src/test/ui/dead-code-closure-bang.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dead-code-closure-bang.rs rename to src/test/ui/dead-code-closure-bang.rs diff --git a/src/test/ui/compile-fail-migration/dead-code-ret.rs b/src/test/ui/dead-code-ret.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dead-code-ret.rs rename to src/test/ui/dead-code-ret.rs diff --git a/src/test/ui/compile-fail-migration/dead-code-ret.stderr b/src/test/ui/dead-code-ret.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dead-code-ret.stderr rename to src/test/ui/dead-code-ret.stderr diff --git a/src/test/ui/compile-fail-migration/defaulted-never-note.rs b/src/test/ui/defaulted-never-note.rs similarity index 100% rename from src/test/ui/compile-fail-migration/defaulted-never-note.rs rename to src/test/ui/defaulted-never-note.rs diff --git a/src/test/ui/compile-fail-migration/defaulted-never-note.stderr b/src/test/ui/defaulted-never-note.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/defaulted-never-note.stderr rename to src/test/ui/defaulted-never-note.stderr diff --git a/src/test/ui/compile-fail-migration/dep-graph-assoc-type-codegen.rs b/src/test/ui/dep-graph/dep-graph-assoc-type-codegen.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dep-graph-assoc-type-codegen.rs rename to src/test/ui/dep-graph/dep-graph-assoc-type-codegen.rs diff --git a/src/test/ui/compile-fail-migration/dep-graph-assoc-type-codegen.stderr b/src/test/ui/dep-graph/dep-graph-assoc-type-codegen.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dep-graph-assoc-type-codegen.stderr rename to src/test/ui/dep-graph/dep-graph-assoc-type-codegen.stderr diff --git a/src/test/ui/compile-fail-migration/dep-graph-caller-callee.rs b/src/test/ui/dep-graph/dep-graph-caller-callee.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dep-graph-caller-callee.rs rename to src/test/ui/dep-graph/dep-graph-caller-callee.rs diff --git a/src/test/ui/compile-fail-migration/dep-graph-caller-callee.stderr b/src/test/ui/dep-graph/dep-graph-caller-callee.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dep-graph-caller-callee.stderr rename to src/test/ui/dep-graph/dep-graph-caller-callee.stderr diff --git a/src/test/ui/compile-fail-migration/dep-graph-struct-signature.rs b/src/test/ui/dep-graph/dep-graph-struct-signature.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dep-graph-struct-signature.rs rename to src/test/ui/dep-graph/dep-graph-struct-signature.rs diff --git a/src/test/ui/compile-fail-migration/dep-graph-struct-signature.stderr b/src/test/ui/dep-graph/dep-graph-struct-signature.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dep-graph-struct-signature.stderr rename to src/test/ui/dep-graph/dep-graph-struct-signature.stderr diff --git a/src/test/ui/compile-fail-migration/dep-graph-trait-impl-two-traits-same-method.rs b/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dep-graph-trait-impl-two-traits-same-method.rs rename to src/test/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.rs diff --git a/src/test/ui/compile-fail-migration/dep-graph-trait-impl-two-traits-same-method.stderr b/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dep-graph-trait-impl-two-traits-same-method.stderr rename to src/test/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.stderr diff --git a/src/test/ui/compile-fail-migration/dep-graph-trait-impl-two-traits.rs b/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dep-graph-trait-impl-two-traits.rs rename to src/test/ui/dep-graph/dep-graph-trait-impl-two-traits.rs diff --git a/src/test/ui/compile-fail-migration/dep-graph-trait-impl-two-traits.stderr b/src/test/ui/dep-graph/dep-graph-trait-impl-two-traits.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dep-graph-trait-impl-two-traits.stderr rename to src/test/ui/dep-graph/dep-graph-trait-impl-two-traits.stderr diff --git a/src/test/ui/compile-fail-migration/dep-graph-trait-impl.rs b/src/test/ui/dep-graph/dep-graph-trait-impl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dep-graph-trait-impl.rs rename to src/test/ui/dep-graph/dep-graph-trait-impl.rs diff --git a/src/test/ui/compile-fail-migration/dep-graph-trait-impl.stderr b/src/test/ui/dep-graph/dep-graph-trait-impl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dep-graph-trait-impl.stderr rename to src/test/ui/dep-graph/dep-graph-trait-impl.stderr diff --git a/src/test/ui/compile-fail-migration/dep-graph-type-alias.rs b/src/test/ui/dep-graph/dep-graph-type-alias.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dep-graph-type-alias.rs rename to src/test/ui/dep-graph/dep-graph-type-alias.rs diff --git a/src/test/ui/compile-fail-migration/dep-graph-type-alias.stderr b/src/test/ui/dep-graph/dep-graph-type-alias.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dep-graph-type-alias.stderr rename to src/test/ui/dep-graph/dep-graph-type-alias.stderr diff --git a/src/test/ui/compile-fail-migration/dep-graph-variance-alias.rs b/src/test/ui/dep-graph/dep-graph-variance-alias.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dep-graph-variance-alias.rs rename to src/test/ui/dep-graph/dep-graph-variance-alias.rs diff --git a/src/test/ui/compile-fail-migration/dep-graph-variance-alias.stderr b/src/test/ui/dep-graph/dep-graph-variance-alias.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dep-graph-variance-alias.stderr rename to src/test/ui/dep-graph/dep-graph-variance-alias.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/deprecation-lint.rs b/src/test/ui/deprecation/auxiliary/deprecation-lint.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/deprecation-lint.rs rename to src/test/ui/deprecation/auxiliary/deprecation-lint.rs diff --git a/src/test/ui/deprecated-macro_escape-inner.rs b/src/test/ui/deprecation/deprecated-macro_escape-inner.rs similarity index 100% rename from src/test/ui/deprecated-macro_escape-inner.rs rename to src/test/ui/deprecation/deprecated-macro_escape-inner.rs diff --git a/src/test/ui/deprecated-macro_escape-inner.stderr b/src/test/ui/deprecation/deprecated-macro_escape-inner.stderr similarity index 100% rename from src/test/ui/deprecated-macro_escape-inner.stderr rename to src/test/ui/deprecation/deprecated-macro_escape-inner.stderr diff --git a/src/test/ui/deprecated-macro_escape.rs b/src/test/ui/deprecation/deprecated-macro_escape.rs similarity index 100% rename from src/test/ui/deprecated-macro_escape.rs rename to src/test/ui/deprecation/deprecated-macro_escape.rs diff --git a/src/test/ui/deprecated-macro_escape.stderr b/src/test/ui/deprecation/deprecated-macro_escape.stderr similarity index 100% rename from src/test/ui/deprecated-macro_escape.stderr rename to src/test/ui/deprecation/deprecated-macro_escape.stderr diff --git a/src/test/ui/compile-fail-migration/deprecated_no_stack_check.rs b/src/test/ui/deprecation/deprecated_no_stack_check.rs similarity index 100% rename from src/test/ui/compile-fail-migration/deprecated_no_stack_check.rs rename to src/test/ui/deprecation/deprecated_no_stack_check.rs diff --git a/src/test/ui/compile-fail-migration/deprecated_no_stack_check.stderr b/src/test/ui/deprecation/deprecated_no_stack_check.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/deprecated_no_stack_check.stderr rename to src/test/ui/deprecation/deprecated_no_stack_check.stderr diff --git a/src/test/ui/compile-fail-migration/deprecation-in-staged-api.rs b/src/test/ui/deprecation/deprecation-in-staged-api.rs similarity index 100% rename from src/test/ui/compile-fail-migration/deprecation-in-staged-api.rs rename to src/test/ui/deprecation/deprecation-in-staged-api.rs diff --git a/src/test/ui/compile-fail-migration/deprecation-in-staged-api.stderr b/src/test/ui/deprecation/deprecation-in-staged-api.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/deprecation-in-staged-api.stderr rename to src/test/ui/deprecation/deprecation-in-staged-api.stderr diff --git a/src/test/ui/compile-fail-migration/deprecation-lint-2.rs b/src/test/ui/deprecation/deprecation-lint-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/deprecation-lint-2.rs rename to src/test/ui/deprecation/deprecation-lint-2.rs diff --git a/src/test/ui/compile-fail-migration/deprecation-lint-2.stderr b/src/test/ui/deprecation/deprecation-lint-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/deprecation-lint-2.stderr rename to src/test/ui/deprecation/deprecation-lint-2.stderr diff --git a/src/test/ui/compile-fail-migration/deprecation-lint-3.rs b/src/test/ui/deprecation/deprecation-lint-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/deprecation-lint-3.rs rename to src/test/ui/deprecation/deprecation-lint-3.rs diff --git a/src/test/ui/compile-fail-migration/deprecation-lint-3.stderr b/src/test/ui/deprecation/deprecation-lint-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/deprecation-lint-3.stderr rename to src/test/ui/deprecation/deprecation-lint-3.stderr diff --git a/src/test/ui/compile-fail-migration/deprecation-lint-nested.rs b/src/test/ui/deprecation/deprecation-lint-nested.rs similarity index 100% rename from src/test/ui/compile-fail-migration/deprecation-lint-nested.rs rename to src/test/ui/deprecation/deprecation-lint-nested.rs diff --git a/src/test/ui/compile-fail-migration/deprecation-lint-nested.stderr b/src/test/ui/deprecation/deprecation-lint-nested.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/deprecation-lint-nested.stderr rename to src/test/ui/deprecation/deprecation-lint-nested.stderr diff --git a/src/test/ui/compile-fail-migration/deprecation-lint.rs b/src/test/ui/deprecation/deprecation-lint.rs similarity index 100% rename from src/test/ui/compile-fail-migration/deprecation-lint.rs rename to src/test/ui/deprecation/deprecation-lint.rs diff --git a/src/test/ui/compile-fail-migration/deprecation-lint.stderr b/src/test/ui/deprecation/deprecation-lint.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/deprecation-lint.stderr rename to src/test/ui/deprecation/deprecation-lint.stderr diff --git a/src/test/ui/deprecation-sanity.rs b/src/test/ui/deprecation/deprecation-sanity.rs similarity index 100% rename from src/test/ui/deprecation-sanity.rs rename to src/test/ui/deprecation/deprecation-sanity.rs diff --git a/src/test/ui/deprecation-sanity.stderr b/src/test/ui/deprecation/deprecation-sanity.stderr similarity index 100% rename from src/test/ui/deprecation-sanity.stderr rename to src/test/ui/deprecation/deprecation-sanity.stderr diff --git a/src/test/ui/compile-fail-migration/deref-non-pointer.rs b/src/test/ui/deref-non-pointer.rs similarity index 100% rename from src/test/ui/compile-fail-migration/deref-non-pointer.rs rename to src/test/ui/deref-non-pointer.rs diff --git a/src/test/ui/compile-fail-migration/deref-non-pointer.stderr b/src/test/ui/deref-non-pointer.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/deref-non-pointer.stderr rename to src/test/ui/deref-non-pointer.stderr diff --git a/src/test/ui/compile-fail-migration/derived-errors/issue-30580.rs b/src/test/ui/derived-errors/issue-30580.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derived-errors/issue-30580.rs rename to src/test/ui/derived-errors/issue-30580.rs diff --git a/src/test/ui/compile-fail-migration/derived-errors/issue-30580.stderr b/src/test/ui/derived-errors/issue-30580.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derived-errors/issue-30580.stderr rename to src/test/ui/derived-errors/issue-30580.stderr diff --git a/src/test/ui/compile-fail-migration/derived-errors/issue-31997.rs b/src/test/ui/derived-errors/issue-31997.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derived-errors/issue-31997.rs rename to src/test/ui/derived-errors/issue-31997.rs diff --git a/src/test/ui/compile-fail-migration/derived-errors/issue-31997.stderr b/src/test/ui/derived-errors/issue-31997.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derived-errors/issue-31997.stderr rename to src/test/ui/derived-errors/issue-31997.stderr diff --git a/src/test/ui/compile-fail-migration/derive-assoc-type-not-impl.rs b/src/test/ui/derives/derive-assoc-type-not-impl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derive-assoc-type-not-impl.rs rename to src/test/ui/derives/derive-assoc-type-not-impl.rs diff --git a/src/test/ui/compile-fail-migration/derive-assoc-type-not-impl.stderr b/src/test/ui/derives/derive-assoc-type-not-impl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derive-assoc-type-not-impl.stderr rename to src/test/ui/derives/derive-assoc-type-not-impl.stderr diff --git a/src/test/ui/compile-fail-migration/derive-on-trait-item-or-impl-item.rs b/src/test/ui/derives/derive-on-trait-item-or-impl-item.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derive-on-trait-item-or-impl-item.rs rename to src/test/ui/derives/derive-on-trait-item-or-impl-item.rs diff --git a/src/test/ui/compile-fail-migration/derive-on-trait-item-or-impl-item.stderr b/src/test/ui/derives/derive-on-trait-item-or-impl-item.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derive-on-trait-item-or-impl-item.stderr rename to src/test/ui/derives/derive-on-trait-item-or-impl-item.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Clone-enum-struct-variant.rs b/src/test/ui/derives/derives-span-Clone-enum-struct-variant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Clone-enum-struct-variant.rs rename to src/test/ui/derives/derives-span-Clone-enum-struct-variant.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Clone-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-Clone-enum-struct-variant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Clone-enum-struct-variant.stderr rename to src/test/ui/derives/derives-span-Clone-enum-struct-variant.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Clone-enum.rs b/src/test/ui/derives/derives-span-Clone-enum.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Clone-enum.rs rename to src/test/ui/derives/derives-span-Clone-enum.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Clone-enum.stderr b/src/test/ui/derives/derives-span-Clone-enum.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Clone-enum.stderr rename to src/test/ui/derives/derives-span-Clone-enum.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Clone-struct.rs b/src/test/ui/derives/derives-span-Clone-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Clone-struct.rs rename to src/test/ui/derives/derives-span-Clone-struct.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Clone-struct.stderr b/src/test/ui/derives/derives-span-Clone-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Clone-struct.stderr rename to src/test/ui/derives/derives-span-Clone-struct.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Clone-tuple-struct.rs b/src/test/ui/derives/derives-span-Clone-tuple-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Clone-tuple-struct.rs rename to src/test/ui/derives/derives-span-Clone-tuple-struct.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Clone-tuple-struct.stderr b/src/test/ui/derives/derives-span-Clone-tuple-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Clone-tuple-struct.stderr rename to src/test/ui/derives/derives-span-Clone-tuple-struct.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Debug-enum-struct-variant.rs b/src/test/ui/derives/derives-span-Debug-enum-struct-variant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Debug-enum-struct-variant.rs rename to src/test/ui/derives/derives-span-Debug-enum-struct-variant.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Debug-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-Debug-enum-struct-variant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Debug-enum-struct-variant.stderr rename to src/test/ui/derives/derives-span-Debug-enum-struct-variant.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Debug-enum.rs b/src/test/ui/derives/derives-span-Debug-enum.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Debug-enum.rs rename to src/test/ui/derives/derives-span-Debug-enum.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Debug-enum.stderr b/src/test/ui/derives/derives-span-Debug-enum.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Debug-enum.stderr rename to src/test/ui/derives/derives-span-Debug-enum.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Debug-struct.rs b/src/test/ui/derives/derives-span-Debug-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Debug-struct.rs rename to src/test/ui/derives/derives-span-Debug-struct.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Debug-struct.stderr b/src/test/ui/derives/derives-span-Debug-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Debug-struct.stderr rename to src/test/ui/derives/derives-span-Debug-struct.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Debug-tuple-struct.rs b/src/test/ui/derives/derives-span-Debug-tuple-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Debug-tuple-struct.rs rename to src/test/ui/derives/derives-span-Debug-tuple-struct.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Debug-tuple-struct.stderr b/src/test/ui/derives/derives-span-Debug-tuple-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Debug-tuple-struct.stderr rename to src/test/ui/derives/derives-span-Debug-tuple-struct.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Default-struct.rs b/src/test/ui/derives/derives-span-Default-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Default-struct.rs rename to src/test/ui/derives/derives-span-Default-struct.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Default-struct.stderr b/src/test/ui/derives/derives-span-Default-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Default-struct.stderr rename to src/test/ui/derives/derives-span-Default-struct.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Default-tuple-struct.rs b/src/test/ui/derives/derives-span-Default-tuple-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Default-tuple-struct.rs rename to src/test/ui/derives/derives-span-Default-tuple-struct.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Default-tuple-struct.stderr b/src/test/ui/derives/derives-span-Default-tuple-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Default-tuple-struct.stderr rename to src/test/ui/derives/derives-span-Default-tuple-struct.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Eq-enum-struct-variant.rs b/src/test/ui/derives/derives-span-Eq-enum-struct-variant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Eq-enum-struct-variant.rs rename to src/test/ui/derives/derives-span-Eq-enum-struct-variant.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Eq-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-Eq-enum-struct-variant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Eq-enum-struct-variant.stderr rename to src/test/ui/derives/derives-span-Eq-enum-struct-variant.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Eq-enum.rs b/src/test/ui/derives/derives-span-Eq-enum.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Eq-enum.rs rename to src/test/ui/derives/derives-span-Eq-enum.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Eq-enum.stderr b/src/test/ui/derives/derives-span-Eq-enum.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Eq-enum.stderr rename to src/test/ui/derives/derives-span-Eq-enum.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Eq-struct.rs b/src/test/ui/derives/derives-span-Eq-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Eq-struct.rs rename to src/test/ui/derives/derives-span-Eq-struct.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Eq-struct.stderr b/src/test/ui/derives/derives-span-Eq-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Eq-struct.stderr rename to src/test/ui/derives/derives-span-Eq-struct.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Eq-tuple-struct.rs b/src/test/ui/derives/derives-span-Eq-tuple-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Eq-tuple-struct.rs rename to src/test/ui/derives/derives-span-Eq-tuple-struct.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Eq-tuple-struct.stderr b/src/test/ui/derives/derives-span-Eq-tuple-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Eq-tuple-struct.stderr rename to src/test/ui/derives/derives-span-Eq-tuple-struct.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Hash-enum-struct-variant.rs b/src/test/ui/derives/derives-span-Hash-enum-struct-variant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Hash-enum-struct-variant.rs rename to src/test/ui/derives/derives-span-Hash-enum-struct-variant.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Hash-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Hash-enum-struct-variant.stderr rename to src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Hash-enum.rs b/src/test/ui/derives/derives-span-Hash-enum.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Hash-enum.rs rename to src/test/ui/derives/derives-span-Hash-enum.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Hash-enum.stderr b/src/test/ui/derives/derives-span-Hash-enum.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Hash-enum.stderr rename to src/test/ui/derives/derives-span-Hash-enum.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Hash-struct.rs b/src/test/ui/derives/derives-span-Hash-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Hash-struct.rs rename to src/test/ui/derives/derives-span-Hash-struct.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Hash-struct.stderr b/src/test/ui/derives/derives-span-Hash-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Hash-struct.stderr rename to src/test/ui/derives/derives-span-Hash-struct.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Hash-tuple-struct.rs b/src/test/ui/derives/derives-span-Hash-tuple-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Hash-tuple-struct.rs rename to src/test/ui/derives/derives-span-Hash-tuple-struct.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Hash-tuple-struct.stderr b/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Hash-tuple-struct.stderr rename to src/test/ui/derives/derives-span-Hash-tuple-struct.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Ord-enum-struct-variant.rs b/src/test/ui/derives/derives-span-Ord-enum-struct-variant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Ord-enum-struct-variant.rs rename to src/test/ui/derives/derives-span-Ord-enum-struct-variant.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Ord-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-Ord-enum-struct-variant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Ord-enum-struct-variant.stderr rename to src/test/ui/derives/derives-span-Ord-enum-struct-variant.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Ord-enum.rs b/src/test/ui/derives/derives-span-Ord-enum.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Ord-enum.rs rename to src/test/ui/derives/derives-span-Ord-enum.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Ord-enum.stderr b/src/test/ui/derives/derives-span-Ord-enum.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Ord-enum.stderr rename to src/test/ui/derives/derives-span-Ord-enum.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Ord-struct.rs b/src/test/ui/derives/derives-span-Ord-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Ord-struct.rs rename to src/test/ui/derives/derives-span-Ord-struct.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Ord-struct.stderr b/src/test/ui/derives/derives-span-Ord-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Ord-struct.stderr rename to src/test/ui/derives/derives-span-Ord-struct.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-Ord-tuple-struct.rs b/src/test/ui/derives/derives-span-Ord-tuple-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Ord-tuple-struct.rs rename to src/test/ui/derives/derives-span-Ord-tuple-struct.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-Ord-tuple-struct.stderr b/src/test/ui/derives/derives-span-Ord-tuple-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-Ord-tuple-struct.stderr rename to src/test/ui/derives/derives-span-Ord-tuple-struct.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialEq-enum-struct-variant.rs b/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-PartialEq-enum-struct-variant.rs rename to src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialEq-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-PartialEq-enum-struct-variant.stderr rename to src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialEq-enum.rs b/src/test/ui/derives/derives-span-PartialEq-enum.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-PartialEq-enum.rs rename to src/test/ui/derives/derives-span-PartialEq-enum.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialEq-enum.stderr b/src/test/ui/derives/derives-span-PartialEq-enum.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-PartialEq-enum.stderr rename to src/test/ui/derives/derives-span-PartialEq-enum.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialEq-struct.rs b/src/test/ui/derives/derives-span-PartialEq-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-PartialEq-struct.rs rename to src/test/ui/derives/derives-span-PartialEq-struct.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialEq-struct.stderr b/src/test/ui/derives/derives-span-PartialEq-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-PartialEq-struct.stderr rename to src/test/ui/derives/derives-span-PartialEq-struct.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialEq-tuple-struct.rs b/src/test/ui/derives/derives-span-PartialEq-tuple-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-PartialEq-tuple-struct.rs rename to src/test/ui/derives/derives-span-PartialEq-tuple-struct.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialEq-tuple-struct.stderr b/src/test/ui/derives/derives-span-PartialEq-tuple-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-PartialEq-tuple-struct.stderr rename to src/test/ui/derives/derives-span-PartialEq-tuple-struct.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialOrd-enum-struct-variant.rs b/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-PartialOrd-enum-struct-variant.rs rename to src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialOrd-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-PartialOrd-enum-struct-variant.stderr rename to src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialOrd-enum.rs b/src/test/ui/derives/derives-span-PartialOrd-enum.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-PartialOrd-enum.rs rename to src/test/ui/derives/derives-span-PartialOrd-enum.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialOrd-enum.stderr b/src/test/ui/derives/derives-span-PartialOrd-enum.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-PartialOrd-enum.stderr rename to src/test/ui/derives/derives-span-PartialOrd-enum.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialOrd-struct.rs b/src/test/ui/derives/derives-span-PartialOrd-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-PartialOrd-struct.rs rename to src/test/ui/derives/derives-span-PartialOrd-struct.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialOrd-struct.stderr b/src/test/ui/derives/derives-span-PartialOrd-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-PartialOrd-struct.stderr rename to src/test/ui/derives/derives-span-PartialOrd-struct.stderr diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialOrd-tuple-struct.rs b/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-PartialOrd-tuple-struct.rs rename to src/test/ui/derives/derives-span-PartialOrd-tuple-struct.rs diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialOrd-tuple-struct.stderr b/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/derives-span-PartialOrd-tuple-struct.stderr rename to src/test/ui/derives/derives-span-PartialOrd-tuple-struct.stderr diff --git a/src/test/ui/compile-fail-migration/deriving-bounds.rs b/src/test/ui/derives/deriving-bounds.rs similarity index 100% rename from src/test/ui/compile-fail-migration/deriving-bounds.rs rename to src/test/ui/derives/deriving-bounds.rs diff --git a/src/test/ui/compile-fail-migration/deriving-bounds.stderr b/src/test/ui/derives/deriving-bounds.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/deriving-bounds.stderr rename to src/test/ui/derives/deriving-bounds.stderr diff --git a/src/test/ui/compile-fail-migration/deriving-copyclone.rs b/src/test/ui/derives/deriving-copyclone.rs similarity index 100% rename from src/test/ui/compile-fail-migration/deriving-copyclone.rs rename to src/test/ui/derives/deriving-copyclone.rs diff --git a/src/test/ui/compile-fail-migration/deriving-copyclone.stderr b/src/test/ui/derives/deriving-copyclone.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/deriving-copyclone.stderr rename to src/test/ui/derives/deriving-copyclone.stderr diff --git a/src/test/ui/deriving-meta-empty-trait-list.rs b/src/test/ui/derives/deriving-meta-empty-trait-list.rs similarity index 100% rename from src/test/ui/deriving-meta-empty-trait-list.rs rename to src/test/ui/derives/deriving-meta-empty-trait-list.rs diff --git a/src/test/ui/deriving-meta-empty-trait-list.stderr b/src/test/ui/derives/deriving-meta-empty-trait-list.stderr similarity index 100% rename from src/test/ui/deriving-meta-empty-trait-list.stderr rename to src/test/ui/derives/deriving-meta-empty-trait-list.stderr diff --git a/src/test/ui/compile-fail-migration/deriving-meta-unknown-trait.rs b/src/test/ui/derives/deriving-meta-unknown-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/deriving-meta-unknown-trait.rs rename to src/test/ui/derives/deriving-meta-unknown-trait.rs diff --git a/src/test/ui/compile-fail-migration/deriving-meta-unknown-trait.stderr b/src/test/ui/derives/deriving-meta-unknown-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/deriving-meta-unknown-trait.stderr rename to src/test/ui/derives/deriving-meta-unknown-trait.stderr diff --git a/src/test/ui/compile-fail-migration/deriving-no-inner-impl-error-message.rs b/src/test/ui/derives/deriving-no-inner-impl-error-message.rs similarity index 100% rename from src/test/ui/compile-fail-migration/deriving-no-inner-impl-error-message.rs rename to src/test/ui/derives/deriving-no-inner-impl-error-message.rs diff --git a/src/test/ui/compile-fail-migration/deriving-no-inner-impl-error-message.stderr b/src/test/ui/derives/deriving-no-inner-impl-error-message.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/deriving-no-inner-impl-error-message.stderr rename to src/test/ui/derives/deriving-no-inner-impl-error-message.stderr diff --git a/src/test/ui/compile-fail-migration/deriving-non-type.rs b/src/test/ui/derives/deriving-non-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/deriving-non-type.rs rename to src/test/ui/derives/deriving-non-type.rs diff --git a/src/test/ui/compile-fail-migration/deriving-non-type.stderr b/src/test/ui/derives/deriving-non-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/deriving-non-type.stderr rename to src/test/ui/derives/deriving-non-type.stderr diff --git a/src/test/ui/compile-fail-migration/deriving-primitive.rs b/src/test/ui/derives/deriving-primitive.rs similarity index 100% rename from src/test/ui/compile-fail-migration/deriving-primitive.rs rename to src/test/ui/derives/deriving-primitive.rs diff --git a/src/test/ui/compile-fail-migration/deriving-primitive.stderr b/src/test/ui/derives/deriving-primitive.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/deriving-primitive.stderr rename to src/test/ui/derives/deriving-primitive.stderr diff --git a/src/test/ui/deriving-with-repr-packed.rs b/src/test/ui/derives/deriving-with-repr-packed.rs similarity index 100% rename from src/test/ui/deriving-with-repr-packed.rs rename to src/test/ui/derives/deriving-with-repr-packed.rs diff --git a/src/test/ui/deriving-with-repr-packed.stderr b/src/test/ui/derives/deriving-with-repr-packed.stderr similarity index 100% rename from src/test/ui/deriving-with-repr-packed.stderr rename to src/test/ui/derives/deriving-with-repr-packed.stderr diff --git a/src/test/ui/compile-fail-migration/destructure-trait-ref.rs b/src/test/ui/destructure-trait-ref.rs similarity index 100% rename from src/test/ui/compile-fail-migration/destructure-trait-ref.rs rename to src/test/ui/destructure-trait-ref.rs diff --git a/src/test/ui/compile-fail-migration/destructure-trait-ref.stderr b/src/test/ui/destructure-trait-ref.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/destructure-trait-ref.stderr rename to src/test/ui/destructure-trait-ref.stderr diff --git a/src/test/ui/compile-fail-migration/directory_ownership/foo/compiletest-ignore-dir b/src/test/ui/directory_ownership/foo/compiletest-ignore-dir similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/foo/compiletest-ignore-dir rename to src/test/ui/directory_ownership/foo/compiletest-ignore-dir diff --git a/src/test/ui/compile-fail-migration/directory_ownership/foo/mod_file_not_owning/aux2.rs b/src/test/ui/directory_ownership/foo/mod_file_not_owning/aux2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/foo/mod_file_not_owning/aux2.rs rename to src/test/ui/directory_ownership/foo/mod_file_not_owning/aux2.rs diff --git a/src/test/ui/compile-fail-migration/directory_ownership/foo/mod_file_not_owning_aux2.rs b/src/test/ui/directory_ownership/foo/mod_file_not_owning_aux2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/foo/mod_file_not_owning_aux2.rs rename to src/test/ui/directory_ownership/foo/mod_file_not_owning_aux2.rs diff --git a/src/test/ui/compile-fail-migration/directory_ownership/macro-expanded-mod.rs b/src/test/ui/directory_ownership/macro-expanded-mod.rs similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/macro-expanded-mod.rs rename to src/test/ui/directory_ownership/macro-expanded-mod.rs diff --git a/src/test/ui/compile-fail-migration/directory_ownership/macro-expanded-mod.stderr b/src/test/ui/directory_ownership/macro-expanded-mod.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/macro-expanded-mod.stderr rename to src/test/ui/directory_ownership/macro-expanded-mod.stderr diff --git a/src/test/ui/compile-fail-migration/directory_ownership/macro_expanded_mod_helper/foo/bar.rs b/src/test/ui/directory_ownership/macro_expanded_mod_helper/foo/bar.rs similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/macro_expanded_mod_helper/foo/bar.rs rename to src/test/ui/directory_ownership/macro_expanded_mod_helper/foo/bar.rs diff --git a/src/test/ui/compile-fail-migration/directory_ownership/macro_expanded_mod_helper/foo/mod.rs b/src/test/ui/directory_ownership/macro_expanded_mod_helper/foo/mod.rs similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/macro_expanded_mod_helper/foo/mod.rs rename to src/test/ui/directory_ownership/macro_expanded_mod_helper/foo/mod.rs diff --git a/src/test/ui/compile-fail-migration/directory_ownership/mod_file_not_owning.rs b/src/test/ui/directory_ownership/mod_file_not_owning.rs similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/mod_file_not_owning.rs rename to src/test/ui/directory_ownership/mod_file_not_owning.rs diff --git a/src/test/ui/compile-fail-migration/directory_ownership/mod_file_not_owning.stderr b/src/test/ui/directory_ownership/mod_file_not_owning.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/mod_file_not_owning.stderr rename to src/test/ui/directory_ownership/mod_file_not_owning.stderr diff --git a/src/test/ui/compile-fail-migration/directory_ownership/mod_file_not_owning_aux1.rs b/src/test/ui/directory_ownership/mod_file_not_owning_aux1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/mod_file_not_owning_aux1.rs rename to src/test/ui/directory_ownership/mod_file_not_owning_aux1.rs diff --git a/src/test/ui/compile-fail-migration/directory_ownership/mod_file_not_owning_aux1/compiletest-ignore-dir b/src/test/ui/directory_ownership/mod_file_not_owning_aux1/compiletest-ignore-dir similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/mod_file_not_owning_aux1/compiletest-ignore-dir rename to src/test/ui/directory_ownership/mod_file_not_owning_aux1/compiletest-ignore-dir diff --git a/src/test/ui/compile-fail-migration/directory_ownership/mod_file_not_owning_aux1/mod_file_not_owning_aux2.rs b/src/test/ui/directory_ownership/mod_file_not_owning_aux1/mod_file_not_owning_aux2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/mod_file_not_owning_aux1/mod_file_not_owning_aux2.rs rename to src/test/ui/directory_ownership/mod_file_not_owning_aux1/mod_file_not_owning_aux2.rs diff --git a/src/test/ui/compile-fail-migration/directory_ownership/mod_file_not_owning_aux2.rs b/src/test/ui/directory_ownership/mod_file_not_owning_aux2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/mod_file_not_owning_aux2.rs rename to src/test/ui/directory_ownership/mod_file_not_owning_aux2.rs diff --git a/src/test/ui/compile-fail-migration/directory_ownership/mod_file_not_owning_aux3.rs b/src/test/ui/directory_ownership/mod_file_not_owning_aux3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/mod_file_not_owning_aux3.rs rename to src/test/ui/directory_ownership/mod_file_not_owning_aux3.rs diff --git a/src/test/ui/compile-fail-migration/directory_ownership/non-inline-mod-restriction.rs b/src/test/ui/directory_ownership/non-inline-mod-restriction.rs similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/non-inline-mod-restriction.rs rename to src/test/ui/directory_ownership/non-inline-mod-restriction.rs diff --git a/src/test/ui/compile-fail-migration/directory_ownership/non-inline-mod-restriction.stderr b/src/test/ui/directory_ownership/non-inline-mod-restriction.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/non-inline-mod-restriction.stderr rename to src/test/ui/directory_ownership/non-inline-mod-restriction.stderr diff --git a/src/test/ui/compile-fail-migration/directory_ownership/unowned_mod_with_path.rs b/src/test/ui/directory_ownership/unowned_mod_with_path.rs similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/unowned_mod_with_path.rs rename to src/test/ui/directory_ownership/unowned_mod_with_path.rs diff --git a/src/test/ui/compile-fail-migration/directory_ownership/unowned_mod_with_path.stderr b/src/test/ui/directory_ownership/unowned_mod_with_path.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/directory_ownership/unowned_mod_with_path.stderr rename to src/test/ui/directory_ownership/unowned_mod_with_path.stderr diff --git a/src/test/ui/compile-fail-migration/disallowed-deconstructing-destructing-struct-let.nll.stderr b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/disallowed-deconstructing-destructing-struct-let.nll.stderr rename to src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.nll.stderr diff --git a/src/test/ui/compile-fail-migration/disallowed-deconstructing-destructing-struct-let.rs b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.rs similarity index 100% rename from src/test/ui/compile-fail-migration/disallowed-deconstructing-destructing-struct-let.rs rename to src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.rs diff --git a/src/test/ui/compile-fail-migration/disallowed-deconstructing-destructing-struct-let.stderr b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/disallowed-deconstructing-destructing-struct-let.stderr rename to src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-let.stderr diff --git a/src/test/ui/compile-fail-migration/disallowed-deconstructing-destructing-struct-match.nll.stderr b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/disallowed-deconstructing-destructing-struct-match.nll.stderr rename to src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.nll.stderr diff --git a/src/test/ui/compile-fail-migration/disallowed-deconstructing-destructing-struct-match.rs b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.rs similarity index 100% rename from src/test/ui/compile-fail-migration/disallowed-deconstructing-destructing-struct-match.rs rename to src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.rs diff --git a/src/test/ui/compile-fail-migration/disallowed-deconstructing-destructing-struct-match.stderr b/src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/disallowed-deconstructing-destructing-struct-match.stderr rename to src/test/ui/disallowed-deconstructing/disallowed-deconstructing-destructing-struct-match.stderr diff --git a/src/test/ui/compile-fail-migration/discrim-ill-typed.rs b/src/test/ui/discrim/discrim-ill-typed.rs similarity index 100% rename from src/test/ui/compile-fail-migration/discrim-ill-typed.rs rename to src/test/ui/discrim/discrim-ill-typed.rs diff --git a/src/test/ui/compile-fail-migration/discrim-ill-typed.stderr b/src/test/ui/discrim/discrim-ill-typed.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/discrim-ill-typed.stderr rename to src/test/ui/discrim/discrim-ill-typed.stderr diff --git a/src/test/ui/discrim-overflow-2.rs b/src/test/ui/discrim/discrim-overflow-2.rs similarity index 100% rename from src/test/ui/discrim-overflow-2.rs rename to src/test/ui/discrim/discrim-overflow-2.rs diff --git a/src/test/ui/discrim-overflow-2.stderr b/src/test/ui/discrim/discrim-overflow-2.stderr similarity index 100% rename from src/test/ui/discrim-overflow-2.stderr rename to src/test/ui/discrim/discrim-overflow-2.stderr diff --git a/src/test/ui/discrim-overflow.rs b/src/test/ui/discrim/discrim-overflow.rs similarity index 100% rename from src/test/ui/discrim-overflow.rs rename to src/test/ui/discrim/discrim-overflow.rs diff --git a/src/test/ui/discrim-overflow.stderr b/src/test/ui/discrim/discrim-overflow.stderr similarity index 100% rename from src/test/ui/discrim-overflow.stderr rename to src/test/ui/discrim/discrim-overflow.stderr diff --git a/src/test/ui/compile-fail-migration/diverging-fn-tail-35849.rs b/src/test/ui/diverging-fn-tail-35849.rs similarity index 100% rename from src/test/ui/compile-fail-migration/diverging-fn-tail-35849.rs rename to src/test/ui/diverging-fn-tail-35849.rs diff --git a/src/test/ui/compile-fail-migration/diverging-fn-tail-35849.stderr b/src/test/ui/diverging-fn-tail-35849.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/diverging-fn-tail-35849.stderr rename to src/test/ui/diverging-fn-tail-35849.stderr diff --git a/src/test/ui/compile-fail-migration/diverging-tuple-parts-39485.rs b/src/test/ui/diverging-tuple-parts-39485.rs similarity index 100% rename from src/test/ui/compile-fail-migration/diverging-tuple-parts-39485.rs rename to src/test/ui/diverging-tuple-parts-39485.rs diff --git a/src/test/ui/compile-fail-migration/diverging-tuple-parts-39485.stderr b/src/test/ui/diverging-tuple-parts-39485.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/diverging-tuple-parts-39485.stderr rename to src/test/ui/diverging-tuple-parts-39485.stderr diff --git a/src/test/ui/compile-fail-migration/does-nothing.rs b/src/test/ui/does-nothing.rs similarity index 100% rename from src/test/ui/compile-fail-migration/does-nothing.rs rename to src/test/ui/does-nothing.rs diff --git a/src/test/ui/compile-fail-migration/does-nothing.stderr b/src/test/ui/does-nothing.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/does-nothing.stderr rename to src/test/ui/does-nothing.stderr diff --git a/src/test/ui/compile-fail-migration/dollar-crate-is-keyword-2.rs b/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dollar-crate-is-keyword-2.rs rename to src/test/ui/dollar-crate/dollar-crate-is-keyword-2.rs diff --git a/src/test/ui/compile-fail-migration/dollar-crate-is-keyword-2.stderr b/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dollar-crate-is-keyword-2.stderr rename to src/test/ui/dollar-crate/dollar-crate-is-keyword-2.stderr diff --git a/src/test/ui/compile-fail-migration/dollar-crate-is-keyword.rs b/src/test/ui/dollar-crate/dollar-crate-is-keyword.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dollar-crate-is-keyword.rs rename to src/test/ui/dollar-crate/dollar-crate-is-keyword.rs diff --git a/src/test/ui/compile-fail-migration/dollar-crate-is-keyword.stderr b/src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr similarity index 74% rename from src/test/ui/compile-fail-migration/dollar-crate-is-keyword.stderr rename to src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr index a9898973393..77f4ef33949 100644 --- a/src/test/ui/compile-fail-migration/dollar-crate-is-keyword.stderr +++ b/src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr @@ -1,14 +1,14 @@ error: expected identifier, found reserved identifier `$crate` - --> $DIR/dollar-crate-is-keyword.rs:13:16 + --> $DIR/dollar-crate-is-keyword.rs:16:20 | -LL | struct $crate {} //~ ERROR expected identifier, found reserved identifier `$crate` - | ^^^^^^ expected identifier, found reserved identifier +LL | struct $crate {} //~ ERROR expected identifier, found reserved identifier `$crate` + | ^^^^^^ expected identifier, found reserved identifier ... LL | m!(); | ----- in this macro invocation error: expected identifier, found reserved identifier `$crate` - --> $DIR/dollar-crate-is-keyword.rs:17:23 + --> $DIR/dollar-crate-is-keyword.rs:21:23 | LL | use $crate as $crate; //~ ERROR expected identifier, found reserved identifier `$crate` | ^^^^^^ expected identifier, found reserved identifier @@ -17,7 +17,7 @@ LL | m!(); | ----- in this macro invocation warning: `$crate` may not be imported - --> $DIR/dollar-crate-is-keyword.rs:15:9 + --> $DIR/dollar-crate-is-keyword.rs:19:9 | LL | use $crate; // OK | ^^^^^^^^^^^ @@ -28,7 +28,7 @@ LL | m!(); = note: `use $crate;` was erroneously allowed and will become a hard error in a future release warning: `$crate` may not be imported - --> $DIR/dollar-crate-is-keyword.rs:17:9 + --> $DIR/dollar-crate-is-keyword.rs:21:9 | LL | use $crate as $crate; //~ ERROR expected identifier, found reserved identifier `$crate` | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/compile-fail-migration/double-type-import.rs b/src/test/ui/double-type-import.rs similarity index 100% rename from src/test/ui/compile-fail-migration/double-type-import.rs rename to src/test/ui/double-type-import.rs diff --git a/src/test/ui/compile-fail-migration/double-type-import.stderr b/src/test/ui/double-type-import.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/double-type-import.stderr rename to src/test/ui/double-type-import.stderr diff --git a/src/test/ui/compile-fail-migration/drop-on-non-struct.rs b/src/test/ui/dropck/drop-on-non-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/drop-on-non-struct.rs rename to src/test/ui/dropck/drop-on-non-struct.rs diff --git a/src/test/ui/compile-fail-migration/drop-on-non-struct.stderr b/src/test/ui/dropck/drop-on-non-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/drop-on-non-struct.stderr rename to src/test/ui/dropck/drop-on-non-struct.stderr diff --git a/src/test/ui/compile-fail-migration/drop-with-active-borrows-1.nll.stderr b/src/test/ui/dropck/drop-with-active-borrows-1.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/drop-with-active-borrows-1.nll.stderr rename to src/test/ui/dropck/drop-with-active-borrows-1.nll.stderr diff --git a/src/test/ui/compile-fail-migration/drop-with-active-borrows-1.rs b/src/test/ui/dropck/drop-with-active-borrows-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/drop-with-active-borrows-1.rs rename to src/test/ui/dropck/drop-with-active-borrows-1.rs diff --git a/src/test/ui/compile-fail-migration/drop-with-active-borrows-1.stderr b/src/test/ui/dropck/drop-with-active-borrows-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/drop-with-active-borrows-1.stderr rename to src/test/ui/dropck/drop-with-active-borrows-1.stderr diff --git a/src/test/ui/compile-fail-migration/drop-with-active-borrows-2.nll.stderr b/src/test/ui/dropck/drop-with-active-borrows-2.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/drop-with-active-borrows-2.nll.stderr rename to src/test/ui/dropck/drop-with-active-borrows-2.nll.stderr diff --git a/src/test/ui/compile-fail-migration/drop-with-active-borrows-2.rs b/src/test/ui/dropck/drop-with-active-borrows-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/drop-with-active-borrows-2.rs rename to src/test/ui/dropck/drop-with-active-borrows-2.rs diff --git a/src/test/ui/compile-fail-migration/drop-with-active-borrows-2.stderr b/src/test/ui/dropck/drop-with-active-borrows-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/drop-with-active-borrows-2.stderr rename to src/test/ui/dropck/drop-with-active-borrows-2.stderr diff --git a/src/test/ui/compile-fail-migration/dropck_no_diverge_on_nonregular_1.rs b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dropck_no_diverge_on_nonregular_1.rs rename to src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.rs diff --git a/src/test/ui/compile-fail-migration/dropck_no_diverge_on_nonregular_1.stderr b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dropck_no_diverge_on_nonregular_1.stderr rename to src/test/ui/dropck/dropck_no_diverge_on_nonregular_1.stderr diff --git a/src/test/ui/compile-fail-migration/dropck_no_diverge_on_nonregular_2.rs b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dropck_no_diverge_on_nonregular_2.rs rename to src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.rs diff --git a/src/test/ui/compile-fail-migration/dropck_no_diverge_on_nonregular_2.stderr b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dropck_no_diverge_on_nonregular_2.stderr rename to src/test/ui/dropck/dropck_no_diverge_on_nonregular_2.stderr diff --git a/src/test/ui/compile-fail-migration/dropck_no_diverge_on_nonregular_3.rs b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dropck_no_diverge_on_nonregular_3.rs rename to src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.rs diff --git a/src/test/ui/compile-fail-migration/dropck_no_diverge_on_nonregular_3.stderr b/src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dropck_no_diverge_on_nonregular_3.stderr rename to src/test/ui/dropck/dropck_no_diverge_on_nonregular_3.stderr diff --git a/src/test/ui/compile-fail-migration/dropck_trait_cycle_checked.nll.stderr b/src/test/ui/dropck/dropck_trait_cycle_checked.nll.stderr similarity index 84% rename from src/test/ui/compile-fail-migration/dropck_trait_cycle_checked.nll.stderr rename to src/test/ui/dropck/dropck_trait_cycle_checked.nll.stderr index 4be70a52202..a47229cdca0 100644 --- a/src/test/ui/compile-fail-migration/dropck_trait_cycle_checked.nll.stderr +++ b/src/test/ui/dropck/dropck_trait_cycle_checked.nll.stderr @@ -5,10 +5,9 @@ LL | o1.set0(&o2); //~ ERROR `o2` does not live long enough | ^^^ borrowed value does not live long enough ... LL | } - | - - | | - | `o2` dropped here while still borrowed - | borrow later used here, when `o2` is dropped + | - `o2` dropped here while still borrowed + | + = note: borrowed value must be valid for the static lifetime... error[E0597]: `o3` does not live long enough --> $DIR/dropck_trait_cycle_checked.rs:122:13 @@ -17,10 +16,9 @@ LL | o1.set1(&o3); //~ ERROR `o3` does not live long enough | ^^^ borrowed value does not live long enough ... LL | } - | - - | | - | `o3` dropped here while still borrowed - | borrow later used here, when `o3` is dropped + | - `o3` dropped here while still borrowed + | + = note: borrowed value must be valid for the static lifetime... error[E0597]: `o2` does not live long enough --> $DIR/dropck_trait_cycle_checked.rs:123:13 @@ -51,10 +49,9 @@ LL | o3.set0(&o1); //~ ERROR `o1` does not live long enough | ^^^ borrowed value does not live long enough LL | o3.set1(&o2); //~ ERROR `o2` does not live long enough LL | } - | - - | | - | `o1` dropped here while still borrowed - | borrow later used here, when `o1` is dropped + | - `o1` dropped here while still borrowed + | + = note: borrowed value must be valid for the static lifetime... error[E0597]: `o2` does not live long enough --> $DIR/dropck_trait_cycle_checked.rs:126:13 diff --git a/src/test/ui/compile-fail-migration/dropck_trait_cycle_checked.rs b/src/test/ui/dropck/dropck_trait_cycle_checked.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dropck_trait_cycle_checked.rs rename to src/test/ui/dropck/dropck_trait_cycle_checked.rs diff --git a/src/test/ui/compile-fail-migration/dropck_trait_cycle_checked.stderr b/src/test/ui/dropck/dropck_trait_cycle_checked.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dropck_trait_cycle_checked.stderr rename to src/test/ui/dropck/dropck_trait_cycle_checked.stderr diff --git a/src/test/ui/compile-fail-migration/dst-bad-assign-2.rs b/src/test/ui/dst/dst-bad-assign-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dst-bad-assign-2.rs rename to src/test/ui/dst/dst-bad-assign-2.rs diff --git a/src/test/ui/compile-fail-migration/dst-bad-assign-2.stderr b/src/test/ui/dst/dst-bad-assign-2.stderr similarity index 96% rename from src/test/ui/compile-fail-migration/dst-bad-assign-2.stderr rename to src/test/ui/dst/dst-bad-assign-2.stderr index cfc25ebae57..ead973d25a0 100644 --- a/src/test/ui/compile-fail-migration/dst-bad-assign-2.stderr +++ b/src/test/ui/dst/dst-bad-assign-2.stderr @@ -5,7 +5,7 @@ LL | f5.ptr = *z; | ^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `dyn ToBar` - = note: to learn more, visit + = note: to learn more, visit = note: the left-hand-side of an assignment must have a statically known size error: aborting due to previous error diff --git a/src/test/ui/compile-fail-migration/dst-bad-assign-3.rs b/src/test/ui/dst/dst-bad-assign-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dst-bad-assign-3.rs rename to src/test/ui/dst/dst-bad-assign-3.rs diff --git a/src/test/ui/compile-fail-migration/dst-bad-assign-3.stderr b/src/test/ui/dst/dst-bad-assign-3.stderr similarity index 97% rename from src/test/ui/compile-fail-migration/dst-bad-assign-3.stderr rename to src/test/ui/dst/dst-bad-assign-3.stderr index 5051972406b..ec172fae7a6 100644 --- a/src/test/ui/compile-fail-migration/dst-bad-assign-3.stderr +++ b/src/test/ui/dst/dst-bad-assign-3.stderr @@ -14,7 +14,7 @@ LL | f5.2 = Bar1 {f: 36}; | ^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `dyn ToBar` - = note: to learn more, visit + = note: to learn more, visit = note: the left-hand-side of an assignment must have a statically known size error: aborting due to 2 previous errors diff --git a/src/test/ui/compile-fail-migration/dst-bad-assign.rs b/src/test/ui/dst/dst-bad-assign.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dst-bad-assign.rs rename to src/test/ui/dst/dst-bad-assign.rs diff --git a/src/test/ui/compile-fail-migration/dst-bad-assign.stderr b/src/test/ui/dst/dst-bad-assign.stderr similarity index 97% rename from src/test/ui/compile-fail-migration/dst-bad-assign.stderr rename to src/test/ui/dst/dst-bad-assign.stderr index b911014b362..72f28af5175 100644 --- a/src/test/ui/compile-fail-migration/dst-bad-assign.stderr +++ b/src/test/ui/dst/dst-bad-assign.stderr @@ -14,7 +14,7 @@ LL | f5.ptr = Bar1 {f: 36}; | ^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `dyn ToBar` - = note: to learn more, visit + = note: to learn more, visit = note: the left-hand-side of an assignment must have a statically known size error: aborting due to 2 previous errors diff --git a/src/test/ui/compile-fail-migration/dst-bad-coerce1.rs b/src/test/ui/dst/dst-bad-coerce1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dst-bad-coerce1.rs rename to src/test/ui/dst/dst-bad-coerce1.rs diff --git a/src/test/ui/compile-fail-migration/dst-bad-coerce1.stderr b/src/test/ui/dst/dst-bad-coerce1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dst-bad-coerce1.stderr rename to src/test/ui/dst/dst-bad-coerce1.stderr diff --git a/src/test/ui/compile-fail-migration/dst-bad-coerce2.rs b/src/test/ui/dst/dst-bad-coerce2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dst-bad-coerce2.rs rename to src/test/ui/dst/dst-bad-coerce2.rs diff --git a/src/test/ui/compile-fail-migration/dst-bad-coerce2.stderr b/src/test/ui/dst/dst-bad-coerce2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dst-bad-coerce2.stderr rename to src/test/ui/dst/dst-bad-coerce2.stderr diff --git a/src/test/ui/compile-fail-migration/dst-bad-coerce3.nll.stderr b/src/test/ui/dst/dst-bad-coerce3.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dst-bad-coerce3.nll.stderr rename to src/test/ui/dst/dst-bad-coerce3.nll.stderr diff --git a/src/test/ui/compile-fail-migration/dst-bad-coerce3.rs b/src/test/ui/dst/dst-bad-coerce3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dst-bad-coerce3.rs rename to src/test/ui/dst/dst-bad-coerce3.rs diff --git a/src/test/ui/compile-fail-migration/dst-bad-coerce3.stderr b/src/test/ui/dst/dst-bad-coerce3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dst-bad-coerce3.stderr rename to src/test/ui/dst/dst-bad-coerce3.stderr diff --git a/src/test/ui/compile-fail-migration/dst-bad-coerce4.rs b/src/test/ui/dst/dst-bad-coerce4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dst-bad-coerce4.rs rename to src/test/ui/dst/dst-bad-coerce4.rs diff --git a/src/test/ui/compile-fail-migration/dst-bad-coerce4.stderr b/src/test/ui/dst/dst-bad-coerce4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dst-bad-coerce4.stderr rename to src/test/ui/dst/dst-bad-coerce4.stderr diff --git a/src/test/ui/compile-fail-migration/dst-bad-coercions.rs b/src/test/ui/dst/dst-bad-coercions.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dst-bad-coercions.rs rename to src/test/ui/dst/dst-bad-coercions.rs diff --git a/src/test/ui/compile-fail-migration/dst-bad-coercions.stderr b/src/test/ui/dst/dst-bad-coercions.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dst-bad-coercions.stderr rename to src/test/ui/dst/dst-bad-coercions.stderr diff --git a/src/test/ui/compile-fail-migration/dst-bad-deep-2.rs b/src/test/ui/dst/dst-bad-deep-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dst-bad-deep-2.rs rename to src/test/ui/dst/dst-bad-deep-2.rs diff --git a/src/test/ui/compile-fail-migration/dst-bad-deep-2.stderr b/src/test/ui/dst/dst-bad-deep-2.stderr similarity index 97% rename from src/test/ui/compile-fail-migration/dst-bad-deep-2.stderr rename to src/test/ui/dst/dst-bad-deep-2.stderr index 44c88527da1..2c0a540f25a 100644 --- a/src/test/ui/compile-fail-migration/dst-bad-deep-2.stderr +++ b/src/test/ui/dst/dst-bad-deep-2.stderr @@ -5,7 +5,7 @@ LL | let h: &(([isize],),) = &(*g,); | ^^^^^ doesn't have a size known at compile-time | = help: within `(([isize],),)`, the trait `std::marker::Sized` is not implemented for `[isize]` - = note: to learn more, visit + = note: to learn more, visit = note: required because it appears within the type `([isize],)` = note: required because it appears within the type `(([isize],),)` = note: tuples must have a statically known size to be initialized diff --git a/src/test/ui/compile-fail-migration/dst-bad-deep.rs b/src/test/ui/dst/dst-bad-deep.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dst-bad-deep.rs rename to src/test/ui/dst/dst-bad-deep.rs diff --git a/src/test/ui/compile-fail-migration/dst-bad-deep.stderr b/src/test/ui/dst/dst-bad-deep.stderr similarity index 97% rename from src/test/ui/compile-fail-migration/dst-bad-deep.stderr rename to src/test/ui/dst/dst-bad-deep.stderr index 1ff4b984cd6..2ac8cb325a1 100644 --- a/src/test/ui/compile-fail-migration/dst-bad-deep.stderr +++ b/src/test/ui/dst/dst-bad-deep.stderr @@ -5,7 +5,7 @@ LL | let h: &Fat> = &Fat { ptr: *g }; | ^^^^^^^^^^^^^^^ doesn't have a size known at compile-time | = help: within `Fat>`, the trait `std::marker::Sized` is not implemented for `[isize]` - = note: to learn more, visit + = note: to learn more, visit = note: required because it appears within the type `Fat<[isize]>` = note: required because it appears within the type `Fat>` = note: structs must have a statically known size to be initialized diff --git a/src/test/ui/compile-fail-migration/dst-index.nll.stderr b/src/test/ui/dst/dst-index.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dst-index.nll.stderr rename to src/test/ui/dst/dst-index.nll.stderr diff --git a/src/test/ui/compile-fail-migration/dst-index.rs b/src/test/ui/dst/dst-index.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dst-index.rs rename to src/test/ui/dst/dst-index.rs diff --git a/src/test/ui/compile-fail-migration/dst-index.stderr b/src/test/ui/dst/dst-index.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dst-index.stderr rename to src/test/ui/dst/dst-index.stderr diff --git a/src/test/ui/compile-fail-migration/dst-object-from-unsized-type.rs b/src/test/ui/dst/dst-object-from-unsized-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dst-object-from-unsized-type.rs rename to src/test/ui/dst/dst-object-from-unsized-type.rs diff --git a/src/test/ui/compile-fail-migration/dst-object-from-unsized-type.stderr b/src/test/ui/dst/dst-object-from-unsized-type.stderr similarity index 95% rename from src/test/ui/compile-fail-migration/dst-object-from-unsized-type.stderr rename to src/test/ui/dst/dst-object-from-unsized-type.stderr index 67f959f297d..862c52e43c0 100644 --- a/src/test/ui/compile-fail-migration/dst-object-from-unsized-type.stderr +++ b/src/test/ui/dst/dst-object-from-unsized-type.stderr @@ -5,7 +5,7 @@ LL | let u: &Foo = t; | ^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `T` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where T: std::marker::Sized` bound = note: required for the cast to the object type `dyn Foo` @@ -16,7 +16,7 @@ LL | let v: &Foo = t as &Foo; | ^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `T` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where T: std::marker::Sized` bound = note: required for the cast to the object type `dyn Foo` @@ -27,7 +27,7 @@ LL | let _: &[&Foo] = &["hi"]; | ^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `str` - = note: to learn more, visit + = note: to learn more, visit = note: required for the cast to the object type `dyn Foo` error[E0277]: the size for values of type `[u8]` cannot be known at compilation time @@ -37,7 +37,7 @@ LL | let _: &Foo = x as &Foo; | ^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `[u8]` - = note: to learn more, visit + = note: to learn more, visit = note: required for the cast to the object type `dyn Foo` error: aborting due to 4 previous errors diff --git a/src/test/ui/compile-fail-migration/dst-rvalue.nll.stderr b/src/test/ui/dst/dst-rvalue.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dst-rvalue.nll.stderr rename to src/test/ui/dst/dst-rvalue.nll.stderr diff --git a/src/test/ui/compile-fail-migration/dst-rvalue.rs b/src/test/ui/dst/dst-rvalue.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dst-rvalue.rs rename to src/test/ui/dst/dst-rvalue.rs diff --git a/src/test/ui/compile-fail-migration/dst-rvalue.stderr b/src/test/ui/dst/dst-rvalue.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dst-rvalue.stderr rename to src/test/ui/dst/dst-rvalue.stderr diff --git a/src/test/ui/compile-fail-migration/dst-sized-trait-param.rs b/src/test/ui/dst/dst-sized-trait-param.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dst-sized-trait-param.rs rename to src/test/ui/dst/dst-sized-trait-param.rs diff --git a/src/test/ui/compile-fail-migration/dst-sized-trait-param.stderr b/src/test/ui/dst/dst-sized-trait-param.stderr similarity index 95% rename from src/test/ui/compile-fail-migration/dst-sized-trait-param.stderr rename to src/test/ui/dst/dst-sized-trait-param.stderr index 111d41baa57..47f8215d526 100644 --- a/src/test/ui/compile-fail-migration/dst-sized-trait-param.stderr +++ b/src/test/ui/dst/dst-sized-trait-param.stderr @@ -5,7 +5,7 @@ LL | impl Foo<[isize]> for usize { } | ^^^^^^^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `[isize]` - = note: to learn more, visit + = note: to learn more, visit error[E0277]: the size for values of type `[usize]` cannot be known at compilation time --> $DIR/dst-sized-trait-param.rs:20:6 @@ -14,7 +14,7 @@ LL | impl Foo for [usize] { } | ^^^^^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `[usize]` - = note: to learn more, visit + = note: to learn more, visit error: aborting due to 2 previous errors diff --git a/src/test/ui/compile-fail-migration/dupe-symbols-1.rs b/src/test/ui/duplicate/dupe-symbols-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dupe-symbols-1.rs rename to src/test/ui/duplicate/dupe-symbols-1.rs diff --git a/src/test/ui/compile-fail-migration/dupe-symbols-1.stderr b/src/test/ui/duplicate/dupe-symbols-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dupe-symbols-1.stderr rename to src/test/ui/duplicate/dupe-symbols-1.stderr diff --git a/src/test/ui/compile-fail-migration/dupe-symbols-2.rs b/src/test/ui/duplicate/dupe-symbols-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dupe-symbols-2.rs rename to src/test/ui/duplicate/dupe-symbols-2.rs diff --git a/src/test/ui/compile-fail-migration/dupe-symbols-2.stderr b/src/test/ui/duplicate/dupe-symbols-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dupe-symbols-2.stderr rename to src/test/ui/duplicate/dupe-symbols-2.stderr diff --git a/src/test/ui/compile-fail-migration/dupe-symbols-3.rs b/src/test/ui/duplicate/dupe-symbols-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dupe-symbols-3.rs rename to src/test/ui/duplicate/dupe-symbols-3.rs diff --git a/src/test/ui/compile-fail-migration/dupe-symbols-3.stderr b/src/test/ui/duplicate/dupe-symbols-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dupe-symbols-3.stderr rename to src/test/ui/duplicate/dupe-symbols-3.stderr diff --git a/src/test/ui/compile-fail-migration/dupe-symbols-4.rs b/src/test/ui/duplicate/dupe-symbols-4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dupe-symbols-4.rs rename to src/test/ui/duplicate/dupe-symbols-4.rs diff --git a/src/test/ui/compile-fail-migration/dupe-symbols-4.stderr b/src/test/ui/duplicate/dupe-symbols-4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dupe-symbols-4.stderr rename to src/test/ui/duplicate/dupe-symbols-4.stderr diff --git a/src/test/ui/compile-fail-migration/dupe-symbols-5.rs b/src/test/ui/duplicate/dupe-symbols-5.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dupe-symbols-5.rs rename to src/test/ui/duplicate/dupe-symbols-5.rs diff --git a/src/test/ui/compile-fail-migration/dupe-symbols-5.stderr b/src/test/ui/duplicate/dupe-symbols-5.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dupe-symbols-5.stderr rename to src/test/ui/duplicate/dupe-symbols-5.stderr diff --git a/src/test/ui/compile-fail-migration/dupe-symbols-6.rs b/src/test/ui/duplicate/dupe-symbols-6.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dupe-symbols-6.rs rename to src/test/ui/duplicate/dupe-symbols-6.rs diff --git a/src/test/ui/compile-fail-migration/dupe-symbols-6.stderr b/src/test/ui/duplicate/dupe-symbols-6.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dupe-symbols-6.stderr rename to src/test/ui/duplicate/dupe-symbols-6.stderr diff --git a/src/test/ui/compile-fail-migration/dupe-symbols-7.rs b/src/test/ui/duplicate/dupe-symbols-7.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dupe-symbols-7.rs rename to src/test/ui/duplicate/dupe-symbols-7.rs diff --git a/src/test/ui/compile-fail-migration/dupe-symbols-7.stderr b/src/test/ui/duplicate/dupe-symbols-7.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dupe-symbols-7.stderr rename to src/test/ui/duplicate/dupe-symbols-7.stderr diff --git a/src/test/ui/duplicate-check-macro-exports.rs b/src/test/ui/duplicate/duplicate-check-macro-exports.rs similarity index 100% rename from src/test/ui/duplicate-check-macro-exports.rs rename to src/test/ui/duplicate/duplicate-check-macro-exports.rs diff --git a/src/test/ui/duplicate-check-macro-exports.stderr b/src/test/ui/duplicate/duplicate-check-macro-exports.stderr similarity index 100% rename from src/test/ui/duplicate-check-macro-exports.stderr rename to src/test/ui/duplicate/duplicate-check-macro-exports.stderr diff --git a/src/test/ui/compile-fail-migration/duplicate-parameter.rs b/src/test/ui/duplicate/duplicate-parameter.rs similarity index 100% rename from src/test/ui/compile-fail-migration/duplicate-parameter.rs rename to src/test/ui/duplicate/duplicate-parameter.rs diff --git a/src/test/ui/compile-fail-migration/duplicate-parameter.stderr b/src/test/ui/duplicate/duplicate-parameter.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/duplicate-parameter.stderr rename to src/test/ui/duplicate/duplicate-parameter.stderr diff --git a/src/test/ui/compile-fail-migration/duplicate-type-parameter.rs b/src/test/ui/duplicate/duplicate-type-parameter.rs similarity index 100% rename from src/test/ui/compile-fail-migration/duplicate-type-parameter.rs rename to src/test/ui/duplicate/duplicate-type-parameter.rs diff --git a/src/test/ui/compile-fail-migration/duplicate-type-parameter.stderr b/src/test/ui/duplicate/duplicate-type-parameter.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/duplicate-type-parameter.stderr rename to src/test/ui/duplicate/duplicate-type-parameter.stderr diff --git a/src/test/ui/compile-fail-migration/duplicate_entry_error.rs b/src/test/ui/duplicate_entry_error.rs similarity index 100% rename from src/test/ui/compile-fail-migration/duplicate_entry_error.rs rename to src/test/ui/duplicate_entry_error.rs diff --git a/src/test/ui/compile-fail-migration/duplicate_entry_error.stderr b/src/test/ui/duplicate_entry_error.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/duplicate_entry_error.stderr rename to src/test/ui/duplicate_entry_error.stderr diff --git a/src/test/ui/compile-fail-migration/dyn-trait-compatibility.rs b/src/test/ui/dyn-trait-compatibility.rs similarity index 100% rename from src/test/ui/compile-fail-migration/dyn-trait-compatibility.rs rename to src/test/ui/dyn-trait-compatibility.rs diff --git a/src/test/ui/compile-fail-migration/dyn-trait-compatibility.stderr b/src/test/ui/dyn-trait-compatibility.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/dyn-trait-compatibility.stderr rename to src/test/ui/dyn-trait-compatibility.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/edition-extern-crate-allowed.rs b/src/test/ui/editions/auxiliary/edition-extern-crate-allowed.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/edition-extern-crate-allowed.rs rename to src/test/ui/editions/auxiliary/edition-extern-crate-allowed.rs diff --git a/src/test/ui/auxiliary/edition-kw-macro-2015.rs b/src/test/ui/editions/auxiliary/edition-kw-macro-2015.rs similarity index 100% rename from src/test/ui/auxiliary/edition-kw-macro-2015.rs rename to src/test/ui/editions/auxiliary/edition-kw-macro-2015.rs diff --git a/src/test/ui/auxiliary/edition-kw-macro-2018.rs b/src/test/ui/editions/auxiliary/edition-kw-macro-2018.rs similarity index 100% rename from src/test/ui/auxiliary/edition-kw-macro-2018.rs rename to src/test/ui/editions/auxiliary/edition-kw-macro-2018.rs diff --git a/src/test/ui/compile-fail-migration/edition-extern-crate-allowed.rs b/src/test/ui/editions/edition-extern-crate-allowed.rs similarity index 100% rename from src/test/ui/compile-fail-migration/edition-extern-crate-allowed.rs rename to src/test/ui/editions/edition-extern-crate-allowed.rs diff --git a/src/test/ui/compile-fail-migration/edition-extern-crate-allowed.stderr b/src/test/ui/editions/edition-extern-crate-allowed.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/edition-extern-crate-allowed.stderr rename to src/test/ui/editions/edition-extern-crate-allowed.stderr diff --git a/src/test/ui/compile-fail-migration/edition-feature-ok.rs b/src/test/ui/editions/edition-feature-ok.rs similarity index 100% rename from src/test/ui/compile-fail-migration/edition-feature-ok.rs rename to src/test/ui/editions/edition-feature-ok.rs diff --git a/src/test/ui/edition-keywords-2015-2015-expansion.rs b/src/test/ui/editions/edition-keywords-2015-2015-expansion.rs similarity index 100% rename from src/test/ui/edition-keywords-2015-2015-expansion.rs rename to src/test/ui/editions/edition-keywords-2015-2015-expansion.rs diff --git a/src/test/ui/edition-keywords-2015-2015-parsing.rs b/src/test/ui/editions/edition-keywords-2015-2015-parsing.rs similarity index 100% rename from src/test/ui/edition-keywords-2015-2015-parsing.rs rename to src/test/ui/editions/edition-keywords-2015-2015-parsing.rs diff --git a/src/test/ui/edition-keywords-2015-2015-parsing.stderr b/src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr similarity index 100% rename from src/test/ui/edition-keywords-2015-2015-parsing.stderr rename to src/test/ui/editions/edition-keywords-2015-2015-parsing.stderr diff --git a/src/test/ui/edition-keywords-2015-2018-expansion.rs b/src/test/ui/editions/edition-keywords-2015-2018-expansion.rs similarity index 100% rename from src/test/ui/edition-keywords-2015-2018-expansion.rs rename to src/test/ui/editions/edition-keywords-2015-2018-expansion.rs diff --git a/src/test/ui/edition-keywords-2015-2018-expansion.stderr b/src/test/ui/editions/edition-keywords-2015-2018-expansion.stderr similarity index 100% rename from src/test/ui/edition-keywords-2015-2018-expansion.stderr rename to src/test/ui/editions/edition-keywords-2015-2018-expansion.stderr diff --git a/src/test/ui/edition-keywords-2015-2018-parsing.rs b/src/test/ui/editions/edition-keywords-2015-2018-parsing.rs similarity index 100% rename from src/test/ui/edition-keywords-2015-2018-parsing.rs rename to src/test/ui/editions/edition-keywords-2015-2018-parsing.rs diff --git a/src/test/ui/edition-keywords-2015-2018-parsing.stderr b/src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr similarity index 100% rename from src/test/ui/edition-keywords-2015-2018-parsing.stderr rename to src/test/ui/editions/edition-keywords-2015-2018-parsing.stderr diff --git a/src/test/ui/edition-keywords-2018-2015-expansion.rs b/src/test/ui/editions/edition-keywords-2018-2015-expansion.rs similarity index 100% rename from src/test/ui/edition-keywords-2018-2015-expansion.rs rename to src/test/ui/editions/edition-keywords-2018-2015-expansion.rs diff --git a/src/test/ui/edition-keywords-2018-2015-parsing.rs b/src/test/ui/editions/edition-keywords-2018-2015-parsing.rs similarity index 100% rename from src/test/ui/edition-keywords-2018-2015-parsing.rs rename to src/test/ui/editions/edition-keywords-2018-2015-parsing.rs diff --git a/src/test/ui/edition-keywords-2018-2015-parsing.stderr b/src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr similarity index 100% rename from src/test/ui/edition-keywords-2018-2015-parsing.stderr rename to src/test/ui/editions/edition-keywords-2018-2015-parsing.stderr diff --git a/src/test/ui/edition-keywords-2018-2018-expansion.rs b/src/test/ui/editions/edition-keywords-2018-2018-expansion.rs similarity index 100% rename from src/test/ui/edition-keywords-2018-2018-expansion.rs rename to src/test/ui/editions/edition-keywords-2018-2018-expansion.rs diff --git a/src/test/ui/edition-keywords-2018-2018-expansion.stderr b/src/test/ui/editions/edition-keywords-2018-2018-expansion.stderr similarity index 100% rename from src/test/ui/edition-keywords-2018-2018-expansion.stderr rename to src/test/ui/editions/edition-keywords-2018-2018-expansion.stderr diff --git a/src/test/ui/edition-keywords-2018-2018-parsing.rs b/src/test/ui/editions/edition-keywords-2018-2018-parsing.rs similarity index 100% rename from src/test/ui/edition-keywords-2018-2018-parsing.rs rename to src/test/ui/editions/edition-keywords-2018-2018-parsing.rs diff --git a/src/test/ui/edition-keywords-2018-2018-parsing.stderr b/src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr similarity index 100% rename from src/test/ui/edition-keywords-2018-2018-parsing.stderr rename to src/test/ui/editions/edition-keywords-2018-2018-parsing.stderr diff --git a/src/test/ui/compile-fail-migration/edition-raw-pointer-method-2015.rs b/src/test/ui/editions/edition-raw-pointer-method-2015.rs similarity index 100% rename from src/test/ui/compile-fail-migration/edition-raw-pointer-method-2015.rs rename to src/test/ui/editions/edition-raw-pointer-method-2015.rs diff --git a/src/test/ui/compile-fail-migration/edition-raw-pointer-method-2015.stderr b/src/test/ui/editions/edition-raw-pointer-method-2015.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/edition-raw-pointer-method-2015.stderr rename to src/test/ui/editions/edition-raw-pointer-method-2015.stderr diff --git a/src/test/ui/compile-fail-migration/edition-raw-pointer-method-2018.rs b/src/test/ui/editions/edition-raw-pointer-method-2018.rs similarity index 100% rename from src/test/ui/compile-fail-migration/edition-raw-pointer-method-2018.rs rename to src/test/ui/editions/edition-raw-pointer-method-2018.rs diff --git a/src/test/ui/compile-fail-migration/edition-raw-pointer-method-2018.stderr b/src/test/ui/editions/edition-raw-pointer-method-2018.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/edition-raw-pointer-method-2018.stderr rename to src/test/ui/editions/edition-raw-pointer-method-2018.stderr diff --git a/src/test/ui/compile-fail-migration/elided-test.rs b/src/test/ui/elided-test.rs similarity index 100% rename from src/test/ui/compile-fail-migration/elided-test.rs rename to src/test/ui/elided-test.rs diff --git a/src/test/ui/compile-fail-migration/elided-test.stderr b/src/test/ui/elided-test.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/elided-test.stderr rename to src/test/ui/elided-test.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/empty-struct.rs b/src/test/ui/empty/auxiliary/empty-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/empty-struct.rs rename to src/test/ui/empty/auxiliary/empty-struct.rs diff --git a/src/test/ui/auxiliary/two_macros.rs b/src/test/ui/empty/auxiliary/two_macros.rs similarity index 100% rename from src/test/ui/auxiliary/two_macros.rs rename to src/test/ui/empty/auxiliary/two_macros.rs diff --git a/src/test/ui/compile-fail-migration/empty-comment.rs b/src/test/ui/empty/empty-comment.rs similarity index 100% rename from src/test/ui/compile-fail-migration/empty-comment.rs rename to src/test/ui/empty/empty-comment.rs diff --git a/src/test/ui/compile-fail-migration/empty-comment.stderr b/src/test/ui/empty/empty-comment.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/empty-comment.stderr rename to src/test/ui/empty/empty-comment.stderr diff --git a/src/test/ui/compile-fail-migration/empty-extern-arg.rs b/src/test/ui/empty/empty-extern-arg.rs similarity index 100% rename from src/test/ui/compile-fail-migration/empty-extern-arg.rs rename to src/test/ui/empty/empty-extern-arg.rs diff --git a/src/test/ui/compile-fail-migration/empty-extern-arg.stderr b/src/test/ui/empty/empty-extern-arg.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/empty-extern-arg.stderr rename to src/test/ui/empty/empty-extern-arg.stderr diff --git a/src/test/ui/compile-fail-migration/empty-linkname.rs b/src/test/ui/empty/empty-linkname.rs similarity index 100% rename from src/test/ui/compile-fail-migration/empty-linkname.rs rename to src/test/ui/empty/empty-linkname.rs diff --git a/src/test/ui/compile-fail-migration/empty-linkname.stderr b/src/test/ui/empty/empty-linkname.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/empty-linkname.stderr rename to src/test/ui/empty/empty-linkname.stderr diff --git a/src/test/ui/compile-fail-migration/empty-macro-use.rs b/src/test/ui/empty/empty-macro-use.rs similarity index 100% rename from src/test/ui/compile-fail-migration/empty-macro-use.rs rename to src/test/ui/empty/empty-macro-use.rs diff --git a/src/test/ui/compile-fail-migration/empty-macro-use.stderr b/src/test/ui/empty/empty-macro-use.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/empty-macro-use.stderr rename to src/test/ui/empty/empty-macro-use.stderr diff --git a/src/test/ui/compile-fail-migration/empty-never-array.rs b/src/test/ui/empty/empty-never-array.rs similarity index 100% rename from src/test/ui/compile-fail-migration/empty-never-array.rs rename to src/test/ui/empty/empty-never-array.rs diff --git a/src/test/ui/compile-fail-migration/empty-never-array.stderr b/src/test/ui/empty/empty-never-array.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/empty-never-array.stderr rename to src/test/ui/empty/empty-never-array.stderr diff --git a/src/test/ui/compile-fail-migration/empty-struct-braces-expr.rs b/src/test/ui/empty/empty-struct-braces-expr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/empty-struct-braces-expr.rs rename to src/test/ui/empty/empty-struct-braces-expr.rs diff --git a/src/test/ui/compile-fail-migration/empty-struct-braces-expr.stderr b/src/test/ui/empty/empty-struct-braces-expr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/empty-struct-braces-expr.stderr rename to src/test/ui/empty/empty-struct-braces-expr.stderr diff --git a/src/test/ui/compile-fail-migration/empty-struct-braces-pat-1.rs b/src/test/ui/empty/empty-struct-braces-pat-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/empty-struct-braces-pat-1.rs rename to src/test/ui/empty/empty-struct-braces-pat-1.rs diff --git a/src/test/ui/compile-fail-migration/empty-struct-braces-pat-1.stderr b/src/test/ui/empty/empty-struct-braces-pat-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/empty-struct-braces-pat-1.stderr rename to src/test/ui/empty/empty-struct-braces-pat-1.stderr diff --git a/src/test/ui/compile-fail-migration/empty-struct-braces-pat-2.rs b/src/test/ui/empty/empty-struct-braces-pat-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/empty-struct-braces-pat-2.rs rename to src/test/ui/empty/empty-struct-braces-pat-2.rs diff --git a/src/test/ui/compile-fail-migration/empty-struct-braces-pat-2.stderr b/src/test/ui/empty/empty-struct-braces-pat-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/empty-struct-braces-pat-2.stderr rename to src/test/ui/empty/empty-struct-braces-pat-2.stderr diff --git a/src/test/ui/compile-fail-migration/empty-struct-braces-pat-3.rs b/src/test/ui/empty/empty-struct-braces-pat-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/empty-struct-braces-pat-3.rs rename to src/test/ui/empty/empty-struct-braces-pat-3.rs diff --git a/src/test/ui/compile-fail-migration/empty-struct-braces-pat-3.stderr b/src/test/ui/empty/empty-struct-braces-pat-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/empty-struct-braces-pat-3.stderr rename to src/test/ui/empty/empty-struct-braces-pat-3.stderr diff --git a/src/test/ui/compile-fail-migration/empty-struct-tuple-pat.rs b/src/test/ui/empty/empty-struct-tuple-pat.rs similarity index 100% rename from src/test/ui/compile-fail-migration/empty-struct-tuple-pat.rs rename to src/test/ui/empty/empty-struct-tuple-pat.rs diff --git a/src/test/ui/compile-fail-migration/empty-struct-tuple-pat.stderr b/src/test/ui/empty/empty-struct-tuple-pat.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/empty-struct-tuple-pat.stderr rename to src/test/ui/empty/empty-struct-tuple-pat.stderr diff --git a/src/test/ui/empty-struct-unit-expr.rs b/src/test/ui/empty/empty-struct-unit-expr.rs similarity index 100% rename from src/test/ui/empty-struct-unit-expr.rs rename to src/test/ui/empty/empty-struct-unit-expr.rs diff --git a/src/test/ui/empty-struct-unit-expr.stderr b/src/test/ui/empty/empty-struct-unit-expr.stderr similarity index 100% rename from src/test/ui/empty-struct-unit-expr.stderr rename to src/test/ui/empty/empty-struct-unit-expr.stderr diff --git a/src/test/ui/compile-fail-migration/empty-struct-unit-pat.rs b/src/test/ui/empty/empty-struct-unit-pat.rs similarity index 100% rename from src/test/ui/compile-fail-migration/empty-struct-unit-pat.rs rename to src/test/ui/empty/empty-struct-unit-pat.rs diff --git a/src/test/ui/compile-fail-migration/empty-struct-unit-pat.stderr b/src/test/ui/empty/empty-struct-unit-pat.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/empty-struct-unit-pat.stderr rename to src/test/ui/empty/empty-struct-unit-pat.stderr diff --git a/src/test/ui/compile-fail-migration/enable-unstable-lib-feature.rs b/src/test/ui/enable-unstable-lib-feature.rs similarity index 100% rename from src/test/ui/compile-fail-migration/enable-unstable-lib-feature.rs rename to src/test/ui/enable-unstable-lib-feature.rs diff --git a/src/test/ui/compile-fail-migration/enable-unstable-lib-feature.stderr b/src/test/ui/enable-unstable-lib-feature.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/enable-unstable-lib-feature.stderr rename to src/test/ui/enable-unstable-lib-feature.stderr diff --git a/src/test/ui/enum-and-module-in-same-scope.rs b/src/test/ui/enum/enum-and-module-in-same-scope.rs similarity index 100% rename from src/test/ui/enum-and-module-in-same-scope.rs rename to src/test/ui/enum/enum-and-module-in-same-scope.rs diff --git a/src/test/ui/enum-and-module-in-same-scope.stderr b/src/test/ui/enum/enum-and-module-in-same-scope.stderr similarity index 100% rename from src/test/ui/enum-and-module-in-same-scope.stderr rename to src/test/ui/enum/enum-and-module-in-same-scope.stderr diff --git a/src/test/ui/compile-fail-migration/enum-discrim-autosizing.rs b/src/test/ui/enum/enum-discrim-autosizing.rs similarity index 100% rename from src/test/ui/compile-fail-migration/enum-discrim-autosizing.rs rename to src/test/ui/enum/enum-discrim-autosizing.rs diff --git a/src/test/ui/compile-fail-migration/enum-discrim-autosizing.stderr b/src/test/ui/enum/enum-discrim-autosizing.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/enum-discrim-autosizing.stderr rename to src/test/ui/enum/enum-discrim-autosizing.stderr diff --git a/src/test/ui/compile-fail-migration/enum-discrim-too-small.rs b/src/test/ui/enum/enum-discrim-too-small.rs similarity index 100% rename from src/test/ui/compile-fail-migration/enum-discrim-too-small.rs rename to src/test/ui/enum/enum-discrim-too-small.rs diff --git a/src/test/ui/compile-fail-migration/enum-discrim-too-small.stderr b/src/test/ui/enum/enum-discrim-too-small.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/enum-discrim-too-small.stderr rename to src/test/ui/enum/enum-discrim-too-small.stderr diff --git a/src/test/ui/compile-fail-migration/enum-discrim-too-small2.rs b/src/test/ui/enum/enum-discrim-too-small2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/enum-discrim-too-small2.rs rename to src/test/ui/enum/enum-discrim-too-small2.rs diff --git a/src/test/ui/compile-fail-migration/enum-discrim-too-small2.stderr b/src/test/ui/enum/enum-discrim-too-small2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/enum-discrim-too-small2.stderr rename to src/test/ui/enum/enum-discrim-too-small2.stderr diff --git a/src/test/ui/compile-fail-migration/enum-in-scope.rs b/src/test/ui/enum/enum-in-scope.rs similarity index 100% rename from src/test/ui/compile-fail-migration/enum-in-scope.rs rename to src/test/ui/enum/enum-in-scope.rs diff --git a/src/test/ui/compile-fail-migration/enum-in-scope.stderr b/src/test/ui/enum/enum-in-scope.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/enum-in-scope.stderr rename to src/test/ui/enum/enum-in-scope.stderr diff --git a/src/test/ui/enum-size-variance.rs b/src/test/ui/enum/enum-size-variance.rs similarity index 100% rename from src/test/ui/enum-size-variance.rs rename to src/test/ui/enum/enum-size-variance.rs diff --git a/src/test/ui/enum-size-variance.stderr b/src/test/ui/enum/enum-size-variance.stderr similarity index 100% rename from src/test/ui/enum-size-variance.stderr rename to src/test/ui/enum/enum-size-variance.stderr diff --git a/src/test/ui/compile-fail-migration/enum-to-float-cast-2.rs b/src/test/ui/enum/enum-to-float-cast-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/enum-to-float-cast-2.rs rename to src/test/ui/enum/enum-to-float-cast-2.rs diff --git a/src/test/ui/compile-fail-migration/enum-to-float-cast-2.stderr b/src/test/ui/enum/enum-to-float-cast-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/enum-to-float-cast-2.stderr rename to src/test/ui/enum/enum-to-float-cast-2.stderr diff --git a/src/test/ui/compile-fail-migration/enum-to-float-cast.rs b/src/test/ui/enum/enum-to-float-cast.rs similarity index 100% rename from src/test/ui/compile-fail-migration/enum-to-float-cast.rs rename to src/test/ui/enum/enum-to-float-cast.rs diff --git a/src/test/ui/compile-fail-migration/enum-to-float-cast.stderr b/src/test/ui/enum/enum-to-float-cast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/enum-to-float-cast.stderr rename to src/test/ui/enum/enum-to-float-cast.stderr diff --git a/src/test/ui/compile-fail-migration/enum-variant-type-2.rs b/src/test/ui/enum/enum-variant-type-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/enum-variant-type-2.rs rename to src/test/ui/enum/enum-variant-type-2.rs diff --git a/src/test/ui/compile-fail-migration/enum-variant-type-2.stderr b/src/test/ui/enum/enum-variant-type-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/enum-variant-type-2.stderr rename to src/test/ui/enum/enum-variant-type-2.stderr diff --git a/src/test/ui/compile-fail-migration/enums-pats-not-idents.rs b/src/test/ui/enums-pats-not-idents.rs similarity index 100% rename from src/test/ui/compile-fail-migration/enums-pats-not-idents.rs rename to src/test/ui/enums-pats-not-idents.rs diff --git a/src/test/ui/compile-fail-migration/enums-pats-not-idents.stderr b/src/test/ui/enums-pats-not-idents.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/enums-pats-not-idents.stderr rename to src/test/ui/enums-pats-not-idents.stderr diff --git a/src/test/ui/compile-fail-migration/error-should-say-copy-not-pod.rs b/src/test/ui/error-should-say-copy-not-pod.rs similarity index 100% rename from src/test/ui/compile-fail-migration/error-should-say-copy-not-pod.rs rename to src/test/ui/error-should-say-copy-not-pod.rs diff --git a/src/test/ui/compile-fail-migration/error-should-say-copy-not-pod.stderr b/src/test/ui/error-should-say-copy-not-pod.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/error-should-say-copy-not-pod.stderr rename to src/test/ui/error-should-say-copy-not-pod.stderr diff --git a/src/test/ui/compile-fail-migration/estr-subtyping.rs b/src/test/ui/estr-subtyping.rs similarity index 100% rename from src/test/ui/compile-fail-migration/estr-subtyping.rs rename to src/test/ui/estr-subtyping.rs diff --git a/src/test/ui/compile-fail-migration/estr-subtyping.stderr b/src/test/ui/estr-subtyping.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/estr-subtyping.stderr rename to src/test/ui/estr-subtyping.stderr diff --git a/src/test/ui/compile-fail-migration/eval-enum.rs b/src/test/ui/eval-enum.rs similarity index 100% rename from src/test/ui/compile-fail-migration/eval-enum.rs rename to src/test/ui/eval-enum.rs diff --git a/src/test/ui/compile-fail-migration/eval-enum.stderr b/src/test/ui/eval-enum.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/eval-enum.stderr rename to src/test/ui/eval-enum.stderr diff --git a/src/test/ui/compile-fail-migration/exclusive-drop-and-copy.rs b/src/test/ui/exclusive-drop-and-copy.rs similarity index 100% rename from src/test/ui/compile-fail-migration/exclusive-drop-and-copy.rs rename to src/test/ui/exclusive-drop-and-copy.rs diff --git a/src/test/ui/compile-fail-migration/exclusive-drop-and-copy.stderr b/src/test/ui/exclusive-drop-and-copy.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/exclusive-drop-and-copy.stderr rename to src/test/ui/exclusive-drop-and-copy.stderr diff --git a/src/test/ui/compile-fail-migration/exclusive_range_pattern_syntax_collision.rs b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision.rs similarity index 100% rename from src/test/ui/compile-fail-migration/exclusive_range_pattern_syntax_collision.rs rename to src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision.rs diff --git a/src/test/ui/compile-fail-migration/exclusive_range_pattern_syntax_collision.stderr b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/exclusive_range_pattern_syntax_collision.stderr rename to src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision.stderr diff --git a/src/test/ui/compile-fail-migration/exclusive_range_pattern_syntax_collision2.rs b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/exclusive_range_pattern_syntax_collision2.rs rename to src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision2.rs diff --git a/src/test/ui/compile-fail-migration/exclusive_range_pattern_syntax_collision2.stderr b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/exclusive_range_pattern_syntax_collision2.stderr rename to src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision2.stderr diff --git a/src/test/ui/compile-fail-migration/exclusive_range_pattern_syntax_collision3.rs b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/exclusive_range_pattern_syntax_collision3.rs rename to src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision3.rs diff --git a/src/test/ui/compile-fail-migration/exclusive_range_pattern_syntax_collision3.stderr b/src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/exclusive_range_pattern_syntax_collision3.stderr rename to src/test/ui/exclusive-range/exclusive_range_pattern_syntax_collision3.stderr diff --git a/src/test/ui/compile-fail-migration/expanded-cfg.rs b/src/test/ui/expanded-cfg.rs similarity index 100% rename from src/test/ui/compile-fail-migration/expanded-cfg.rs rename to src/test/ui/expanded-cfg.rs diff --git a/src/test/ui/compile-fail-migration/expanded-cfg.stderr b/src/test/ui/expanded-cfg.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/expanded-cfg.stderr rename to src/test/ui/expanded-cfg.stderr diff --git a/src/test/ui/compile-fail-migration/explicit-call-to-dtor.rs b/src/test/ui/explicit/explicit-call-to-dtor.rs similarity index 100% rename from src/test/ui/compile-fail-migration/explicit-call-to-dtor.rs rename to src/test/ui/explicit/explicit-call-to-dtor.rs diff --git a/src/test/ui/compile-fail-migration/explicit-call-to-dtor.stderr b/src/test/ui/explicit/explicit-call-to-dtor.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/explicit-call-to-dtor.stderr rename to src/test/ui/explicit/explicit-call-to-dtor.stderr diff --git a/src/test/ui/compile-fail-migration/explicit-call-to-supertrait-dtor.rs b/src/test/ui/explicit/explicit-call-to-supertrait-dtor.rs similarity index 100% rename from src/test/ui/compile-fail-migration/explicit-call-to-supertrait-dtor.rs rename to src/test/ui/explicit/explicit-call-to-supertrait-dtor.rs diff --git a/src/test/ui/compile-fail-migration/explicit-call-to-supertrait-dtor.stderr b/src/test/ui/explicit/explicit-call-to-supertrait-dtor.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/explicit-call-to-supertrait-dtor.stderr rename to src/test/ui/explicit/explicit-call-to-supertrait-dtor.stderr diff --git a/src/test/ui/compile-fail-migration/explicit-self-lifetime-mismatch.rs b/src/test/ui/explicit/explicit-self-lifetime-mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/explicit-self-lifetime-mismatch.rs rename to src/test/ui/explicit/explicit-self-lifetime-mismatch.rs diff --git a/src/test/ui/compile-fail-migration/explicit-self-lifetime-mismatch.stderr b/src/test/ui/explicit/explicit-self-lifetime-mismatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/explicit-self-lifetime-mismatch.stderr rename to src/test/ui/explicit/explicit-self-lifetime-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/export-fully-qualified.rs b/src/test/ui/export-fully-qualified.rs similarity index 100% rename from src/test/ui/compile-fail-migration/export-fully-qualified.rs rename to src/test/ui/export-fully-qualified.rs diff --git a/src/test/ui/compile-fail-migration/export-fully-qualified.stderr b/src/test/ui/export-fully-qualified.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/export-fully-qualified.stderr rename to src/test/ui/export-fully-qualified.stderr diff --git a/src/test/ui/compile-fail-migration/export-import.rs b/src/test/ui/export-import.rs similarity index 100% rename from src/test/ui/compile-fail-migration/export-import.rs rename to src/test/ui/export-import.rs diff --git a/src/test/ui/compile-fail-migration/export-import.stderr b/src/test/ui/export-import.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/export-import.stderr rename to src/test/ui/export-import.stderr diff --git a/src/test/ui/compile-fail-migration/export-tag-variant.rs b/src/test/ui/export-tag-variant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/export-tag-variant.rs rename to src/test/ui/export-tag-variant.rs diff --git a/src/test/ui/compile-fail-migration/export-tag-variant.stderr b/src/test/ui/export-tag-variant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/export-tag-variant.stderr rename to src/test/ui/export-tag-variant.stderr diff --git a/src/test/ui/compile-fail-migration/export.rs b/src/test/ui/export.rs similarity index 100% rename from src/test/ui/compile-fail-migration/export.rs rename to src/test/ui/export.rs diff --git a/src/test/ui/compile-fail-migration/export.stderr b/src/test/ui/export.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/export.stderr rename to src/test/ui/export.stderr diff --git a/src/test/ui/compile-fail-migration/export2.rs b/src/test/ui/export2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/export2.rs rename to src/test/ui/export2.rs diff --git a/src/test/ui/compile-fail-migration/export2.stderr b/src/test/ui/export2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/export2.stderr rename to src/test/ui/export2.stderr diff --git a/src/test/ui/compile-fail-migration/expr_attr_paren_order.rs b/src/test/ui/expr_attr_paren_order.rs similarity index 100% rename from src/test/ui/compile-fail-migration/expr_attr_paren_order.rs rename to src/test/ui/expr_attr_paren_order.rs diff --git a/src/test/ui/compile-fail-migration/expr_attr_paren_order.stderr b/src/test/ui/expr_attr_paren_order.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/expr_attr_paren_order.stderr rename to src/test/ui/expr_attr_paren_order.stderr diff --git a/src/test/ui/compile-fail-migration/ext-nonexistent.rs b/src/test/ui/ext-nonexistent.rs similarity index 100% rename from src/test/ui/compile-fail-migration/ext-nonexistent.rs rename to src/test/ui/ext-nonexistent.rs diff --git a/src/test/ui/compile-fail-migration/ext-nonexistent.stderr b/src/test/ui/ext-nonexistent.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/ext-nonexistent.stderr rename to src/test/ui/ext-nonexistent.stderr diff --git a/src/test/ui/compile-fail-migration/extenv-arg-2-not-string-literal.rs b/src/test/ui/extenv/extenv-arg-2-not-string-literal.rs similarity index 100% rename from src/test/ui/compile-fail-migration/extenv-arg-2-not-string-literal.rs rename to src/test/ui/extenv/extenv-arg-2-not-string-literal.rs diff --git a/src/test/ui/compile-fail-migration/extenv-arg-2-not-string-literal.stderr b/src/test/ui/extenv/extenv-arg-2-not-string-literal.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/extenv-arg-2-not-string-literal.stderr rename to src/test/ui/extenv/extenv-arg-2-not-string-literal.stderr diff --git a/src/test/ui/compile-fail-migration/extenv-no-args.rs b/src/test/ui/extenv/extenv-no-args.rs similarity index 100% rename from src/test/ui/compile-fail-migration/extenv-no-args.rs rename to src/test/ui/extenv/extenv-no-args.rs diff --git a/src/test/ui/compile-fail-migration/extenv-no-args.stderr b/src/test/ui/extenv/extenv-no-args.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/extenv-no-args.stderr rename to src/test/ui/extenv/extenv-no-args.stderr diff --git a/src/test/ui/compile-fail-migration/extenv-not-defined-custom.rs b/src/test/ui/extenv/extenv-not-defined-custom.rs similarity index 100% rename from src/test/ui/compile-fail-migration/extenv-not-defined-custom.rs rename to src/test/ui/extenv/extenv-not-defined-custom.rs diff --git a/src/test/ui/compile-fail-migration/extenv-not-defined-custom.stderr b/src/test/ui/extenv/extenv-not-defined-custom.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/extenv-not-defined-custom.stderr rename to src/test/ui/extenv/extenv-not-defined-custom.stderr diff --git a/src/test/ui/compile-fail-migration/extenv-not-defined-default.rs b/src/test/ui/extenv/extenv-not-defined-default.rs similarity index 100% rename from src/test/ui/compile-fail-migration/extenv-not-defined-default.rs rename to src/test/ui/extenv/extenv-not-defined-default.rs diff --git a/src/test/ui/compile-fail-migration/extenv-not-defined-default.stderr b/src/test/ui/extenv/extenv-not-defined-default.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/extenv-not-defined-default.stderr rename to src/test/ui/extenv/extenv-not-defined-default.stderr diff --git a/src/test/ui/compile-fail-migration/extenv-not-string-literal.rs b/src/test/ui/extenv/extenv-not-string-literal.rs similarity index 100% rename from src/test/ui/compile-fail-migration/extenv-not-string-literal.rs rename to src/test/ui/extenv/extenv-not-string-literal.rs diff --git a/src/test/ui/compile-fail-migration/extenv-not-string-literal.stderr b/src/test/ui/extenv/extenv-not-string-literal.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/extenv-not-string-literal.stderr rename to src/test/ui/extenv/extenv-not-string-literal.stderr diff --git a/src/test/ui/compile-fail-migration/extenv-too-many-args.rs b/src/test/ui/extenv/extenv-too-many-args.rs similarity index 100% rename from src/test/ui/compile-fail-migration/extenv-too-many-args.rs rename to src/test/ui/extenv/extenv-too-many-args.rs diff --git a/src/test/ui/compile-fail-migration/extenv-too-many-args.stderr b/src/test/ui/extenv/extenv-too-many-args.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/extenv-too-many-args.stderr rename to src/test/ui/extenv/extenv-too-many-args.stderr diff --git a/src/test/ui/auxiliary/m1.rs b/src/test/ui/extern/auxiliary/m1.rs similarity index 100% rename from src/test/ui/auxiliary/m1.rs rename to src/test/ui/extern/auxiliary/m1.rs diff --git a/src/test/ui/auxiliary/m2.rs b/src/test/ui/extern/auxiliary/m2.rs similarity index 100% rename from src/test/ui/auxiliary/m2.rs rename to src/test/ui/extern/auxiliary/m2.rs diff --git a/src/test/ui/extern-const.fixed b/src/test/ui/extern/extern-const.fixed similarity index 100% rename from src/test/ui/extern-const.fixed rename to src/test/ui/extern/extern-const.fixed diff --git a/src/test/ui/extern-const.rs b/src/test/ui/extern/extern-const.rs similarity index 100% rename from src/test/ui/extern-const.rs rename to src/test/ui/extern/extern-const.rs diff --git a/src/test/ui/extern-const.stderr b/src/test/ui/extern/extern-const.stderr similarity index 100% rename from src/test/ui/extern-const.stderr rename to src/test/ui/extern/extern-const.stderr diff --git a/src/test/ui/extern-crate-rename.rs b/src/test/ui/extern/extern-crate-rename.rs similarity index 100% rename from src/test/ui/extern-crate-rename.rs rename to src/test/ui/extern/extern-crate-rename.rs diff --git a/src/test/ui/extern-crate-rename.stderr b/src/test/ui/extern/extern-crate-rename.stderr similarity index 100% rename from src/test/ui/extern-crate-rename.stderr rename to src/test/ui/extern/extern-crate-rename.stderr diff --git a/src/test/ui/compile-fail-migration/extern-crate-visibility.rs b/src/test/ui/extern/extern-crate-visibility.rs similarity index 100% rename from src/test/ui/compile-fail-migration/extern-crate-visibility.rs rename to src/test/ui/extern/extern-crate-visibility.rs diff --git a/src/test/ui/compile-fail-migration/extern-crate-visibility.stderr b/src/test/ui/extern/extern-crate-visibility.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/extern-crate-visibility.stderr rename to src/test/ui/extern/extern-crate-visibility.stderr diff --git a/src/test/ui/compile-fail-migration/extern-macro.rs b/src/test/ui/extern/extern-macro.rs similarity index 100% rename from src/test/ui/compile-fail-migration/extern-macro.rs rename to src/test/ui/extern/extern-macro.rs diff --git a/src/test/ui/compile-fail-migration/extern-macro.stderr b/src/test/ui/extern/extern-macro.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/extern-macro.stderr rename to src/test/ui/extern/extern-macro.stderr diff --git a/src/test/ui/compile-fail-migration/extern-main-fn.rs b/src/test/ui/extern/extern-main-fn.rs similarity index 100% rename from src/test/ui/compile-fail-migration/extern-main-fn.rs rename to src/test/ui/extern/extern-main-fn.rs diff --git a/src/test/ui/compile-fail-migration/extern-main-fn.stderr b/src/test/ui/extern/extern-main-fn.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/extern-main-fn.stderr rename to src/test/ui/extern/extern-main-fn.stderr diff --git a/src/test/ui/compile-fail-migration/extern-types-distinct-types.rs b/src/test/ui/extern/extern-types-distinct-types.rs similarity index 100% rename from src/test/ui/compile-fail-migration/extern-types-distinct-types.rs rename to src/test/ui/extern/extern-types-distinct-types.rs diff --git a/src/test/ui/compile-fail-migration/extern-types-distinct-types.stderr b/src/test/ui/extern/extern-types-distinct-types.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/extern-types-distinct-types.stderr rename to src/test/ui/extern/extern-types-distinct-types.stderr diff --git a/src/test/ui/compile-fail-migration/extern-types-not-sync-send.rs b/src/test/ui/extern/extern-types-not-sync-send.rs similarity index 100% rename from src/test/ui/compile-fail-migration/extern-types-not-sync-send.rs rename to src/test/ui/extern/extern-types-not-sync-send.rs diff --git a/src/test/ui/compile-fail-migration/extern-types-not-sync-send.stderr b/src/test/ui/extern/extern-types-not-sync-send.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/extern-types-not-sync-send.stderr rename to src/test/ui/extern/extern-types-not-sync-send.stderr diff --git a/src/test/ui/compile-fail-migration/extern-types-unsized.rs b/src/test/ui/extern/extern-types-unsized.rs similarity index 100% rename from src/test/ui/compile-fail-migration/extern-types-unsized.rs rename to src/test/ui/extern/extern-types-unsized.rs diff --git a/src/test/ui/compile-fail-migration/extern-types-unsized.stderr b/src/test/ui/extern/extern-types-unsized.stderr similarity index 96% rename from src/test/ui/compile-fail-migration/extern-types-unsized.stderr rename to src/test/ui/extern/extern-types-unsized.stderr index b86602a687b..19df7bdd347 100644 --- a/src/test/ui/compile-fail-migration/extern-types-unsized.stderr +++ b/src/test/ui/extern/extern-types-unsized.stderr @@ -5,7 +5,7 @@ LL | assert_sized::(); | ^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `A` - = note: to learn more, visit + = note: to learn more, visit note: required by `assert_sized` --> $DIR/extern-types-unsized.rs:29:1 | @@ -19,7 +19,7 @@ LL | assert_sized::(); | ^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time | = help: within `Foo`, the trait `std::marker::Sized` is not implemented for `A` - = note: to learn more, visit + = note: to learn more, visit = note: required because it appears within the type `Foo` note: required by `assert_sized` --> $DIR/extern-types-unsized.rs:29:1 @@ -34,7 +34,7 @@ LL | assert_sized::>(); | ^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time | = help: within `Bar`, the trait `std::marker::Sized` is not implemented for `A` - = note: to learn more, visit + = note: to learn more, visit = note: required because it appears within the type `Bar` note: required by `assert_sized` --> $DIR/extern-types-unsized.rs:29:1 @@ -49,7 +49,7 @@ LL | assert_sized::>>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time | = help: within `Bar>`, the trait `std::marker::Sized` is not implemented for `A` - = note: to learn more, visit + = note: to learn more, visit = note: required because it appears within the type `Bar` = note: required because it appears within the type `Bar>` note: required by `assert_sized` diff --git a/src/test/ui/compile-fail-migration/extern-with-type-bounds.rs b/src/test/ui/extern/extern-with-type-bounds.rs similarity index 100% rename from src/test/ui/compile-fail-migration/extern-with-type-bounds.rs rename to src/test/ui/extern/extern-with-type-bounds.rs diff --git a/src/test/ui/compile-fail-migration/extern-with-type-bounds.stderr b/src/test/ui/extern/extern-with-type-bounds.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/extern-with-type-bounds.stderr rename to src/test/ui/extern/extern-with-type-bounds.stderr diff --git a/src/test/ui/compile-fail-migration/extern-wrong-value-type.rs b/src/test/ui/extern/extern-wrong-value-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/extern-wrong-value-type.rs rename to src/test/ui/extern/extern-wrong-value-type.rs diff --git a/src/test/ui/compile-fail-migration/extern-wrong-value-type.stderr b/src/test/ui/extern/extern-wrong-value-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/extern-wrong-value-type.stderr rename to src/test/ui/extern/extern-wrong-value-type.stderr diff --git a/src/test/ui/compile-fail-migration/external-doc-error.rs b/src/test/ui/extern/external-doc-error.rs similarity index 100% rename from src/test/ui/compile-fail-migration/external-doc-error.rs rename to src/test/ui/extern/external-doc-error.rs diff --git a/src/test/ui/compile-fail-migration/external-doc-error.stderr b/src/test/ui/extern/external-doc-error.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/external-doc-error.stderr rename to src/test/ui/extern/external-doc-error.stderr diff --git a/src/test/ui/compile-fail-migration/extoption_env-no-args.rs b/src/test/ui/extoption_env-no-args.rs similarity index 100% rename from src/test/ui/compile-fail-migration/extoption_env-no-args.rs rename to src/test/ui/extoption_env-no-args.rs diff --git a/src/test/ui/compile-fail-migration/extoption_env-no-args.stderr b/src/test/ui/extoption_env-no-args.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/extoption_env-no-args.stderr rename to src/test/ui/extoption_env-no-args.stderr diff --git a/src/test/ui/compile-fail-migration/extoption_env-not-string-literal.rs b/src/test/ui/extoption_env-not-string-literal.rs similarity index 100% rename from src/test/ui/compile-fail-migration/extoption_env-not-string-literal.rs rename to src/test/ui/extoption_env-not-string-literal.rs diff --git a/src/test/ui/compile-fail-migration/extoption_env-not-string-literal.stderr b/src/test/ui/extoption_env-not-string-literal.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/extoption_env-not-string-literal.stderr rename to src/test/ui/extoption_env-not-string-literal.stderr diff --git a/src/test/ui/compile-fail-migration/extoption_env-too-many-args.rs b/src/test/ui/extoption_env-too-many-args.rs similarity index 100% rename from src/test/ui/compile-fail-migration/extoption_env-too-many-args.rs rename to src/test/ui/extoption_env-too-many-args.rs diff --git a/src/test/ui/compile-fail-migration/extoption_env-too-many-args.stderr b/src/test/ui/extoption_env-too-many-args.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/extoption_env-too-many-args.stderr rename to src/test/ui/extoption_env-too-many-args.stderr diff --git a/src/test/ui/compile-fail-migration/fail-no-dead-code-core.rs b/src/test/ui/fail-no-dead-code-core.rs similarity index 100% rename from src/test/ui/compile-fail-migration/fail-no-dead-code-core.rs rename to src/test/ui/fail-no-dead-code-core.rs diff --git a/src/test/ui/compile-fail-migration/fail-no-dead-code-core.stderr b/src/test/ui/fail-no-dead-code-core.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/fail-no-dead-code-core.stderr rename to src/test/ui/fail-no-dead-code-core.stderr diff --git a/src/test/ui/compile-fail-migration/fail-no-dead-code.rs b/src/test/ui/fail-no-dead-code.rs similarity index 100% rename from src/test/ui/compile-fail-migration/fail-no-dead-code.rs rename to src/test/ui/fail-no-dead-code.rs diff --git a/src/test/ui/compile-fail-migration/fail-no-dead-code.stderr b/src/test/ui/fail-no-dead-code.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/fail-no-dead-code.stderr rename to src/test/ui/fail-no-dead-code.stderr diff --git a/src/test/ui/compile-fail-migration/fail-simple.rs b/src/test/ui/fail-simple.rs similarity index 100% rename from src/test/ui/compile-fail-migration/fail-simple.rs rename to src/test/ui/fail-simple.rs diff --git a/src/test/ui/compile-fail-migration/fail-simple.stderr b/src/test/ui/fail-simple.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/fail-simple.stderr rename to src/test/ui/fail-simple.stderr diff --git a/src/test/ui/compile-fail-migration/feature-gated-feature-in-macro-arg.rs b/src/test/ui/feature-gated-feature-in-macro-arg.rs similarity index 100% rename from src/test/ui/compile-fail-migration/feature-gated-feature-in-macro-arg.rs rename to src/test/ui/feature-gated-feature-in-macro-arg.rs diff --git a/src/test/ui/compile-fail-migration/feature-gated-feature-in-macro-arg.stderr b/src/test/ui/feature-gated-feature-in-macro-arg.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/feature-gated-feature-in-macro-arg.stderr rename to src/test/ui/feature-gated-feature-in-macro-arg.stderr diff --git a/src/test/ui/auxiliary/cfg-target-thread-local.rs b/src/test/ui/feature-gates/auxiliary/cfg-target-thread-local.rs similarity index 100% rename from src/test/ui/auxiliary/cfg-target-thread-local.rs rename to src/test/ui/feature-gates/auxiliary/cfg-target-thread-local.rs diff --git a/src/test/ui/feature-gate-abi-msp430-interrupt.rs b/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.rs similarity index 100% rename from src/test/ui/feature-gate-abi-msp430-interrupt.rs rename to src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.rs diff --git a/src/test/ui/feature-gate-abi-msp430-interrupt.stderr b/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.stderr similarity index 100% rename from src/test/ui/feature-gate-abi-msp430-interrupt.stderr rename to src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.stderr diff --git a/src/test/ui/feature-gate-abi.rs b/src/test/ui/feature-gates/feature-gate-abi.rs similarity index 100% rename from src/test/ui/feature-gate-abi.rs rename to src/test/ui/feature-gates/feature-gate-abi.rs diff --git a/src/test/ui/feature-gate-abi.stderr b/src/test/ui/feature-gates/feature-gate-abi.stderr similarity index 100% rename from src/test/ui/feature-gate-abi.stderr rename to src/test/ui/feature-gates/feature-gate-abi.stderr diff --git a/src/test/ui/feature-gate-abi_unadjusted.rs b/src/test/ui/feature-gates/feature-gate-abi_unadjusted.rs similarity index 100% rename from src/test/ui/feature-gate-abi_unadjusted.rs rename to src/test/ui/feature-gates/feature-gate-abi_unadjusted.rs diff --git a/src/test/ui/feature-gate-abi_unadjusted.stderr b/src/test/ui/feature-gates/feature-gate-abi_unadjusted.stderr similarity index 100% rename from src/test/ui/feature-gate-abi_unadjusted.stderr rename to src/test/ui/feature-gates/feature-gate-abi_unadjusted.stderr diff --git a/src/test/ui/compile-fail-migration/feature-gate-alloc-error-handler.rs b/src/test/ui/feature-gates/feature-gate-alloc-error-handler.rs similarity index 100% rename from src/test/ui/compile-fail-migration/feature-gate-alloc-error-handler.rs rename to src/test/ui/feature-gates/feature-gate-alloc-error-handler.rs diff --git a/src/test/ui/compile-fail-migration/feature-gate-alloc-error-handler.stderr b/src/test/ui/feature-gates/feature-gate-alloc-error-handler.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/feature-gate-alloc-error-handler.stderr rename to src/test/ui/feature-gates/feature-gate-alloc-error-handler.stderr diff --git a/src/test/ui/feature-gate-allocator_internals.rs b/src/test/ui/feature-gates/feature-gate-allocator_internals.rs similarity index 100% rename from src/test/ui/feature-gate-allocator_internals.rs rename to src/test/ui/feature-gates/feature-gate-allocator_internals.rs diff --git a/src/test/ui/feature-gate-allocator_internals.stderr b/src/test/ui/feature-gates/feature-gate-allocator_internals.stderr similarity index 100% rename from src/test/ui/feature-gate-allocator_internals.stderr rename to src/test/ui/feature-gates/feature-gate-allocator_internals.stderr diff --git a/src/test/ui/feature-gate-allow-internal-unsafe-nested-macro.rs b/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.rs similarity index 100% rename from src/test/ui/feature-gate-allow-internal-unsafe-nested-macro.rs rename to src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.rs diff --git a/src/test/ui/feature-gate-allow-internal-unsafe-nested-macro.stderr b/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.stderr similarity index 100% rename from src/test/ui/feature-gate-allow-internal-unsafe-nested-macro.stderr rename to src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.stderr diff --git a/src/test/ui/feature-gate-allow-internal-unstable-nested-macro.rs b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.rs similarity index 100% rename from src/test/ui/feature-gate-allow-internal-unstable-nested-macro.rs rename to src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.rs diff --git a/src/test/ui/feature-gate-allow-internal-unstable-nested-macro.stderr b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.stderr similarity index 100% rename from src/test/ui/feature-gate-allow-internal-unstable-nested-macro.stderr rename to src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.stderr diff --git a/src/test/ui/feature-gate-allow-internal-unstable-struct.rs b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-struct.rs similarity index 100% rename from src/test/ui/feature-gate-allow-internal-unstable-struct.rs rename to src/test/ui/feature-gates/feature-gate-allow-internal-unstable-struct.rs diff --git a/src/test/ui/feature-gate-allow-internal-unstable-struct.stderr b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-struct.stderr similarity index 100% rename from src/test/ui/feature-gate-allow-internal-unstable-struct.stderr rename to src/test/ui/feature-gates/feature-gate-allow-internal-unstable-struct.stderr diff --git a/src/test/ui/feature-gate-allow-internal-unstable.rs b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable.rs similarity index 100% rename from src/test/ui/feature-gate-allow-internal-unstable.rs rename to src/test/ui/feature-gates/feature-gate-allow-internal-unstable.rs diff --git a/src/test/ui/feature-gate-allow-internal-unstable.stderr b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable.stderr similarity index 100% rename from src/test/ui/feature-gate-allow-internal-unstable.stderr rename to src/test/ui/feature-gates/feature-gate-allow-internal-unstable.stderr diff --git a/src/test/ui/feature-gate-allow_fail.rs b/src/test/ui/feature-gates/feature-gate-allow_fail.rs similarity index 100% rename from src/test/ui/feature-gate-allow_fail.rs rename to src/test/ui/feature-gates/feature-gate-allow_fail.rs diff --git a/src/test/ui/feature-gate-allow_fail.stderr b/src/test/ui/feature-gates/feature-gate-allow_fail.stderr similarity index 100% rename from src/test/ui/feature-gate-allow_fail.stderr rename to src/test/ui/feature-gates/feature-gate-allow_fail.stderr diff --git a/src/test/ui/feature-gate-arbitrary-self-types.rs b/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.rs similarity index 100% rename from src/test/ui/feature-gate-arbitrary-self-types.rs rename to src/test/ui/feature-gates/feature-gate-arbitrary-self-types.rs diff --git a/src/test/ui/feature-gate-arbitrary-self-types.stderr b/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.stderr similarity index 100% rename from src/test/ui/feature-gate-arbitrary-self-types.stderr rename to src/test/ui/feature-gates/feature-gate-arbitrary-self-types.stderr diff --git a/src/test/ui/feature-gate-arbitrary_self_types-raw-pointer.rs b/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.rs similarity index 100% rename from src/test/ui/feature-gate-arbitrary_self_types-raw-pointer.rs rename to src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.rs diff --git a/src/test/ui/feature-gate-arbitrary_self_types-raw-pointer.stderr b/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.stderr similarity index 100% rename from src/test/ui/feature-gate-arbitrary_self_types-raw-pointer.stderr rename to src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.stderr diff --git a/src/test/ui/feature-gate-asm.rs b/src/test/ui/feature-gates/feature-gate-asm.rs similarity index 100% rename from src/test/ui/feature-gate-asm.rs rename to src/test/ui/feature-gates/feature-gate-asm.rs diff --git a/src/test/ui/feature-gate-asm.stderr b/src/test/ui/feature-gates/feature-gate-asm.stderr similarity index 100% rename from src/test/ui/feature-gate-asm.stderr rename to src/test/ui/feature-gates/feature-gate-asm.stderr diff --git a/src/test/ui/feature-gate-asm2.rs b/src/test/ui/feature-gates/feature-gate-asm2.rs similarity index 100% rename from src/test/ui/feature-gate-asm2.rs rename to src/test/ui/feature-gates/feature-gate-asm2.rs diff --git a/src/test/ui/feature-gate-asm2.stderr b/src/test/ui/feature-gates/feature-gate-asm2.stderr similarity index 100% rename from src/test/ui/feature-gate-asm2.stderr rename to src/test/ui/feature-gates/feature-gate-asm2.stderr diff --git a/src/test/ui/feature-gate-assoc-type-defaults.rs b/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.rs similarity index 100% rename from src/test/ui/feature-gate-assoc-type-defaults.rs rename to src/test/ui/feature-gates/feature-gate-assoc-type-defaults.rs diff --git a/src/test/ui/feature-gate-assoc-type-defaults.stderr b/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.stderr similarity index 100% rename from src/test/ui/feature-gate-assoc-type-defaults.stderr rename to src/test/ui/feature-gates/feature-gate-assoc-type-defaults.stderr diff --git a/src/test/ui/feature-gate-async-await-2015-edition.rs b/src/test/ui/feature-gates/feature-gate-async-await-2015-edition.rs similarity index 100% rename from src/test/ui/feature-gate-async-await-2015-edition.rs rename to src/test/ui/feature-gates/feature-gate-async-await-2015-edition.rs diff --git a/src/test/ui/feature-gate-async-await-2015-edition.stderr b/src/test/ui/feature-gates/feature-gate-async-await-2015-edition.stderr similarity index 100% rename from src/test/ui/feature-gate-async-await-2015-edition.stderr rename to src/test/ui/feature-gates/feature-gate-async-await-2015-edition.stderr diff --git a/src/test/ui/feature-gate-async-await.rs b/src/test/ui/feature-gates/feature-gate-async-await.rs similarity index 100% rename from src/test/ui/feature-gate-async-await.rs rename to src/test/ui/feature-gates/feature-gate-async-await.rs diff --git a/src/test/ui/feature-gate-async-await.stderr b/src/test/ui/feature-gates/feature-gate-async-await.stderr similarity index 100% rename from src/test/ui/feature-gate-async-await.stderr rename to src/test/ui/feature-gates/feature-gate-async-await.stderr diff --git a/src/test/ui/feature-gate-box-expr.rs b/src/test/ui/feature-gates/feature-gate-box-expr.rs similarity index 100% rename from src/test/ui/feature-gate-box-expr.rs rename to src/test/ui/feature-gates/feature-gate-box-expr.rs diff --git a/src/test/ui/feature-gate-box-expr.stderr b/src/test/ui/feature-gates/feature-gate-box-expr.stderr similarity index 100% rename from src/test/ui/feature-gate-box-expr.stderr rename to src/test/ui/feature-gates/feature-gate-box-expr.stderr diff --git a/src/test/ui/feature-gate-box_patterns.rs b/src/test/ui/feature-gates/feature-gate-box_patterns.rs similarity index 100% rename from src/test/ui/feature-gate-box_patterns.rs rename to src/test/ui/feature-gates/feature-gate-box_patterns.rs diff --git a/src/test/ui/feature-gate-box_patterns.stderr b/src/test/ui/feature-gates/feature-gate-box_patterns.stderr similarity index 100% rename from src/test/ui/feature-gate-box_patterns.stderr rename to src/test/ui/feature-gates/feature-gate-box_patterns.stderr diff --git a/src/test/ui/feature-gate-box_syntax.rs b/src/test/ui/feature-gates/feature-gate-box_syntax.rs similarity index 100% rename from src/test/ui/feature-gate-box_syntax.rs rename to src/test/ui/feature-gates/feature-gate-box_syntax.rs diff --git a/src/test/ui/feature-gate-box_syntax.stderr b/src/test/ui/feature-gates/feature-gate-box_syntax.stderr similarity index 100% rename from src/test/ui/feature-gate-box_syntax.stderr rename to src/test/ui/feature-gates/feature-gate-box_syntax.stderr diff --git a/src/test/ui/feature-gate-catch_expr.rs b/src/test/ui/feature-gates/feature-gate-catch_expr.rs similarity index 100% rename from src/test/ui/feature-gate-catch_expr.rs rename to src/test/ui/feature-gates/feature-gate-catch_expr.rs diff --git a/src/test/ui/feature-gate-catch_expr.stderr b/src/test/ui/feature-gates/feature-gate-catch_expr.stderr similarity index 100% rename from src/test/ui/feature-gate-catch_expr.stderr rename to src/test/ui/feature-gates/feature-gate-catch_expr.stderr diff --git a/src/test/ui/feature-gate-cfg-target-has-atomic.rs b/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.rs similarity index 100% rename from src/test/ui/feature-gate-cfg-target-has-atomic.rs rename to src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.rs diff --git a/src/test/ui/feature-gate-cfg-target-has-atomic.stderr b/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.stderr similarity index 100% rename from src/test/ui/feature-gate-cfg-target-has-atomic.stderr rename to src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.stderr diff --git a/src/test/ui/feature-gate-cfg-target-thread-local.rs b/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.rs similarity index 100% rename from src/test/ui/feature-gate-cfg-target-thread-local.rs rename to src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.rs diff --git a/src/test/ui/feature-gate-cfg-target-thread-local.stderr b/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.stderr similarity index 100% rename from src/test/ui/feature-gate-cfg-target-thread-local.stderr rename to src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.stderr diff --git a/src/test/ui/feature-gate-cfg-target-vendor.rs b/src/test/ui/feature-gates/feature-gate-cfg-target-vendor.rs similarity index 100% rename from src/test/ui/feature-gate-cfg-target-vendor.rs rename to src/test/ui/feature-gates/feature-gate-cfg-target-vendor.rs diff --git a/src/test/ui/feature-gate-cfg-target-vendor.stderr b/src/test/ui/feature-gates/feature-gate-cfg-target-vendor.stderr similarity index 100% rename from src/test/ui/feature-gate-cfg-target-vendor.stderr rename to src/test/ui/feature-gates/feature-gate-cfg-target-vendor.stderr diff --git a/src/test/ui/feature-gate-compiler-builtins.rs b/src/test/ui/feature-gates/feature-gate-compiler-builtins.rs similarity index 100% rename from src/test/ui/feature-gate-compiler-builtins.rs rename to src/test/ui/feature-gates/feature-gate-compiler-builtins.rs diff --git a/src/test/ui/feature-gate-compiler-builtins.stderr b/src/test/ui/feature-gates/feature-gate-compiler-builtins.stderr similarity index 100% rename from src/test/ui/feature-gate-compiler-builtins.stderr rename to src/test/ui/feature-gates/feature-gate-compiler-builtins.stderr diff --git a/src/test/ui/feature-gate-concat_idents.rs b/src/test/ui/feature-gates/feature-gate-concat_idents.rs similarity index 100% rename from src/test/ui/feature-gate-concat_idents.rs rename to src/test/ui/feature-gates/feature-gate-concat_idents.rs diff --git a/src/test/ui/feature-gate-concat_idents.stderr b/src/test/ui/feature-gates/feature-gate-concat_idents.stderr similarity index 100% rename from src/test/ui/feature-gate-concat_idents.stderr rename to src/test/ui/feature-gates/feature-gate-concat_idents.stderr diff --git a/src/test/ui/feature-gate-concat_idents2.rs b/src/test/ui/feature-gates/feature-gate-concat_idents2.rs similarity index 100% rename from src/test/ui/feature-gate-concat_idents2.rs rename to src/test/ui/feature-gates/feature-gate-concat_idents2.rs diff --git a/src/test/ui/feature-gate-concat_idents2.stderr b/src/test/ui/feature-gates/feature-gate-concat_idents2.stderr similarity index 100% rename from src/test/ui/feature-gate-concat_idents2.stderr rename to src/test/ui/feature-gates/feature-gate-concat_idents2.stderr diff --git a/src/test/ui/feature-gate-concat_idents3.rs b/src/test/ui/feature-gates/feature-gate-concat_idents3.rs similarity index 100% rename from src/test/ui/feature-gate-concat_idents3.rs rename to src/test/ui/feature-gates/feature-gate-concat_idents3.rs diff --git a/src/test/ui/feature-gate-concat_idents3.stderr b/src/test/ui/feature-gates/feature-gate-concat_idents3.stderr similarity index 100% rename from src/test/ui/feature-gate-concat_idents3.stderr rename to src/test/ui/feature-gates/feature-gate-concat_idents3.stderr diff --git a/src/test/ui/feature-gate-const-indexing.rs b/src/test/ui/feature-gates/feature-gate-const-indexing.rs similarity index 100% rename from src/test/ui/feature-gate-const-indexing.rs rename to src/test/ui/feature-gates/feature-gate-const-indexing.rs diff --git a/src/test/ui/feature-gate-const_fn.rs b/src/test/ui/feature-gates/feature-gate-const_fn.rs similarity index 100% rename from src/test/ui/feature-gate-const_fn.rs rename to src/test/ui/feature-gates/feature-gate-const_fn.rs diff --git a/src/test/ui/feature-gate-const_fn.stderr b/src/test/ui/feature-gates/feature-gate-const_fn.stderr similarity index 100% rename from src/test/ui/feature-gate-const_fn.stderr rename to src/test/ui/feature-gates/feature-gate-const_fn.stderr diff --git a/src/test/ui/feature-gate-const_let.rs b/src/test/ui/feature-gates/feature-gate-const_let.rs similarity index 100% rename from src/test/ui/feature-gate-const_let.rs rename to src/test/ui/feature-gates/feature-gate-const_let.rs diff --git a/src/test/ui/feature-gate-const_let.stderr b/src/test/ui/feature-gates/feature-gate-const_let.stderr similarity index 100% rename from src/test/ui/feature-gate-const_let.stderr rename to src/test/ui/feature-gates/feature-gate-const_let.stderr diff --git a/src/test/ui/feature-gate-crate_in_paths.rs b/src/test/ui/feature-gates/feature-gate-crate_in_paths.rs similarity index 100% rename from src/test/ui/feature-gate-crate_in_paths.rs rename to src/test/ui/feature-gates/feature-gate-crate_in_paths.rs diff --git a/src/test/ui/feature-gate-crate_in_paths.stderr b/src/test/ui/feature-gates/feature-gate-crate_in_paths.stderr similarity index 100% rename from src/test/ui/feature-gate-crate_in_paths.stderr rename to src/test/ui/feature-gates/feature-gate-crate_in_paths.stderr diff --git a/src/test/ui/feature-gate-crate_visibility_modifier.rs b/src/test/ui/feature-gates/feature-gate-crate_visibility_modifier.rs similarity index 100% rename from src/test/ui/feature-gate-crate_visibility_modifier.rs rename to src/test/ui/feature-gates/feature-gate-crate_visibility_modifier.rs diff --git a/src/test/ui/feature-gate-crate_visibility_modifier.stderr b/src/test/ui/feature-gates/feature-gate-crate_visibility_modifier.stderr similarity index 100% rename from src/test/ui/feature-gate-crate_visibility_modifier.stderr rename to src/test/ui/feature-gates/feature-gate-crate_visibility_modifier.stderr diff --git a/src/test/ui/feature-gate-custom_attribute.rs b/src/test/ui/feature-gates/feature-gate-custom_attribute.rs similarity index 100% rename from src/test/ui/feature-gate-custom_attribute.rs rename to src/test/ui/feature-gates/feature-gate-custom_attribute.rs diff --git a/src/test/ui/feature-gate-custom_attribute.stderr b/src/test/ui/feature-gates/feature-gate-custom_attribute.stderr similarity index 100% rename from src/test/ui/feature-gate-custom_attribute.stderr rename to src/test/ui/feature-gates/feature-gate-custom_attribute.stderr diff --git a/src/test/ui/feature-gate-custom_attribute2.rs b/src/test/ui/feature-gates/feature-gate-custom_attribute2.rs similarity index 100% rename from src/test/ui/feature-gate-custom_attribute2.rs rename to src/test/ui/feature-gates/feature-gate-custom_attribute2.rs diff --git a/src/test/ui/feature-gate-custom_attribute2.stderr b/src/test/ui/feature-gates/feature-gate-custom_attribute2.stderr similarity index 100% rename from src/test/ui/feature-gate-custom_attribute2.stderr rename to src/test/ui/feature-gates/feature-gate-custom_attribute2.stderr diff --git a/src/test/ui/feature-gate-custom_derive.rs b/src/test/ui/feature-gates/feature-gate-custom_derive.rs similarity index 100% rename from src/test/ui/feature-gate-custom_derive.rs rename to src/test/ui/feature-gates/feature-gate-custom_derive.rs diff --git a/src/test/ui/feature-gate-custom_derive.stderr b/src/test/ui/feature-gates/feature-gate-custom_derive.stderr similarity index 100% rename from src/test/ui/feature-gate-custom_derive.stderr rename to src/test/ui/feature-gates/feature-gate-custom_derive.stderr diff --git a/src/test/ui/feature-gate-decl_macro.rs b/src/test/ui/feature-gates/feature-gate-decl_macro.rs similarity index 100% rename from src/test/ui/feature-gate-decl_macro.rs rename to src/test/ui/feature-gates/feature-gate-decl_macro.rs diff --git a/src/test/ui/feature-gate-decl_macro.stderr b/src/test/ui/feature-gates/feature-gate-decl_macro.stderr similarity index 100% rename from src/test/ui/feature-gate-decl_macro.stderr rename to src/test/ui/feature-gates/feature-gate-decl_macro.stderr diff --git a/src/test/ui/feature-gate-default_type_parameter_fallback.rs b/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.rs similarity index 100% rename from src/test/ui/feature-gate-default_type_parameter_fallback.rs rename to src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.rs diff --git a/src/test/ui/feature-gate-default_type_parameter_fallback.stderr b/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.stderr similarity index 100% rename from src/test/ui/feature-gate-default_type_parameter_fallback.stderr rename to src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.stderr diff --git a/src/test/ui/feature-gate-doc_alias.rs b/src/test/ui/feature-gates/feature-gate-doc_alias.rs similarity index 100% rename from src/test/ui/feature-gate-doc_alias.rs rename to src/test/ui/feature-gates/feature-gate-doc_alias.rs diff --git a/src/test/ui/feature-gate-doc_alias.stderr b/src/test/ui/feature-gates/feature-gate-doc_alias.stderr similarity index 100% rename from src/test/ui/feature-gate-doc_alias.stderr rename to src/test/ui/feature-gates/feature-gate-doc_alias.stderr diff --git a/src/test/ui/feature-gate-doc_cfg.rs b/src/test/ui/feature-gates/feature-gate-doc_cfg.rs similarity index 100% rename from src/test/ui/feature-gate-doc_cfg.rs rename to src/test/ui/feature-gates/feature-gate-doc_cfg.rs diff --git a/src/test/ui/feature-gate-doc_cfg.stderr b/src/test/ui/feature-gates/feature-gate-doc_cfg.stderr similarity index 100% rename from src/test/ui/feature-gate-doc_cfg.stderr rename to src/test/ui/feature-gates/feature-gate-doc_cfg.stderr diff --git a/src/test/ui/feature-gate-doc_keyword.rs b/src/test/ui/feature-gates/feature-gate-doc_keyword.rs similarity index 100% rename from src/test/ui/feature-gate-doc_keyword.rs rename to src/test/ui/feature-gates/feature-gate-doc_keyword.rs diff --git a/src/test/ui/feature-gate-doc_keyword.stderr b/src/test/ui/feature-gates/feature-gate-doc_keyword.stderr similarity index 100% rename from src/test/ui/feature-gate-doc_keyword.stderr rename to src/test/ui/feature-gates/feature-gate-doc_keyword.stderr diff --git a/src/test/ui/feature-gate-doc_masked.rs b/src/test/ui/feature-gates/feature-gate-doc_masked.rs similarity index 100% rename from src/test/ui/feature-gate-doc_masked.rs rename to src/test/ui/feature-gates/feature-gate-doc_masked.rs diff --git a/src/test/ui/feature-gate-doc_masked.stderr b/src/test/ui/feature-gates/feature-gate-doc_masked.stderr similarity index 100% rename from src/test/ui/feature-gate-doc_masked.stderr rename to src/test/ui/feature-gates/feature-gate-doc_masked.stderr diff --git a/src/test/ui/feature-gate-doc_spotlight.rs b/src/test/ui/feature-gates/feature-gate-doc_spotlight.rs similarity index 100% rename from src/test/ui/feature-gate-doc_spotlight.rs rename to src/test/ui/feature-gates/feature-gate-doc_spotlight.rs diff --git a/src/test/ui/feature-gate-doc_spotlight.stderr b/src/test/ui/feature-gates/feature-gate-doc_spotlight.stderr similarity index 100% rename from src/test/ui/feature-gate-doc_spotlight.stderr rename to src/test/ui/feature-gates/feature-gate-doc_spotlight.stderr diff --git a/src/test/ui/feature-gate-dropck-ugeh-2.rs b/src/test/ui/feature-gates/feature-gate-dropck-ugeh-2.rs similarity index 100% rename from src/test/ui/feature-gate-dropck-ugeh-2.rs rename to src/test/ui/feature-gates/feature-gate-dropck-ugeh-2.rs diff --git a/src/test/ui/feature-gate-dropck-ugeh-2.stderr b/src/test/ui/feature-gates/feature-gate-dropck-ugeh-2.stderr similarity index 100% rename from src/test/ui/feature-gate-dropck-ugeh-2.stderr rename to src/test/ui/feature-gates/feature-gate-dropck-ugeh-2.stderr diff --git a/src/test/ui/feature-gate-dropck-ugeh.rs b/src/test/ui/feature-gates/feature-gate-dropck-ugeh.rs similarity index 100% rename from src/test/ui/feature-gate-dropck-ugeh.rs rename to src/test/ui/feature-gates/feature-gate-dropck-ugeh.rs diff --git a/src/test/ui/feature-gate-dropck-ugeh.stderr b/src/test/ui/feature-gates/feature-gate-dropck-ugeh.stderr similarity index 100% rename from src/test/ui/feature-gate-dropck-ugeh.stderr rename to src/test/ui/feature-gates/feature-gate-dropck-ugeh.stderr diff --git a/src/test/ui/feature-gate-exclusive-range-pattern.rs b/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.rs similarity index 100% rename from src/test/ui/feature-gate-exclusive-range-pattern.rs rename to src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.rs diff --git a/src/test/ui/feature-gate-exclusive-range-pattern.stderr b/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.stderr similarity index 100% rename from src/test/ui/feature-gate-exclusive-range-pattern.stderr rename to src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.stderr diff --git a/src/test/ui/feature-gate-exhaustive-patterns.rs b/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.rs similarity index 100% rename from src/test/ui/feature-gate-exhaustive-patterns.rs rename to src/test/ui/feature-gates/feature-gate-exhaustive-patterns.rs diff --git a/src/test/ui/feature-gate-exhaustive-patterns.stderr b/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.stderr similarity index 100% rename from src/test/ui/feature-gate-exhaustive-patterns.stderr rename to src/test/ui/feature-gates/feature-gate-exhaustive-patterns.stderr diff --git a/src/test/ui/feature-gate-existential-type.rs b/src/test/ui/feature-gates/feature-gate-existential-type.rs similarity index 100% rename from src/test/ui/feature-gate-existential-type.rs rename to src/test/ui/feature-gates/feature-gate-existential-type.rs diff --git a/src/test/ui/feature-gate-existential-type.stderr b/src/test/ui/feature-gates/feature-gate-existential-type.stderr similarity index 100% rename from src/test/ui/feature-gate-existential-type.stderr rename to src/test/ui/feature-gates/feature-gate-existential-type.stderr diff --git a/src/test/ui/feature-gate-extern_absolute_paths.rs b/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.rs similarity index 100% rename from src/test/ui/feature-gate-extern_absolute_paths.rs rename to src/test/ui/feature-gates/feature-gate-extern_absolute_paths.rs diff --git a/src/test/ui/feature-gate-extern_absolute_paths.stderr b/src/test/ui/feature-gates/feature-gate-extern_absolute_paths.stderr similarity index 100% rename from src/test/ui/feature-gate-extern_absolute_paths.stderr rename to src/test/ui/feature-gates/feature-gate-extern_absolute_paths.stderr diff --git a/src/test/ui/feature-gate-extern_in_paths.rs b/src/test/ui/feature-gates/feature-gate-extern_in_paths.rs similarity index 100% rename from src/test/ui/feature-gate-extern_in_paths.rs rename to src/test/ui/feature-gates/feature-gate-extern_in_paths.rs diff --git a/src/test/ui/feature-gate-extern_in_paths.stderr b/src/test/ui/feature-gates/feature-gate-extern_in_paths.stderr similarity index 100% rename from src/test/ui/feature-gate-extern_in_paths.stderr rename to src/test/ui/feature-gates/feature-gate-extern_in_paths.stderr diff --git a/src/test/ui/feature-gate-extern_prelude.rs b/src/test/ui/feature-gates/feature-gate-extern_prelude.rs similarity index 100% rename from src/test/ui/feature-gate-extern_prelude.rs rename to src/test/ui/feature-gates/feature-gate-extern_prelude.rs diff --git a/src/test/ui/feature-gate-extern_prelude.stderr b/src/test/ui/feature-gates/feature-gate-extern_prelude.stderr similarity index 100% rename from src/test/ui/feature-gate-extern_prelude.stderr rename to src/test/ui/feature-gates/feature-gate-extern_prelude.stderr diff --git a/src/test/ui/feature-gate-extern_types.rs b/src/test/ui/feature-gates/feature-gate-extern_types.rs similarity index 100% rename from src/test/ui/feature-gate-extern_types.rs rename to src/test/ui/feature-gates/feature-gate-extern_types.rs diff --git a/src/test/ui/feature-gate-extern_types.stderr b/src/test/ui/feature-gates/feature-gate-extern_types.stderr similarity index 100% rename from src/test/ui/feature-gate-extern_types.stderr rename to src/test/ui/feature-gates/feature-gate-extern_types.stderr diff --git a/src/test/ui/feature-gate-external_doc.rs b/src/test/ui/feature-gates/feature-gate-external_doc.rs similarity index 100% rename from src/test/ui/feature-gate-external_doc.rs rename to src/test/ui/feature-gates/feature-gate-external_doc.rs diff --git a/src/test/ui/feature-gate-external_doc.stderr b/src/test/ui/feature-gates/feature-gate-external_doc.stderr similarity index 100% rename from src/test/ui/feature-gate-external_doc.stderr rename to src/test/ui/feature-gates/feature-gate-external_doc.stderr diff --git a/src/test/ui/feature-gate-feature-gate.rs b/src/test/ui/feature-gates/feature-gate-feature-gate.rs similarity index 100% rename from src/test/ui/feature-gate-feature-gate.rs rename to src/test/ui/feature-gates/feature-gate-feature-gate.rs diff --git a/src/test/ui/feature-gate-feature-gate.stderr b/src/test/ui/feature-gates/feature-gate-feature-gate.stderr similarity index 100% rename from src/test/ui/feature-gate-feature-gate.stderr rename to src/test/ui/feature-gates/feature-gate-feature-gate.stderr diff --git a/src/test/ui/feature-gate-format_args_nl.rs b/src/test/ui/feature-gates/feature-gate-format_args_nl.rs similarity index 100% rename from src/test/ui/feature-gate-format_args_nl.rs rename to src/test/ui/feature-gates/feature-gate-format_args_nl.rs diff --git a/src/test/ui/feature-gate-format_args_nl.stderr b/src/test/ui/feature-gates/feature-gate-format_args_nl.stderr similarity index 100% rename from src/test/ui/feature-gate-format_args_nl.stderr rename to src/test/ui/feature-gates/feature-gate-format_args_nl.stderr diff --git a/src/test/ui/feature-gate-fundamental.rs b/src/test/ui/feature-gates/feature-gate-fundamental.rs similarity index 100% rename from src/test/ui/feature-gate-fundamental.rs rename to src/test/ui/feature-gates/feature-gate-fundamental.rs diff --git a/src/test/ui/feature-gate-fundamental.stderr b/src/test/ui/feature-gates/feature-gate-fundamental.stderr similarity index 100% rename from src/test/ui/feature-gate-fundamental.stderr rename to src/test/ui/feature-gates/feature-gate-fundamental.stderr diff --git a/src/test/ui/feature-gate-generators.rs b/src/test/ui/feature-gates/feature-gate-generators.rs similarity index 100% rename from src/test/ui/feature-gate-generators.rs rename to src/test/ui/feature-gates/feature-gate-generators.rs diff --git a/src/test/ui/feature-gate-generators.stderr b/src/test/ui/feature-gates/feature-gate-generators.stderr similarity index 100% rename from src/test/ui/feature-gate-generators.stderr rename to src/test/ui/feature-gates/feature-gate-generators.stderr diff --git a/src/test/ui/feature-gate-generic_associated_types.rs b/src/test/ui/feature-gates/feature-gate-generic_associated_types.rs similarity index 100% rename from src/test/ui/feature-gate-generic_associated_types.rs rename to src/test/ui/feature-gates/feature-gate-generic_associated_types.rs diff --git a/src/test/ui/feature-gate-generic_associated_types.stderr b/src/test/ui/feature-gates/feature-gate-generic_associated_types.stderr similarity index 100% rename from src/test/ui/feature-gate-generic_associated_types.stderr rename to src/test/ui/feature-gates/feature-gate-generic_associated_types.stderr diff --git a/src/test/ui/feature-gate-global_asm.rs b/src/test/ui/feature-gates/feature-gate-global_asm.rs similarity index 100% rename from src/test/ui/feature-gate-global_asm.rs rename to src/test/ui/feature-gates/feature-gate-global_asm.rs diff --git a/src/test/ui/feature-gate-global_asm.stderr b/src/test/ui/feature-gates/feature-gate-global_asm.stderr similarity index 100% rename from src/test/ui/feature-gate-global_asm.stderr rename to src/test/ui/feature-gates/feature-gate-global_asm.stderr diff --git a/src/test/ui/feature-gate-if_while_or_patterns.rs b/src/test/ui/feature-gates/feature-gate-if_while_or_patterns.rs similarity index 100% rename from src/test/ui/feature-gate-if_while_or_patterns.rs rename to src/test/ui/feature-gates/feature-gate-if_while_or_patterns.rs diff --git a/src/test/ui/feature-gate-if_while_or_patterns.stderr b/src/test/ui/feature-gates/feature-gate-if_while_or_patterns.stderr similarity index 100% rename from src/test/ui/feature-gate-if_while_or_patterns.stderr rename to src/test/ui/feature-gates/feature-gate-if_while_or_patterns.stderr diff --git a/src/test/ui/feature-gate-impl_header_lifetime_elision-with-in_band.rs b/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision-with-in_band.rs similarity index 100% rename from src/test/ui/feature-gate-impl_header_lifetime_elision-with-in_band.rs rename to src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision-with-in_band.rs diff --git a/src/test/ui/feature-gate-impl_header_lifetime_elision-with-in_band.stderr b/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision-with-in_band.stderr similarity index 100% rename from src/test/ui/feature-gate-impl_header_lifetime_elision-with-in_band.stderr rename to src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision-with-in_band.stderr diff --git a/src/test/ui/feature-gate-impl_header_lifetime_elision.rs b/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision.rs similarity index 100% rename from src/test/ui/feature-gate-impl_header_lifetime_elision.rs rename to src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision.rs diff --git a/src/test/ui/feature-gate-impl_header_lifetime_elision.stderr b/src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision.stderr similarity index 100% rename from src/test/ui/feature-gate-impl_header_lifetime_elision.stderr rename to src/test/ui/feature-gates/feature-gate-impl_header_lifetime_elision.stderr diff --git a/src/test/ui/feature-gate-in_band_lifetimes.rs b/src/test/ui/feature-gates/feature-gate-in_band_lifetimes.rs similarity index 100% rename from src/test/ui/feature-gate-in_band_lifetimes.rs rename to src/test/ui/feature-gates/feature-gate-in_band_lifetimes.rs diff --git a/src/test/ui/feature-gate-in_band_lifetimes.stderr b/src/test/ui/feature-gates/feature-gate-in_band_lifetimes.stderr similarity index 100% rename from src/test/ui/feature-gate-in_band_lifetimes.stderr rename to src/test/ui/feature-gates/feature-gate-in_band_lifetimes.stderr diff --git a/src/test/ui/feature-gate-infer_outlives_requirements.rs b/src/test/ui/feature-gates/feature-gate-infer_outlives_requirements.rs similarity index 100% rename from src/test/ui/feature-gate-infer_outlives_requirements.rs rename to src/test/ui/feature-gates/feature-gate-infer_outlives_requirements.rs diff --git a/src/test/ui/feature-gate-infer_outlives_requirements.stderr b/src/test/ui/feature-gates/feature-gate-infer_outlives_requirements.stderr similarity index 100% rename from src/test/ui/feature-gate-infer_outlives_requirements.stderr rename to src/test/ui/feature-gates/feature-gate-infer_outlives_requirements.stderr diff --git a/src/test/ui/feature-gate-infer_static_outlives_requirements.rs b/src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.rs similarity index 100% rename from src/test/ui/feature-gate-infer_static_outlives_requirements.rs rename to src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.rs diff --git a/src/test/ui/feature-gate-infer_static_outlives_requirements.stderr b/src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.stderr similarity index 100% rename from src/test/ui/feature-gate-infer_static_outlives_requirements.stderr rename to src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.stderr diff --git a/src/test/ui/feature-gate-intrinsics.rs b/src/test/ui/feature-gates/feature-gate-intrinsics.rs similarity index 100% rename from src/test/ui/feature-gate-intrinsics.rs rename to src/test/ui/feature-gates/feature-gate-intrinsics.rs diff --git a/src/test/ui/feature-gate-intrinsics.stderr b/src/test/ui/feature-gates/feature-gate-intrinsics.stderr similarity index 100% rename from src/test/ui/feature-gate-intrinsics.stderr rename to src/test/ui/feature-gates/feature-gate-intrinsics.stderr diff --git a/src/test/ui/feature-gate-label_break_value.rs b/src/test/ui/feature-gates/feature-gate-label_break_value.rs similarity index 100% rename from src/test/ui/feature-gate-label_break_value.rs rename to src/test/ui/feature-gates/feature-gate-label_break_value.rs diff --git a/src/test/ui/feature-gate-label_break_value.stderr b/src/test/ui/feature-gates/feature-gate-label_break_value.stderr similarity index 100% rename from src/test/ui/feature-gate-label_break_value.stderr rename to src/test/ui/feature-gates/feature-gate-label_break_value.stderr diff --git a/src/test/ui/feature-gate-lang-items.rs b/src/test/ui/feature-gates/feature-gate-lang-items.rs similarity index 100% rename from src/test/ui/feature-gate-lang-items.rs rename to src/test/ui/feature-gates/feature-gate-lang-items.rs diff --git a/src/test/ui/feature-gate-lang-items.stderr b/src/test/ui/feature-gates/feature-gate-lang-items.stderr similarity index 100% rename from src/test/ui/feature-gate-lang-items.stderr rename to src/test/ui/feature-gates/feature-gate-lang-items.stderr diff --git a/src/test/ui/feature-gate-link_args.rs b/src/test/ui/feature-gates/feature-gate-link_args.rs similarity index 100% rename from src/test/ui/feature-gate-link_args.rs rename to src/test/ui/feature-gates/feature-gate-link_args.rs diff --git a/src/test/ui/feature-gate-link_args.stderr b/src/test/ui/feature-gates/feature-gate-link_args.stderr similarity index 100% rename from src/test/ui/feature-gate-link_args.stderr rename to src/test/ui/feature-gates/feature-gate-link_args.stderr diff --git a/src/test/ui/feature-gate-link_cfg.rs b/src/test/ui/feature-gates/feature-gate-link_cfg.rs similarity index 100% rename from src/test/ui/feature-gate-link_cfg.rs rename to src/test/ui/feature-gates/feature-gate-link_cfg.rs diff --git a/src/test/ui/feature-gate-link_cfg.stderr b/src/test/ui/feature-gates/feature-gate-link_cfg.stderr similarity index 100% rename from src/test/ui/feature-gate-link_cfg.stderr rename to src/test/ui/feature-gates/feature-gate-link_cfg.stderr diff --git a/src/test/ui/feature-gate-link_llvm_intrinsics.rs b/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.rs similarity index 100% rename from src/test/ui/feature-gate-link_llvm_intrinsics.rs rename to src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.rs diff --git a/src/test/ui/feature-gate-link_llvm_intrinsics.stderr b/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.stderr similarity index 100% rename from src/test/ui/feature-gate-link_llvm_intrinsics.stderr rename to src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.stderr diff --git a/src/test/ui/feature-gate-linkage.rs b/src/test/ui/feature-gates/feature-gate-linkage.rs similarity index 100% rename from src/test/ui/feature-gate-linkage.rs rename to src/test/ui/feature-gates/feature-gate-linkage.rs diff --git a/src/test/ui/feature-gate-linkage.stderr b/src/test/ui/feature-gates/feature-gate-linkage.stderr similarity index 100% rename from src/test/ui/feature-gate-linkage.stderr rename to src/test/ui/feature-gates/feature-gate-linkage.stderr diff --git a/src/test/ui/feature-gate-linker-flavor.rs b/src/test/ui/feature-gates/feature-gate-linker-flavor.rs similarity index 100% rename from src/test/ui/feature-gate-linker-flavor.rs rename to src/test/ui/feature-gates/feature-gate-linker-flavor.rs diff --git a/src/test/ui/feature-gate-linker-flavor.stderr b/src/test/ui/feature-gates/feature-gate-linker-flavor.stderr similarity index 100% rename from src/test/ui/feature-gate-linker-flavor.stderr rename to src/test/ui/feature-gates/feature-gate-linker-flavor.stderr diff --git a/src/test/ui/feature-gate-log_syntax.rs b/src/test/ui/feature-gates/feature-gate-log_syntax.rs similarity index 100% rename from src/test/ui/feature-gate-log_syntax.rs rename to src/test/ui/feature-gates/feature-gate-log_syntax.rs diff --git a/src/test/ui/feature-gate-log_syntax.stderr b/src/test/ui/feature-gates/feature-gate-log_syntax.stderr similarity index 100% rename from src/test/ui/feature-gate-log_syntax.stderr rename to src/test/ui/feature-gates/feature-gate-log_syntax.stderr diff --git a/src/test/ui/feature-gate-log_syntax2.rs b/src/test/ui/feature-gates/feature-gate-log_syntax2.rs similarity index 100% rename from src/test/ui/feature-gate-log_syntax2.rs rename to src/test/ui/feature-gates/feature-gate-log_syntax2.rs diff --git a/src/test/ui/feature-gate-log_syntax2.stderr b/src/test/ui/feature-gates/feature-gate-log_syntax2.stderr similarity index 100% rename from src/test/ui/feature-gate-log_syntax2.stderr rename to src/test/ui/feature-gates/feature-gate-log_syntax2.stderr diff --git a/src/test/ui/feature-gate-macro-literal-matcher.rs b/src/test/ui/feature-gates/feature-gate-macro-literal-matcher.rs similarity index 100% rename from src/test/ui/feature-gate-macro-literal-matcher.rs rename to src/test/ui/feature-gates/feature-gate-macro-literal-matcher.rs diff --git a/src/test/ui/feature-gate-macro-literal-matcher.stderr b/src/test/ui/feature-gates/feature-gate-macro-literal-matcher.stderr similarity index 100% rename from src/test/ui/feature-gate-macro-literal-matcher.stderr rename to src/test/ui/feature-gates/feature-gate-macro-literal-matcher.stderr diff --git a/src/test/ui/feature-gate-macro-vis-matcher.rs b/src/test/ui/feature-gates/feature-gate-macro-vis-matcher.rs similarity index 100% rename from src/test/ui/feature-gate-macro-vis-matcher.rs rename to src/test/ui/feature-gates/feature-gate-macro-vis-matcher.rs diff --git a/src/test/ui/feature-gate-macro-vis-matcher.stderr b/src/test/ui/feature-gates/feature-gate-macro-vis-matcher.stderr similarity index 100% rename from src/test/ui/feature-gate-macro-vis-matcher.stderr rename to src/test/ui/feature-gates/feature-gate-macro-vis-matcher.stderr diff --git a/src/test/ui/feature-gate-macros_in_extern.rs b/src/test/ui/feature-gates/feature-gate-macros_in_extern.rs similarity index 100% rename from src/test/ui/feature-gate-macros_in_extern.rs rename to src/test/ui/feature-gates/feature-gate-macros_in_extern.rs diff --git a/src/test/ui/feature-gate-macros_in_extern.stderr b/src/test/ui/feature-gates/feature-gate-macros_in_extern.stderr similarity index 100% rename from src/test/ui/feature-gate-macros_in_extern.stderr rename to src/test/ui/feature-gates/feature-gate-macros_in_extern.stderr diff --git a/src/test/ui/feature-gate-main.rs b/src/test/ui/feature-gates/feature-gate-main.rs similarity index 100% rename from src/test/ui/feature-gate-main.rs rename to src/test/ui/feature-gates/feature-gate-main.rs diff --git a/src/test/ui/feature-gate-main.stderr b/src/test/ui/feature-gates/feature-gate-main.stderr similarity index 100% rename from src/test/ui/feature-gate-main.stderr rename to src/test/ui/feature-gates/feature-gate-main.stderr diff --git a/src/test/ui/feature-gate-may-dangle.rs b/src/test/ui/feature-gates/feature-gate-may-dangle.rs similarity index 100% rename from src/test/ui/feature-gate-may-dangle.rs rename to src/test/ui/feature-gates/feature-gate-may-dangle.rs diff --git a/src/test/ui/feature-gate-may-dangle.stderr b/src/test/ui/feature-gates/feature-gate-may-dangle.stderr similarity index 100% rename from src/test/ui/feature-gate-may-dangle.stderr rename to src/test/ui/feature-gates/feature-gate-may-dangle.stderr diff --git a/src/test/ui/feature-gate-naked_functions.rs b/src/test/ui/feature-gates/feature-gate-naked_functions.rs similarity index 100% rename from src/test/ui/feature-gate-naked_functions.rs rename to src/test/ui/feature-gates/feature-gate-naked_functions.rs diff --git a/src/test/ui/feature-gate-naked_functions.stderr b/src/test/ui/feature-gates/feature-gate-naked_functions.stderr similarity index 100% rename from src/test/ui/feature-gate-naked_functions.stderr rename to src/test/ui/feature-gates/feature-gate-naked_functions.stderr diff --git a/src/test/ui/feature-gate-needs-allocator.rs b/src/test/ui/feature-gates/feature-gate-needs-allocator.rs similarity index 100% rename from src/test/ui/feature-gate-needs-allocator.rs rename to src/test/ui/feature-gates/feature-gate-needs-allocator.rs diff --git a/src/test/ui/feature-gate-needs-allocator.stderr b/src/test/ui/feature-gates/feature-gate-needs-allocator.stderr similarity index 100% rename from src/test/ui/feature-gate-needs-allocator.stderr rename to src/test/ui/feature-gates/feature-gate-needs-allocator.stderr diff --git a/src/test/ui/feature-gate-negate-unsigned.rs b/src/test/ui/feature-gates/feature-gate-negate-unsigned.rs similarity index 100% rename from src/test/ui/feature-gate-negate-unsigned.rs rename to src/test/ui/feature-gates/feature-gate-negate-unsigned.rs diff --git a/src/test/ui/feature-gate-negate-unsigned.stderr b/src/test/ui/feature-gates/feature-gate-negate-unsigned.stderr similarity index 100% rename from src/test/ui/feature-gate-negate-unsigned.stderr rename to src/test/ui/feature-gates/feature-gate-negate-unsigned.stderr diff --git a/src/test/ui/feature-gate-never_type.rs b/src/test/ui/feature-gates/feature-gate-never_type.rs similarity index 100% rename from src/test/ui/feature-gate-never_type.rs rename to src/test/ui/feature-gates/feature-gate-never_type.rs diff --git a/src/test/ui/feature-gate-never_type.stderr b/src/test/ui/feature-gates/feature-gate-never_type.stderr similarity index 100% rename from src/test/ui/feature-gate-never_type.stderr rename to src/test/ui/feature-gates/feature-gate-never_type.stderr diff --git a/src/test/ui/feature-gate-nll.nll.stderr b/src/test/ui/feature-gates/feature-gate-nll.nll.stderr similarity index 100% rename from src/test/ui/feature-gate-nll.nll.stderr rename to src/test/ui/feature-gates/feature-gate-nll.nll.stderr diff --git a/src/test/ui/feature-gate-nll.rs b/src/test/ui/feature-gates/feature-gate-nll.rs similarity index 100% rename from src/test/ui/feature-gate-nll.rs rename to src/test/ui/feature-gates/feature-gate-nll.rs diff --git a/src/test/ui/feature-gate-nll.stderr b/src/test/ui/feature-gates/feature-gate-nll.stderr similarity index 100% rename from src/test/ui/feature-gate-nll.stderr rename to src/test/ui/feature-gates/feature-gate-nll.stderr diff --git a/src/test/ui/feature-gate-no-debug-2.rs b/src/test/ui/feature-gates/feature-gate-no-debug-2.rs similarity index 100% rename from src/test/ui/feature-gate-no-debug-2.rs rename to src/test/ui/feature-gates/feature-gate-no-debug-2.rs diff --git a/src/test/ui/feature-gate-no-debug-2.stderr b/src/test/ui/feature-gates/feature-gate-no-debug-2.stderr similarity index 100% rename from src/test/ui/feature-gate-no-debug-2.stderr rename to src/test/ui/feature-gates/feature-gate-no-debug-2.stderr diff --git a/src/test/ui/feature-gate-no-debug.rs b/src/test/ui/feature-gates/feature-gate-no-debug.rs similarity index 100% rename from src/test/ui/feature-gate-no-debug.rs rename to src/test/ui/feature-gates/feature-gate-no-debug.rs diff --git a/src/test/ui/feature-gate-no-debug.stderr b/src/test/ui/feature-gates/feature-gate-no-debug.stderr similarity index 100% rename from src/test/ui/feature-gate-no-debug.stderr rename to src/test/ui/feature-gates/feature-gate-no-debug.stderr diff --git a/src/test/ui/feature-gate-no_core.rs b/src/test/ui/feature-gates/feature-gate-no_core.rs similarity index 100% rename from src/test/ui/feature-gate-no_core.rs rename to src/test/ui/feature-gates/feature-gate-no_core.rs diff --git a/src/test/ui/feature-gate-no_core.stderr b/src/test/ui/feature-gates/feature-gate-no_core.stderr similarity index 100% rename from src/test/ui/feature-gate-no_core.stderr rename to src/test/ui/feature-gates/feature-gate-no_core.stderr diff --git a/src/test/ui/feature-gate-non_ascii_idents.rs b/src/test/ui/feature-gates/feature-gate-non_ascii_idents.rs similarity index 100% rename from src/test/ui/feature-gate-non_ascii_idents.rs rename to src/test/ui/feature-gates/feature-gate-non_ascii_idents.rs diff --git a/src/test/ui/feature-gate-non_ascii_idents.stderr b/src/test/ui/feature-gates/feature-gate-non_ascii_idents.stderr similarity index 100% rename from src/test/ui/feature-gate-non_ascii_idents.stderr rename to src/test/ui/feature-gates/feature-gate-non_ascii_idents.stderr diff --git a/src/test/ui/feature-gate-non_exhaustive.rs b/src/test/ui/feature-gates/feature-gate-non_exhaustive.rs similarity index 100% rename from src/test/ui/feature-gate-non_exhaustive.rs rename to src/test/ui/feature-gates/feature-gate-non_exhaustive.rs diff --git a/src/test/ui/feature-gate-non_exhaustive.stderr b/src/test/ui/feature-gates/feature-gate-non_exhaustive.stderr similarity index 100% rename from src/test/ui/feature-gate-non_exhaustive.stderr rename to src/test/ui/feature-gates/feature-gate-non_exhaustive.stderr diff --git a/src/test/ui/feature-gate-omit-gdb-pretty-printer-section.rs b/src/test/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.rs similarity index 100% rename from src/test/ui/feature-gate-omit-gdb-pretty-printer-section.rs rename to src/test/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.rs diff --git a/src/test/ui/feature-gate-omit-gdb-pretty-printer-section.stderr b/src/test/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.stderr similarity index 100% rename from src/test/ui/feature-gate-omit-gdb-pretty-printer-section.stderr rename to src/test/ui/feature-gates/feature-gate-omit-gdb-pretty-printer-section.stderr diff --git a/src/test/ui/feature-gate-on-unimplemented.rs b/src/test/ui/feature-gates/feature-gate-on-unimplemented.rs similarity index 100% rename from src/test/ui/feature-gate-on-unimplemented.rs rename to src/test/ui/feature-gates/feature-gate-on-unimplemented.rs diff --git a/src/test/ui/feature-gate-on-unimplemented.stderr b/src/test/ui/feature-gates/feature-gate-on-unimplemented.stderr similarity index 100% rename from src/test/ui/feature-gate-on-unimplemented.stderr rename to src/test/ui/feature-gates/feature-gate-on-unimplemented.stderr diff --git a/src/test/ui/feature-gate-optin-builtin-traits.rs b/src/test/ui/feature-gates/feature-gate-optin-builtin-traits.rs similarity index 100% rename from src/test/ui/feature-gate-optin-builtin-traits.rs rename to src/test/ui/feature-gates/feature-gate-optin-builtin-traits.rs diff --git a/src/test/ui/feature-gate-optin-builtin-traits.stderr b/src/test/ui/feature-gates/feature-gate-optin-builtin-traits.stderr similarity index 100% rename from src/test/ui/feature-gate-optin-builtin-traits.stderr rename to src/test/ui/feature-gates/feature-gate-optin-builtin-traits.stderr diff --git a/src/test/ui/feature-gate-overlapping_marker_traits.rs b/src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.rs similarity index 100% rename from src/test/ui/feature-gate-overlapping_marker_traits.rs rename to src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.rs diff --git a/src/test/ui/feature-gate-overlapping_marker_traits.stderr b/src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.stderr similarity index 100% rename from src/test/ui/feature-gate-overlapping_marker_traits.stderr rename to src/test/ui/feature-gates/feature-gate-overlapping_marker_traits.stderr diff --git a/src/test/ui/compile-fail-migration/feature-gate-panic-implementation.rs b/src/test/ui/feature-gates/feature-gate-panic-implementation.rs similarity index 100% rename from src/test/ui/compile-fail-migration/feature-gate-panic-implementation.rs rename to src/test/ui/feature-gates/feature-gate-panic-implementation.rs diff --git a/src/test/ui/compile-fail-migration/feature-gate-panic-implementation.stderr b/src/test/ui/feature-gates/feature-gate-panic-implementation.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/feature-gate-panic-implementation.stderr rename to src/test/ui/feature-gates/feature-gate-panic-implementation.stderr diff --git a/src/test/ui/feature-gate-pattern_parentheses.rs b/src/test/ui/feature-gates/feature-gate-pattern_parentheses.rs similarity index 100% rename from src/test/ui/feature-gate-pattern_parentheses.rs rename to src/test/ui/feature-gates/feature-gate-pattern_parentheses.rs diff --git a/src/test/ui/feature-gate-pattern_parentheses.stderr b/src/test/ui/feature-gates/feature-gate-pattern_parentheses.stderr similarity index 100% rename from src/test/ui/feature-gate-pattern_parentheses.stderr rename to src/test/ui/feature-gates/feature-gate-pattern_parentheses.stderr diff --git a/src/test/ui/feature-gate-plugin.rs b/src/test/ui/feature-gates/feature-gate-plugin.rs similarity index 100% rename from src/test/ui/feature-gate-plugin.rs rename to src/test/ui/feature-gates/feature-gate-plugin.rs diff --git a/src/test/ui/feature-gate-plugin.stderr b/src/test/ui/feature-gates/feature-gate-plugin.stderr similarity index 100% rename from src/test/ui/feature-gate-plugin.stderr rename to src/test/ui/feature-gates/feature-gate-plugin.stderr diff --git a/src/test/ui/feature-gate-plugin_registrar.rs b/src/test/ui/feature-gates/feature-gate-plugin_registrar.rs similarity index 100% rename from src/test/ui/feature-gate-plugin_registrar.rs rename to src/test/ui/feature-gates/feature-gate-plugin_registrar.rs diff --git a/src/test/ui/feature-gate-plugin_registrar.stderr b/src/test/ui/feature-gates/feature-gate-plugin_registrar.stderr similarity index 100% rename from src/test/ui/feature-gate-plugin_registrar.stderr rename to src/test/ui/feature-gates/feature-gate-plugin_registrar.stderr diff --git a/src/test/ui/feature-gate-prelude_import.rs b/src/test/ui/feature-gates/feature-gate-prelude_import.rs similarity index 100% rename from src/test/ui/feature-gate-prelude_import.rs rename to src/test/ui/feature-gates/feature-gate-prelude_import.rs diff --git a/src/test/ui/feature-gate-prelude_import.stderr b/src/test/ui/feature-gates/feature-gate-prelude_import.stderr similarity index 100% rename from src/test/ui/feature-gate-prelude_import.stderr rename to src/test/ui/feature-gates/feature-gate-prelude_import.stderr diff --git a/src/test/ui/feature-gate-profiler-runtime.rs b/src/test/ui/feature-gates/feature-gate-profiler-runtime.rs similarity index 100% rename from src/test/ui/feature-gate-profiler-runtime.rs rename to src/test/ui/feature-gates/feature-gate-profiler-runtime.rs diff --git a/src/test/ui/feature-gate-profiler-runtime.stderr b/src/test/ui/feature-gates/feature-gate-profiler-runtime.stderr similarity index 100% rename from src/test/ui/feature-gate-profiler-runtime.stderr rename to src/test/ui/feature-gates/feature-gate-profiler-runtime.stderr diff --git a/src/test/ui/feature-gate-raw-identifiers.rs b/src/test/ui/feature-gates/feature-gate-raw-identifiers.rs similarity index 100% rename from src/test/ui/feature-gate-raw-identifiers.rs rename to src/test/ui/feature-gates/feature-gate-raw-identifiers.rs diff --git a/src/test/ui/feature-gate-raw-identifiers.stderr b/src/test/ui/feature-gates/feature-gate-raw-identifiers.stderr similarity index 100% rename from src/test/ui/feature-gate-raw-identifiers.stderr rename to src/test/ui/feature-gates/feature-gate-raw-identifiers.stderr diff --git a/src/test/ui/feature-gate-repr-simd.rs b/src/test/ui/feature-gates/feature-gate-repr-simd.rs similarity index 100% rename from src/test/ui/feature-gate-repr-simd.rs rename to src/test/ui/feature-gates/feature-gate-repr-simd.rs diff --git a/src/test/ui/feature-gate-repr-simd.stderr b/src/test/ui/feature-gates/feature-gate-repr-simd.stderr similarity index 100% rename from src/test/ui/feature-gate-repr-simd.stderr rename to src/test/ui/feature-gates/feature-gate-repr-simd.stderr diff --git a/src/test/ui/feature-gate-repr128.rs b/src/test/ui/feature-gates/feature-gate-repr128.rs similarity index 100% rename from src/test/ui/feature-gate-repr128.rs rename to src/test/ui/feature-gates/feature-gate-repr128.rs diff --git a/src/test/ui/feature-gate-repr128.stderr b/src/test/ui/feature-gates/feature-gate-repr128.stderr similarity index 100% rename from src/test/ui/feature-gate-repr128.stderr rename to src/test/ui/feature-gates/feature-gate-repr128.stderr diff --git a/src/test/ui/feature-gate-repr_packed.rs b/src/test/ui/feature-gates/feature-gate-repr_packed.rs similarity index 100% rename from src/test/ui/feature-gate-repr_packed.rs rename to src/test/ui/feature-gates/feature-gate-repr_packed.rs diff --git a/src/test/ui/feature-gate-repr_packed.stderr b/src/test/ui/feature-gates/feature-gate-repr_packed.stderr similarity index 100% rename from src/test/ui/feature-gate-repr_packed.stderr rename to src/test/ui/feature-gates/feature-gate-repr_packed.stderr diff --git a/src/test/ui/feature-gate-rustc-attrs.rs b/src/test/ui/feature-gates/feature-gate-rustc-attrs.rs similarity index 100% rename from src/test/ui/feature-gate-rustc-attrs.rs rename to src/test/ui/feature-gates/feature-gate-rustc-attrs.rs diff --git a/src/test/ui/feature-gate-rustc-attrs.stderr b/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr similarity index 100% rename from src/test/ui/feature-gate-rustc-attrs.stderr rename to src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr diff --git a/src/test/ui/feature-gate-rustc-diagnostic-macros.rs b/src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.rs similarity index 100% rename from src/test/ui/feature-gate-rustc-diagnostic-macros.rs rename to src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.rs diff --git a/src/test/ui/feature-gate-rustc-diagnostic-macros.stderr b/src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.stderr similarity index 100% rename from src/test/ui/feature-gate-rustc-diagnostic-macros.stderr rename to src/test/ui/feature-gates/feature-gate-rustc-diagnostic-macros.stderr diff --git a/src/test/ui/feature-gate-rustc_const_unstable.rs b/src/test/ui/feature-gates/feature-gate-rustc_const_unstable.rs similarity index 100% rename from src/test/ui/feature-gate-rustc_const_unstable.rs rename to src/test/ui/feature-gates/feature-gate-rustc_const_unstable.rs diff --git a/src/test/ui/feature-gate-rustc_const_unstable.stderr b/src/test/ui/feature-gates/feature-gate-rustc_const_unstable.stderr similarity index 100% rename from src/test/ui/feature-gate-rustc_const_unstable.stderr rename to src/test/ui/feature-gates/feature-gate-rustc_const_unstable.stderr diff --git a/src/test/ui/feature-gate-sanitizer-runtime.rs b/src/test/ui/feature-gates/feature-gate-sanitizer-runtime.rs similarity index 100% rename from src/test/ui/feature-gate-sanitizer-runtime.rs rename to src/test/ui/feature-gates/feature-gate-sanitizer-runtime.rs diff --git a/src/test/ui/feature-gate-sanitizer-runtime.stderr b/src/test/ui/feature-gates/feature-gate-sanitizer-runtime.stderr similarity index 100% rename from src/test/ui/feature-gate-sanitizer-runtime.stderr rename to src/test/ui/feature-gates/feature-gate-sanitizer-runtime.stderr diff --git a/src/test/ui/feature-gate-simd-ffi.rs b/src/test/ui/feature-gates/feature-gate-simd-ffi.rs similarity index 100% rename from src/test/ui/feature-gate-simd-ffi.rs rename to src/test/ui/feature-gates/feature-gate-simd-ffi.rs diff --git a/src/test/ui/feature-gate-simd-ffi.stderr b/src/test/ui/feature-gates/feature-gate-simd-ffi.stderr similarity index 100% rename from src/test/ui/feature-gate-simd-ffi.stderr rename to src/test/ui/feature-gates/feature-gate-simd-ffi.stderr diff --git a/src/test/ui/feature-gate-simd.rs b/src/test/ui/feature-gates/feature-gate-simd.rs similarity index 100% rename from src/test/ui/feature-gate-simd.rs rename to src/test/ui/feature-gates/feature-gate-simd.rs diff --git a/src/test/ui/feature-gate-simd.stderr b/src/test/ui/feature-gates/feature-gate-simd.stderr similarity index 100% rename from src/test/ui/feature-gate-simd.stderr rename to src/test/ui/feature-gates/feature-gate-simd.stderr diff --git a/src/test/ui/feature-gate-slice-patterns.rs b/src/test/ui/feature-gates/feature-gate-slice-patterns.rs similarity index 100% rename from src/test/ui/feature-gate-slice-patterns.rs rename to src/test/ui/feature-gates/feature-gate-slice-patterns.rs diff --git a/src/test/ui/feature-gate-slice-patterns.stderr b/src/test/ui/feature-gates/feature-gate-slice-patterns.stderr similarity index 100% rename from src/test/ui/feature-gate-slice-patterns.stderr rename to src/test/ui/feature-gates/feature-gate-slice-patterns.stderr diff --git a/src/test/ui/feature-gate-staged_api.rs b/src/test/ui/feature-gates/feature-gate-staged_api.rs similarity index 100% rename from src/test/ui/feature-gate-staged_api.rs rename to src/test/ui/feature-gates/feature-gate-staged_api.rs diff --git a/src/test/ui/feature-gate-staged_api.stderr b/src/test/ui/feature-gates/feature-gate-staged_api.stderr similarity index 100% rename from src/test/ui/feature-gate-staged_api.stderr rename to src/test/ui/feature-gates/feature-gate-staged_api.stderr diff --git a/src/test/ui/feature-gate-start.rs b/src/test/ui/feature-gates/feature-gate-start.rs similarity index 100% rename from src/test/ui/feature-gate-start.rs rename to src/test/ui/feature-gates/feature-gate-start.rs diff --git a/src/test/ui/feature-gate-start.stderr b/src/test/ui/feature-gates/feature-gate-start.stderr similarity index 100% rename from src/test/ui/feature-gate-start.stderr rename to src/test/ui/feature-gates/feature-gate-start.stderr diff --git a/src/test/ui/feature-gate-static-nobundle.rs b/src/test/ui/feature-gates/feature-gate-static-nobundle.rs similarity index 100% rename from src/test/ui/feature-gate-static-nobundle.rs rename to src/test/ui/feature-gates/feature-gate-static-nobundle.rs diff --git a/src/test/ui/feature-gate-static-nobundle.stderr b/src/test/ui/feature-gates/feature-gate-static-nobundle.stderr similarity index 100% rename from src/test/ui/feature-gate-static-nobundle.stderr rename to src/test/ui/feature-gates/feature-gate-static-nobundle.stderr diff --git a/src/test/ui/feature-gate-stmt_expr_attributes.rs b/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.rs similarity index 100% rename from src/test/ui/feature-gate-stmt_expr_attributes.rs rename to src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.rs diff --git a/src/test/ui/feature-gate-stmt_expr_attributes.stderr b/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.stderr similarity index 100% rename from src/test/ui/feature-gate-stmt_expr_attributes.stderr rename to src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.stderr diff --git a/src/test/ui/feature-gate-thread_local.rs b/src/test/ui/feature-gates/feature-gate-thread_local.rs similarity index 100% rename from src/test/ui/feature-gate-thread_local.rs rename to src/test/ui/feature-gates/feature-gate-thread_local.rs diff --git a/src/test/ui/feature-gate-thread_local.stderr b/src/test/ui/feature-gates/feature-gate-thread_local.stderr similarity index 100% rename from src/test/ui/feature-gate-thread_local.stderr rename to src/test/ui/feature-gates/feature-gate-thread_local.stderr diff --git a/src/test/ui/feature-gate-tool_attributes.rs b/src/test/ui/feature-gates/feature-gate-tool_attributes.rs similarity index 100% rename from src/test/ui/feature-gate-tool_attributes.rs rename to src/test/ui/feature-gates/feature-gate-tool_attributes.rs diff --git a/src/test/ui/feature-gate-tool_attributes.stderr b/src/test/ui/feature-gates/feature-gate-tool_attributes.stderr similarity index 100% rename from src/test/ui/feature-gate-tool_attributes.stderr rename to src/test/ui/feature-gates/feature-gate-tool_attributes.stderr diff --git a/src/test/ui/compile-fail-migration/feature-gate-tool_lints.rs b/src/test/ui/feature-gates/feature-gate-tool_lints-fail.rs similarity index 100% rename from src/test/ui/compile-fail-migration/feature-gate-tool_lints.rs rename to src/test/ui/feature-gates/feature-gate-tool_lints-fail.rs diff --git a/src/test/ui/compile-fail-migration/feature-gate-tool_lints.stderr b/src/test/ui/feature-gates/feature-gate-tool_lints-fail.stderr similarity index 89% rename from src/test/ui/compile-fail-migration/feature-gate-tool_lints.stderr rename to src/test/ui/feature-gates/feature-gate-tool_lints-fail.stderr index 8840b3906dc..33ee79cd201 100644 --- a/src/test/ui/compile-fail-migration/feature-gate-tool_lints.stderr +++ b/src/test/ui/feature-gates/feature-gate-tool_lints-fail.stderr @@ -1,5 +1,5 @@ error[E0658]: scoped lint `clippy::assign_ops` is experimental (see issue #44690) - --> $DIR/feature-gate-tool_lints.rs:11:8 + --> $DIR/feature-gate-tool_lints-fail.rs:11:8 | LL | #[warn(clippy::assign_ops)] //~ ERROR scoped lint `clippy::assign_ops` is experimental | ^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/feature-gate-tool_lints.rs b/src/test/ui/feature-gates/feature-gate-tool_lints.rs similarity index 100% rename from src/test/ui/feature-gate-tool_lints.rs rename to src/test/ui/feature-gates/feature-gate-tool_lints.rs diff --git a/src/test/ui/feature-gate-tool_lints.stderr b/src/test/ui/feature-gates/feature-gate-tool_lints.stderr similarity index 100% rename from src/test/ui/feature-gate-tool_lints.stderr rename to src/test/ui/feature-gates/feature-gate-tool_lints.stderr diff --git a/src/test/ui/feature-gate-trace_macros.rs b/src/test/ui/feature-gates/feature-gate-trace_macros.rs similarity index 100% rename from src/test/ui/feature-gate-trace_macros.rs rename to src/test/ui/feature-gates/feature-gate-trace_macros.rs diff --git a/src/test/ui/feature-gate-trace_macros.stderr b/src/test/ui/feature-gates/feature-gate-trace_macros.stderr similarity index 100% rename from src/test/ui/feature-gate-trace_macros.stderr rename to src/test/ui/feature-gates/feature-gate-trace_macros.stderr diff --git a/src/test/ui/feature-gate-trivial_bounds-lint.rs b/src/test/ui/feature-gates/feature-gate-trivial_bounds-lint.rs similarity index 100% rename from src/test/ui/feature-gate-trivial_bounds-lint.rs rename to src/test/ui/feature-gates/feature-gate-trivial_bounds-lint.rs diff --git a/src/test/ui/feature-gate-trivial_bounds.rs b/src/test/ui/feature-gates/feature-gate-trivial_bounds.rs similarity index 100% rename from src/test/ui/feature-gate-trivial_bounds.rs rename to src/test/ui/feature-gates/feature-gate-trivial_bounds.rs diff --git a/src/test/ui/feature-gate-trivial_bounds.stderr b/src/test/ui/feature-gates/feature-gate-trivial_bounds.stderr similarity index 100% rename from src/test/ui/feature-gate-trivial_bounds.stderr rename to src/test/ui/feature-gates/feature-gate-trivial_bounds.stderr diff --git a/src/test/ui/feature-gate-try_reserve.rs b/src/test/ui/feature-gates/feature-gate-try_reserve.rs similarity index 100% rename from src/test/ui/feature-gate-try_reserve.rs rename to src/test/ui/feature-gates/feature-gate-try_reserve.rs diff --git a/src/test/ui/feature-gate-try_reserve.stderr b/src/test/ui/feature-gates/feature-gate-try_reserve.stderr similarity index 100% rename from src/test/ui/feature-gate-try_reserve.stderr rename to src/test/ui/feature-gates/feature-gate-try_reserve.stderr diff --git a/src/test/ui/feature-gate-type_ascription.rs b/src/test/ui/feature-gates/feature-gate-type_ascription.rs similarity index 100% rename from src/test/ui/feature-gate-type_ascription.rs rename to src/test/ui/feature-gates/feature-gate-type_ascription.rs diff --git a/src/test/ui/feature-gate-type_ascription.stderr b/src/test/ui/feature-gates/feature-gate-type_ascription.stderr similarity index 100% rename from src/test/ui/feature-gate-type_ascription.stderr rename to src/test/ui/feature-gates/feature-gate-type_ascription.stderr diff --git a/src/test/ui/feature-gate-unboxed-closures-manual-impls.rs b/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.rs similarity index 100% rename from src/test/ui/feature-gate-unboxed-closures-manual-impls.rs rename to src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.rs diff --git a/src/test/ui/feature-gate-unboxed-closures-manual-impls.stderr b/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.stderr similarity index 100% rename from src/test/ui/feature-gate-unboxed-closures-manual-impls.stderr rename to src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.stderr diff --git a/src/test/ui/feature-gate-unboxed-closures-method-calls.rs b/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.rs similarity index 100% rename from src/test/ui/feature-gate-unboxed-closures-method-calls.rs rename to src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.rs diff --git a/src/test/ui/feature-gate-unboxed-closures-method-calls.stderr b/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.stderr similarity index 100% rename from src/test/ui/feature-gate-unboxed-closures-method-calls.stderr rename to src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.stderr diff --git a/src/test/ui/feature-gate-unboxed-closures-ufcs-calls.rs b/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.rs similarity index 100% rename from src/test/ui/feature-gate-unboxed-closures-ufcs-calls.rs rename to src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.rs diff --git a/src/test/ui/feature-gate-unboxed-closures-ufcs-calls.stderr b/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.stderr similarity index 100% rename from src/test/ui/feature-gate-unboxed-closures-ufcs-calls.stderr rename to src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.stderr diff --git a/src/test/ui/feature-gate-unboxed-closures.rs b/src/test/ui/feature-gates/feature-gate-unboxed-closures.rs similarity index 100% rename from src/test/ui/feature-gate-unboxed-closures.rs rename to src/test/ui/feature-gates/feature-gate-unboxed-closures.rs diff --git a/src/test/ui/feature-gate-unboxed-closures.stderr b/src/test/ui/feature-gates/feature-gate-unboxed-closures.stderr similarity index 100% rename from src/test/ui/feature-gate-unboxed-closures.stderr rename to src/test/ui/feature-gates/feature-gate-unboxed-closures.stderr diff --git a/src/test/ui/feature-gate-underscore-imports.rs b/src/test/ui/feature-gates/feature-gate-underscore-imports.rs similarity index 100% rename from src/test/ui/feature-gate-underscore-imports.rs rename to src/test/ui/feature-gates/feature-gate-underscore-imports.rs diff --git a/src/test/ui/feature-gate-underscore-imports.stderr b/src/test/ui/feature-gates/feature-gate-underscore-imports.stderr similarity index 100% rename from src/test/ui/feature-gate-underscore-imports.stderr rename to src/test/ui/feature-gates/feature-gate-underscore-imports.stderr diff --git a/src/test/ui/feature-gate-unsized_tuple_coercion.rs b/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.rs similarity index 100% rename from src/test/ui/feature-gate-unsized_tuple_coercion.rs rename to src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.rs diff --git a/src/test/ui/feature-gate-unsized_tuple_coercion.stderr b/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.stderr similarity index 100% rename from src/test/ui/feature-gate-unsized_tuple_coercion.stderr rename to src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.stderr diff --git a/src/test/ui/feature-gate-untagged_unions.rs b/src/test/ui/feature-gates/feature-gate-untagged_unions.rs similarity index 100% rename from src/test/ui/feature-gate-untagged_unions.rs rename to src/test/ui/feature-gates/feature-gate-untagged_unions.rs diff --git a/src/test/ui/feature-gate-untagged_unions.stderr b/src/test/ui/feature-gates/feature-gate-untagged_unions.stderr similarity index 100% rename from src/test/ui/feature-gate-untagged_unions.stderr rename to src/test/ui/feature-gates/feature-gate-untagged_unions.stderr diff --git a/src/test/ui/feature-gate-unwind-attributes.rs b/src/test/ui/feature-gates/feature-gate-unwind-attributes.rs similarity index 100% rename from src/test/ui/feature-gate-unwind-attributes.rs rename to src/test/ui/feature-gates/feature-gate-unwind-attributes.rs diff --git a/src/test/ui/feature-gate-unwind-attributes.stderr b/src/test/ui/feature-gates/feature-gate-unwind-attributes.stderr similarity index 100% rename from src/test/ui/feature-gate-unwind-attributes.stderr rename to src/test/ui/feature-gates/feature-gate-unwind-attributes.stderr diff --git a/src/test/ui/feature-gate-used.rs b/src/test/ui/feature-gates/feature-gate-used.rs similarity index 100% rename from src/test/ui/feature-gate-used.rs rename to src/test/ui/feature-gates/feature-gate-used.rs diff --git a/src/test/ui/feature-gate-used.stderr b/src/test/ui/feature-gates/feature-gate-used.stderr similarity index 100% rename from src/test/ui/feature-gate-used.stderr rename to src/test/ui/feature-gates/feature-gate-used.stderr diff --git a/src/test/ui/compile-fail-migration/feature-gate-without_gate_irrefutable_pattern.rs b/src/test/ui/feature-gates/feature-gate-without_gate_irrefutable_pattern.rs similarity index 100% rename from src/test/ui/compile-fail-migration/feature-gate-without_gate_irrefutable_pattern.rs rename to src/test/ui/feature-gates/feature-gate-without_gate_irrefutable_pattern.rs diff --git a/src/test/ui/compile-fail-migration/feature-gate-without_gate_irrefutable_pattern.stderr b/src/test/ui/feature-gates/feature-gate-without_gate_irrefutable_pattern.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/feature-gate-without_gate_irrefutable_pattern.stderr rename to src/test/ui/feature-gates/feature-gate-without_gate_irrefutable_pattern.stderr diff --git a/src/test/ui/compile-fail-migration/float-literal-inference-restrictions.rs b/src/test/ui/float-literal-inference-restrictions.rs similarity index 100% rename from src/test/ui/compile-fail-migration/float-literal-inference-restrictions.rs rename to src/test/ui/float-literal-inference-restrictions.rs diff --git a/src/test/ui/compile-fail-migration/float-literal-inference-restrictions.stderr b/src/test/ui/float-literal-inference-restrictions.stderr similarity index 76% rename from src/test/ui/compile-fail-migration/float-literal-inference-restrictions.stderr rename to src/test/ui/float-literal-inference-restrictions.stderr index 80ca6d073dc..da8f6ed42f9 100644 --- a/src/test/ui/compile-fail-migration/float-literal-inference-restrictions.stderr +++ b/src/test/ui/float-literal-inference-restrictions.stderr @@ -2,7 +2,10 @@ error[E0308]: mismatched types --> $DIR/float-literal-inference-restrictions.rs:12:18 | LL | let x: f32 = 1; //~ ERROR mismatched types - | ^ expected f32, found integral variable + | ^ + | | + | expected f32, found integral variable + | help: use a float literal: `1.0` | = note: expected type `f32` found type `{integer}` diff --git a/src/test/ui/compile-fail-migration/fn-bad-block-type.rs b/src/test/ui/fn/fn-bad-block-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/fn-bad-block-type.rs rename to src/test/ui/fn/fn-bad-block-type.rs diff --git a/src/test/ui/compile-fail-migration/fn-bad-block-type.stderr b/src/test/ui/fn/fn-bad-block-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/fn-bad-block-type.stderr rename to src/test/ui/fn/fn-bad-block-type.stderr diff --git a/src/test/ui/fn-closure-mutable-capture.nll.stderr b/src/test/ui/fn/fn-closure-mutable-capture.nll.stderr similarity index 100% rename from src/test/ui/fn-closure-mutable-capture.nll.stderr rename to src/test/ui/fn/fn-closure-mutable-capture.nll.stderr diff --git a/src/test/ui/fn-closure-mutable-capture.rs b/src/test/ui/fn/fn-closure-mutable-capture.rs similarity index 100% rename from src/test/ui/fn-closure-mutable-capture.rs rename to src/test/ui/fn/fn-closure-mutable-capture.rs diff --git a/src/test/ui/fn-closure-mutable-capture.stderr b/src/test/ui/fn/fn-closure-mutable-capture.stderr similarity index 100% rename from src/test/ui/fn-closure-mutable-capture.stderr rename to src/test/ui/fn/fn-closure-mutable-capture.stderr diff --git a/src/test/ui/compile-fail-migration/fn-compare-mismatch.rs b/src/test/ui/fn/fn-compare-mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/fn-compare-mismatch.rs rename to src/test/ui/fn/fn-compare-mismatch.rs diff --git a/src/test/ui/compile-fail-migration/fn-compare-mismatch.stderr b/src/test/ui/fn/fn-compare-mismatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/fn-compare-mismatch.stderr rename to src/test/ui/fn/fn-compare-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/fn-item-type.rs b/src/test/ui/fn/fn-item-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/fn-item-type.rs rename to src/test/ui/fn/fn-item-type.rs diff --git a/src/test/ui/compile-fail-migration/fn-item-type.stderr b/src/test/ui/fn/fn-item-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/fn-item-type.stderr rename to src/test/ui/fn/fn-item-type.stderr diff --git a/src/test/ui/compile-fail-migration/fn-trait-formatting.rs b/src/test/ui/fn/fn-trait-formatting.rs similarity index 100% rename from src/test/ui/compile-fail-migration/fn-trait-formatting.rs rename to src/test/ui/fn/fn-trait-formatting.rs diff --git a/src/test/ui/compile-fail-migration/fn-trait-formatting.stderr b/src/test/ui/fn/fn-trait-formatting.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/fn-trait-formatting.stderr rename to src/test/ui/fn/fn-trait-formatting.stderr diff --git a/src/test/ui/for-c-in-str.rs b/src/test/ui/for/for-c-in-str.rs similarity index 100% rename from src/test/ui/for-c-in-str.rs rename to src/test/ui/for/for-c-in-str.rs diff --git a/src/test/ui/for-c-in-str.stderr b/src/test/ui/for/for-c-in-str.stderr similarity index 100% rename from src/test/ui/for-c-in-str.stderr rename to src/test/ui/for/for-c-in-str.stderr diff --git a/src/test/ui/compile-fail-migration/for-expn.rs b/src/test/ui/for/for-expn.rs similarity index 100% rename from src/test/ui/compile-fail-migration/for-expn.rs rename to src/test/ui/for/for-expn.rs diff --git a/src/test/ui/compile-fail-migration/for-expn.stderr b/src/test/ui/for/for-expn.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/for-expn.stderr rename to src/test/ui/for/for-expn.stderr diff --git a/src/test/ui/compile-fail-migration/for-loop-bogosity.rs b/src/test/ui/for/for-loop-bogosity.rs similarity index 100% rename from src/test/ui/compile-fail-migration/for-loop-bogosity.rs rename to src/test/ui/for/for-loop-bogosity.rs diff --git a/src/test/ui/compile-fail-migration/for-loop-bogosity.stderr b/src/test/ui/for/for-loop-bogosity.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/for-loop-bogosity.stderr rename to src/test/ui/for/for-loop-bogosity.stderr diff --git a/src/test/ui/compile-fail-migration/for-loop-refutable-pattern-error-message.rs b/src/test/ui/for/for-loop-refutable-pattern-error-message.rs similarity index 100% rename from src/test/ui/compile-fail-migration/for-loop-refutable-pattern-error-message.rs rename to src/test/ui/for/for-loop-refutable-pattern-error-message.rs diff --git a/src/test/ui/compile-fail-migration/for-loop-refutable-pattern-error-message.stderr b/src/test/ui/for/for-loop-refutable-pattern-error-message.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/for-loop-refutable-pattern-error-message.stderr rename to src/test/ui/for/for-loop-refutable-pattern-error-message.stderr diff --git a/src/test/ui/compile-fail-migration/for-loop-type-error.rs b/src/test/ui/for/for-loop-type-error.rs similarity index 100% rename from src/test/ui/compile-fail-migration/for-loop-type-error.rs rename to src/test/ui/for/for-loop-type-error.rs diff --git a/src/test/ui/compile-fail-migration/for-loop-type-error.stderr b/src/test/ui/for/for-loop-type-error.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/for-loop-type-error.stderr rename to src/test/ui/for/for-loop-type-error.stderr diff --git a/src/test/ui/compile-fail-migration/for-loop-unconstrained-element-type.rs b/src/test/ui/for/for-loop-unconstrained-element-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/for-loop-unconstrained-element-type.rs rename to src/test/ui/for/for-loop-unconstrained-element-type.rs diff --git a/src/test/ui/compile-fail-migration/for-loop-unconstrained-element-type.stderr b/src/test/ui/for/for-loop-unconstrained-element-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/for-loop-unconstrained-element-type.stderr rename to src/test/ui/for/for-loop-unconstrained-element-type.stderr diff --git a/src/test/ui/compile-fail-migration/foreign-fn-return-lifetime.rs b/src/test/ui/foreign-fn-return-lifetime.rs similarity index 100% rename from src/test/ui/compile-fail-migration/foreign-fn-return-lifetime.rs rename to src/test/ui/foreign-fn-return-lifetime.rs diff --git a/src/test/ui/compile-fail-migration/foreign-fn-return-lifetime.stderr b/src/test/ui/foreign-fn-return-lifetime.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/foreign-fn-return-lifetime.stderr rename to src/test/ui/foreign-fn-return-lifetime.stderr diff --git a/src/test/ui/compile-fail-migration/foreign-unsafe-fn-called.rs b/src/test/ui/foreign-unsafe-fn-called.rs similarity index 100% rename from src/test/ui/compile-fail-migration/foreign-unsafe-fn-called.rs rename to src/test/ui/foreign-unsafe-fn-called.rs diff --git a/src/test/ui/compile-fail-migration/foreign-unsafe-fn-called.stderr b/src/test/ui/foreign-unsafe-fn-called.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/foreign-unsafe-fn-called.stderr rename to src/test/ui/foreign-unsafe-fn-called.stderr diff --git a/src/test/ui/compile-fail-migration/fully-qualified-type-name1.rs b/src/test/ui/fully-qualified-type/fully-qualified-type-name1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/fully-qualified-type-name1.rs rename to src/test/ui/fully-qualified-type/fully-qualified-type-name1.rs diff --git a/src/test/ui/compile-fail-migration/fully-qualified-type-name1.stderr b/src/test/ui/fully-qualified-type/fully-qualified-type-name1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/fully-qualified-type-name1.stderr rename to src/test/ui/fully-qualified-type/fully-qualified-type-name1.stderr diff --git a/src/test/ui/compile-fail-migration/fully-qualified-type-name2.rs b/src/test/ui/fully-qualified-type/fully-qualified-type-name2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/fully-qualified-type-name2.rs rename to src/test/ui/fully-qualified-type/fully-qualified-type-name2.rs diff --git a/src/test/ui/compile-fail-migration/fully-qualified-type-name2.stderr b/src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/fully-qualified-type-name2.stderr rename to src/test/ui/fully-qualified-type/fully-qualified-type-name2.stderr diff --git a/src/test/ui/compile-fail-migration/fully-qualified-type-name3.rs b/src/test/ui/fully-qualified-type/fully-qualified-type-name3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/fully-qualified-type-name3.rs rename to src/test/ui/fully-qualified-type/fully-qualified-type-name3.rs diff --git a/src/test/ui/compile-fail-migration/fully-qualified-type-name4.rs b/src/test/ui/fully-qualified-type/fully-qualified-type-name4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/fully-qualified-type-name4.rs rename to src/test/ui/fully-qualified-type/fully-qualified-type-name4.rs diff --git a/src/test/ui/compile-fail-migration/fully-qualified-type-name4.stderr b/src/test/ui/fully-qualified-type/fully-qualified-type-name4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/fully-qualified-type-name4.stderr rename to src/test/ui/fully-qualified-type/fully-qualified-type-name4.stderr diff --git a/src/test/ui/compile-fail-migration/functional-struct-update-noncopyable.nll.stderr b/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/functional-struct-update-noncopyable.nll.stderr rename to src/test/ui/functional-struct-update/functional-struct-update-noncopyable.nll.stderr diff --git a/src/test/ui/compile-fail-migration/functional-struct-update-noncopyable.rs b/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.rs similarity index 100% rename from src/test/ui/compile-fail-migration/functional-struct-update-noncopyable.rs rename to src/test/ui/functional-struct-update/functional-struct-update-noncopyable.rs diff --git a/src/test/ui/compile-fail-migration/functional-struct-update-noncopyable.stderr b/src/test/ui/functional-struct-update/functional-struct-update-noncopyable.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/functional-struct-update-noncopyable.stderr rename to src/test/ui/functional-struct-update/functional-struct-update-noncopyable.stderr diff --git a/src/test/ui/compile-fail-migration/functional-struct-update-respects-privacy.rs b/src/test/ui/functional-struct-update/functional-struct-update-respects-privacy.rs similarity index 100% rename from src/test/ui/compile-fail-migration/functional-struct-update-respects-privacy.rs rename to src/test/ui/functional-struct-update/functional-struct-update-respects-privacy.rs diff --git a/src/test/ui/compile-fail-migration/functional-struct-update-respects-privacy.stderr b/src/test/ui/functional-struct-update/functional-struct-update-respects-privacy.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/functional-struct-update-respects-privacy.stderr rename to src/test/ui/functional-struct-update/functional-struct-update-respects-privacy.stderr diff --git a/src/test/ui/compile-fail-migration/future-incompatible-lint-group.rs b/src/test/ui/future-incompatible-lint-group.rs similarity index 100% rename from src/test/ui/compile-fail-migration/future-incompatible-lint-group.rs rename to src/test/ui/future-incompatible-lint-group.rs diff --git a/src/test/ui/compile-fail-migration/future-incompatible-lint-group.stderr b/src/test/ui/future-incompatible-lint-group.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/future-incompatible-lint-group.stderr rename to src/test/ui/future-incompatible-lint-group.stderr diff --git a/src/test/ui/compile-fail-migration/gated-attr-literals.rs b/src/test/ui/gated-attr-literals.rs similarity index 100% rename from src/test/ui/compile-fail-migration/gated-attr-literals.rs rename to src/test/ui/gated-attr-literals.rs diff --git a/src/test/ui/gated-attr-literals.stderr b/src/test/ui/gated-attr-literals.stderr new file mode 100644 index 00000000000..e69b6488599 --- /dev/null +++ b/src/test/ui/gated-attr-literals.stderr @@ -0,0 +1,91 @@ +error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) + --> $DIR/gated-attr-literals.rs:18:1 + | +LL | #[fake_attr(100)] + | ^^^^^^^^^^^^^^^^^ + | + = help: add #![feature(attr_literals)] to the crate attributes to enable + +error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) + --> $DIR/gated-attr-literals.rs:20:1 + | +LL | #[fake_attr(1, 2, 3)] + | ^^^^^^^^^^^^^^^^^^^^^ + | + = help: add #![feature(attr_literals)] to the crate attributes to enable + +error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) + --> $DIR/gated-attr-literals.rs:22:1 + | +LL | #[fake_attr("hello")] + | ^^^^^^^^^^^^^^^^^^^^^ + | + = help: add #![feature(attr_literals)] to the crate attributes to enable + +error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) + --> $DIR/gated-attr-literals.rs:25:1 + | +LL | #[fake_attr(1, "hi", key = 12, true, false)] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = help: add #![feature(attr_literals)] to the crate attributes to enable + +error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) + --> $DIR/gated-attr-literals.rs:27:1 + | +LL | #[fake_attr(key = "hello", val = 10)] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = help: add #![feature(attr_literals)] to the crate attributes to enable + +error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) + --> $DIR/gated-attr-literals.rs:29:1 + | +LL | #[fake_attr(key("hello"), val(10))] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = help: add #![feature(attr_literals)] to the crate attributes to enable + +error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) + --> $DIR/gated-attr-literals.rs:31:1 + | +LL | #[fake_attr(enabled = true, disabled = false)] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = help: add #![feature(attr_literals)] to the crate attributes to enable + +error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) + --> $DIR/gated-attr-literals.rs:33:1 + | +LL | #[fake_attr(true)] + | ^^^^^^^^^^^^^^^^^^ + | + = help: add #![feature(attr_literals)] to the crate attributes to enable + +error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) + --> $DIR/gated-attr-literals.rs:35:1 + | +LL | #[fake_attr(pi = 3.14159)] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = help: add #![feature(attr_literals)] to the crate attributes to enable + +error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) + --> $DIR/gated-attr-literals.rs:37:1 + | +LL | #[fake_attr(b"hi")] + | ^^^^^^^^^^^^^^^^^^^ + | + = help: add #![feature(attr_literals)] to the crate attributes to enable + +error[E0658]: non-string literals in attributes, or string literals in top-level positions, are experimental (see issue #34981) + --> $DIR/gated-attr-literals.rs:39:1 + | +LL | #[fake_doc(r"doc")] + | ^^^^^^^^^^^^^^^^^^^ + | + = help: add #![feature(attr_literals)] to the crate attributes to enable + +error: aborting due to 11 previous errors + +For more information about this error, try `rustc --explain E0658`. diff --git a/src/test/ui/compile-fail-migration/gated-bad-feature.rs b/src/test/ui/gated-bad-feature.rs similarity index 100% rename from src/test/ui/compile-fail-migration/gated-bad-feature.rs rename to src/test/ui/gated-bad-feature.rs diff --git a/src/test/ui/compile-fail-migration/gated-bad-feature.stderr b/src/test/ui/gated-bad-feature.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/gated-bad-feature.stderr rename to src/test/ui/gated-bad-feature.stderr diff --git a/src/test/ui/compile-fail-migration/generator-yielding-or-returning-itself.rs b/src/test/ui/generator-yielding-or-returning-itself.rs similarity index 100% rename from src/test/ui/compile-fail-migration/generator-yielding-or-returning-itself.rs rename to src/test/ui/generator-yielding-or-returning-itself.rs diff --git a/src/test/ui/compile-fail-migration/generator-yielding-or-returning-itself.stderr b/src/test/ui/generator-yielding-or-returning-itself.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/generator-yielding-or-returning-itself.stderr rename to src/test/ui/generator-yielding-or-returning-itself.stderr diff --git a/src/test/ui/compile-fail-migration/generic-extern-lifetime.rs b/src/test/ui/generic/generic-extern-lifetime.rs similarity index 100% rename from src/test/ui/compile-fail-migration/generic-extern-lifetime.rs rename to src/test/ui/generic/generic-extern-lifetime.rs diff --git a/src/test/ui/compile-fail-migration/generic-extern-lifetime.stderr b/src/test/ui/generic/generic-extern-lifetime.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/generic-extern-lifetime.stderr rename to src/test/ui/generic/generic-extern-lifetime.stderr diff --git a/src/test/ui/compile-fail-migration/generic-extern.rs b/src/test/ui/generic/generic-extern.rs similarity index 100% rename from src/test/ui/compile-fail-migration/generic-extern.rs rename to src/test/ui/generic/generic-extern.rs diff --git a/src/test/ui/compile-fail-migration/generic-extern.stderr b/src/test/ui/generic/generic-extern.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/generic-extern.stderr rename to src/test/ui/generic/generic-extern.stderr diff --git a/src/test/ui/compile-fail-migration/generic-impl-less-params-with-defaults.rs b/src/test/ui/generic/generic-impl-less-params-with-defaults.rs similarity index 100% rename from src/test/ui/compile-fail-migration/generic-impl-less-params-with-defaults.rs rename to src/test/ui/generic/generic-impl-less-params-with-defaults.rs diff --git a/src/test/ui/compile-fail-migration/generic-impl-less-params-with-defaults.stderr b/src/test/ui/generic/generic-impl-less-params-with-defaults.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/generic-impl-less-params-with-defaults.stderr rename to src/test/ui/generic/generic-impl-less-params-with-defaults.stderr diff --git a/src/test/ui/compile-fail-migration/generic-impl-more-params-with-defaults.rs b/src/test/ui/generic/generic-impl-more-params-with-defaults.rs similarity index 100% rename from src/test/ui/compile-fail-migration/generic-impl-more-params-with-defaults.rs rename to src/test/ui/generic/generic-impl-more-params-with-defaults.rs diff --git a/src/test/ui/compile-fail-migration/generic-impl-more-params-with-defaults.stderr b/src/test/ui/generic/generic-impl-more-params-with-defaults.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/generic-impl-more-params-with-defaults.stderr rename to src/test/ui/generic/generic-impl-more-params-with-defaults.stderr diff --git a/src/test/ui/compile-fail-migration/generic-lifetime-trait-impl.rs b/src/test/ui/generic/generic-lifetime-trait-impl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/generic-lifetime-trait-impl.rs rename to src/test/ui/generic/generic-lifetime-trait-impl.rs diff --git a/src/test/ui/compile-fail-migration/generic-lifetime-trait-impl.stderr b/src/test/ui/generic/generic-lifetime-trait-impl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/generic-lifetime-trait-impl.stderr rename to src/test/ui/generic/generic-lifetime-trait-impl.stderr diff --git a/src/test/ui/compile-fail-migration/generic-no-mangle.rs b/src/test/ui/generic/generic-no-mangle.rs similarity index 100% rename from src/test/ui/compile-fail-migration/generic-no-mangle.rs rename to src/test/ui/generic/generic-no-mangle.rs diff --git a/src/test/ui/compile-fail-migration/generic-no-mangle.stderr b/src/test/ui/generic/generic-no-mangle.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/generic-no-mangle.stderr rename to src/test/ui/generic/generic-no-mangle.stderr diff --git a/src/test/ui/compile-fail-migration/generic-non-trailing-defaults.rs b/src/test/ui/generic/generic-non-trailing-defaults.rs similarity index 100% rename from src/test/ui/compile-fail-migration/generic-non-trailing-defaults.rs rename to src/test/ui/generic/generic-non-trailing-defaults.rs diff --git a/src/test/ui/compile-fail-migration/generic-non-trailing-defaults.stderr b/src/test/ui/generic/generic-non-trailing-defaults.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/generic-non-trailing-defaults.stderr rename to src/test/ui/generic/generic-non-trailing-defaults.stderr diff --git a/src/test/ui/generic-param-attrs.rs b/src/test/ui/generic/generic-param-attrs.rs similarity index 100% rename from src/test/ui/generic-param-attrs.rs rename to src/test/ui/generic/generic-param-attrs.rs diff --git a/src/test/ui/generic-type-less-params-with-defaults.rs b/src/test/ui/generic/generic-type-less-params-with-defaults.rs similarity index 100% rename from src/test/ui/generic-type-less-params-with-defaults.rs rename to src/test/ui/generic/generic-type-less-params-with-defaults.rs diff --git a/src/test/ui/generic-type-less-params-with-defaults.stderr b/src/test/ui/generic/generic-type-less-params-with-defaults.stderr similarity index 100% rename from src/test/ui/generic-type-less-params-with-defaults.stderr rename to src/test/ui/generic/generic-type-less-params-with-defaults.stderr diff --git a/src/test/ui/generic-type-more-params-with-defaults.rs b/src/test/ui/generic/generic-type-more-params-with-defaults.rs similarity index 100% rename from src/test/ui/generic-type-more-params-with-defaults.rs rename to src/test/ui/generic/generic-type-more-params-with-defaults.rs diff --git a/src/test/ui/generic-type-more-params-with-defaults.stderr b/src/test/ui/generic/generic-type-more-params-with-defaults.stderr similarity index 100% rename from src/test/ui/generic-type-more-params-with-defaults.stderr rename to src/test/ui/generic/generic-type-more-params-with-defaults.stderr diff --git a/src/test/ui/compile-fail-migration/generic-type-params-forward-mention.rs b/src/test/ui/generic/generic-type-params-forward-mention.rs similarity index 100% rename from src/test/ui/compile-fail-migration/generic-type-params-forward-mention.rs rename to src/test/ui/generic/generic-type-params-forward-mention.rs diff --git a/src/test/ui/compile-fail-migration/generic-type-params-forward-mention.stderr b/src/test/ui/generic/generic-type-params-forward-mention.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/generic-type-params-forward-mention.stderr rename to src/test/ui/generic/generic-type-params-forward-mention.stderr diff --git a/src/test/ui/compile-fail-migration/generic-type-params-name-repr.rs b/src/test/ui/generic/generic-type-params-name-repr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/generic-type-params-name-repr.rs rename to src/test/ui/generic/generic-type-params-name-repr.rs diff --git a/src/test/ui/compile-fail-migration/generic-type-params-name-repr.stderr b/src/test/ui/generic/generic-type-params-name-repr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/generic-type-params-name-repr.stderr rename to src/test/ui/generic/generic-type-params-name-repr.stderr diff --git a/src/test/ui/compile-fail-migration/glob-cycles.rs b/src/test/ui/glob-cycles.rs similarity index 100% rename from src/test/ui/compile-fail-migration/glob-cycles.rs rename to src/test/ui/glob-cycles.rs diff --git a/src/test/ui/compile-fail-migration/glob-cycles.stderr b/src/test/ui/glob-cycles.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/glob-cycles.stderr rename to src/test/ui/glob-cycles.stderr diff --git a/src/test/ui/compile-fail-migration/glob-resolve1.rs b/src/test/ui/glob-resolve1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/glob-resolve1.rs rename to src/test/ui/glob-resolve1.rs diff --git a/src/test/ui/compile-fail-migration/glob-resolve1.stderr b/src/test/ui/glob-resolve1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/glob-resolve1.stderr rename to src/test/ui/glob-resolve1.stderr diff --git a/src/test/ui/compile-fail-migration/hashmap-iter-value-lifetime.nll.stderr b/src/test/ui/hashmap-iter-value-lifetime.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hashmap-iter-value-lifetime.nll.stderr rename to src/test/ui/hashmap-iter-value-lifetime.nll.stderr diff --git a/src/test/ui/compile-fail-migration/hashmap-iter-value-lifetime.rs b/src/test/ui/hashmap-iter-value-lifetime.rs similarity index 100% rename from src/test/ui/compile-fail-migration/hashmap-iter-value-lifetime.rs rename to src/test/ui/hashmap-iter-value-lifetime.rs diff --git a/src/test/ui/compile-fail-migration/hashmap-iter-value-lifetime.stderr b/src/test/ui/hashmap-iter-value-lifetime.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hashmap-iter-value-lifetime.stderr rename to src/test/ui/hashmap-iter-value-lifetime.stderr diff --git a/src/test/ui/compile-fail-migration/hashmap-lifetimes.rs b/src/test/ui/hashmap-lifetimes.rs similarity index 100% rename from src/test/ui/compile-fail-migration/hashmap-lifetimes.rs rename to src/test/ui/hashmap-lifetimes.rs diff --git a/src/test/ui/compile-fail-migration/hashmap-lifetimes.stderr b/src/test/ui/hashmap-lifetimes.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hashmap-lifetimes.stderr rename to src/test/ui/hashmap-lifetimes.stderr diff --git a/src/test/ui/compile-fail-migration/hidden-rt-injection.rs b/src/test/ui/hidden-rt-injection.rs similarity index 100% rename from src/test/ui/compile-fail-migration/hidden-rt-injection.rs rename to src/test/ui/hidden-rt-injection.rs diff --git a/src/test/ui/compile-fail-migration/hidden-rt-injection.stderr b/src/test/ui/hidden-rt-injection.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hidden-rt-injection.stderr rename to src/test/ui/hidden-rt-injection.stderr diff --git a/src/test/ui/compile-fail-migration/hidden-rt-injection2.rs b/src/test/ui/hidden-rt-injection2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/hidden-rt-injection2.rs rename to src/test/ui/hidden-rt-injection2.rs diff --git a/src/test/ui/compile-fail-migration/hidden-rt-injection2.stderr b/src/test/ui/hidden-rt-injection2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hidden-rt-injection2.stderr rename to src/test/ui/hidden-rt-injection2.stderr diff --git a/src/test/ui/compile-fail-migration/hr-subtype.bound_a_b_ret_a_vs_bound_a_ret_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_a_b_ret_a_vs_bound_a_ret_a.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hr-subtype.bound_a_b_ret_a_vs_bound_a_ret_a.stderr rename to src/test/ui/hr-subtype/hr-subtype.bound_a_b_ret_a_vs_bound_a_ret_a.stderr diff --git a/src/test/ui/compile-fail-migration/hr-subtype.bound_a_b_vs_bound_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_a_b_vs_bound_a.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hr-subtype.bound_a_b_vs_bound_a.stderr rename to src/test/ui/hr-subtype/hr-subtype.bound_a_b_vs_bound_a.stderr diff --git a/src/test/ui/compile-fail-migration/hr-subtype.bound_a_vs_bound_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_bound_a.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hr-subtype.bound_a_vs_bound_a.stderr rename to src/test/ui/hr-subtype/hr-subtype.bound_a_vs_bound_a.stderr diff --git a/src/test/ui/compile-fail-migration/hr-subtype.bound_a_vs_bound_b.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_bound_b.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hr-subtype.bound_a_vs_bound_b.stderr rename to src/test/ui/hr-subtype/hr-subtype.bound_a_vs_bound_b.stderr diff --git a/src/test/ui/compile-fail-migration/hr-subtype.bound_a_vs_free_x.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hr-subtype.bound_a_vs_free_x.stderr rename to src/test/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr diff --git a/src/test/ui/compile-fail-migration/hr-subtype.bound_co_a_b_vs_bound_co_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_co_a_b_vs_bound_co_a.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hr-subtype.bound_co_a_b_vs_bound_co_a.stderr rename to src/test/ui/hr-subtype/hr-subtype.bound_co_a_b_vs_bound_co_a.stderr diff --git a/src/test/ui/compile-fail-migration/hr-subtype.bound_co_a_co_b_ret_contra_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_co_a_co_b_ret_contra_a.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hr-subtype.bound_co_a_co_b_ret_contra_a.stderr rename to src/test/ui/hr-subtype/hr-subtype.bound_co_a_co_b_ret_contra_a.stderr diff --git a/src/test/ui/compile-fail-migration/hr-subtype.bound_co_a_vs_bound_co_b.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_co_a_vs_bound_co_b.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hr-subtype.bound_co_a_vs_bound_co_b.stderr rename to src/test/ui/hr-subtype/hr-subtype.bound_co_a_vs_bound_co_b.stderr diff --git a/src/test/ui/compile-fail-migration/hr-subtype.bound_contra_a_contra_b_ret_co_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_contra_a_contra_b_ret_co_a.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hr-subtype.bound_contra_a_contra_b_ret_co_a.stderr rename to src/test/ui/hr-subtype/hr-subtype.bound_contra_a_contra_b_ret_co_a.stderr diff --git a/src/test/ui/compile-fail-migration/hr-subtype.bound_inv_a_b_vs_bound_inv_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_inv_a_b_vs_bound_inv_a.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hr-subtype.bound_inv_a_b_vs_bound_inv_a.stderr rename to src/test/ui/hr-subtype/hr-subtype.bound_inv_a_b_vs_bound_inv_a.stderr diff --git a/src/test/ui/compile-fail-migration/hr-subtype.bound_inv_a_vs_bound_inv_b.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_inv_a_vs_bound_inv_b.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hr-subtype.bound_inv_a_vs_bound_inv_b.stderr rename to src/test/ui/hr-subtype/hr-subtype.bound_inv_a_vs_bound_inv_b.stderr diff --git a/src/test/ui/compile-fail-migration/hr-subtype.free_inv_x_vs_free_inv_y.nll.stderr b/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hr-subtype.free_inv_x_vs_free_inv_y.nll.stderr rename to src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.nll.stderr diff --git a/src/test/ui/compile-fail-migration/hr-subtype.free_inv_x_vs_free_inv_y.stderr b/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hr-subtype.free_inv_x_vs_free_inv_y.stderr rename to src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.stderr diff --git a/src/test/ui/compile-fail-migration/hr-subtype.free_x_vs_free_x.stderr b/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_x.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hr-subtype.free_x_vs_free_x.stderr rename to src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_x.stderr diff --git a/src/test/ui/compile-fail-migration/hr-subtype.free_x_vs_free_y.nll.stderr b/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hr-subtype.free_x_vs_free_y.nll.stderr rename to src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.nll.stderr diff --git a/src/test/ui/compile-fail-migration/hr-subtype.free_x_vs_free_y.stderr b/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hr-subtype.free_x_vs_free_y.stderr rename to src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.stderr diff --git a/src/test/ui/compile-fail-migration/hr-subtype.rs b/src/test/ui/hr-subtype/hr-subtype.rs similarity index 100% rename from src/test/ui/compile-fail-migration/hr-subtype.rs rename to src/test/ui/hr-subtype/hr-subtype.rs diff --git a/src/test/ui/compile-fail-migration/hrtb-conflate-regions.rs b/src/test/ui/hrtb/hrtb-conflate-regions.rs similarity index 100% rename from src/test/ui/compile-fail-migration/hrtb-conflate-regions.rs rename to src/test/ui/hrtb/hrtb-conflate-regions.rs diff --git a/src/test/ui/compile-fail-migration/hrtb-conflate-regions.stderr b/src/test/ui/hrtb/hrtb-conflate-regions.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hrtb-conflate-regions.stderr rename to src/test/ui/hrtb/hrtb-conflate-regions.stderr diff --git a/src/test/ui/compile-fail-migration/hrtb-debruijn-in-receiver.nll.stderr b/src/test/ui/hrtb/hrtb-debruijn-in-receiver.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hrtb-debruijn-in-receiver.nll.stderr rename to src/test/ui/hrtb/hrtb-debruijn-in-receiver.nll.stderr diff --git a/src/test/ui/compile-fail-migration/hrtb-debruijn-in-receiver.rs b/src/test/ui/hrtb/hrtb-debruijn-in-receiver.rs similarity index 100% rename from src/test/ui/compile-fail-migration/hrtb-debruijn-in-receiver.rs rename to src/test/ui/hrtb/hrtb-debruijn-in-receiver.rs diff --git a/src/test/ui/compile-fail-migration/hrtb-debruijn-in-receiver.stderr b/src/test/ui/hrtb/hrtb-debruijn-in-receiver.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hrtb-debruijn-in-receiver.stderr rename to src/test/ui/hrtb/hrtb-debruijn-in-receiver.stderr diff --git a/src/test/ui/compile-fail-migration/hrtb-higher-ranker-supertraits-transitive.rs b/src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.rs similarity index 100% rename from src/test/ui/compile-fail-migration/hrtb-higher-ranker-supertraits-transitive.rs rename to src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.rs diff --git a/src/test/ui/compile-fail-migration/hrtb-higher-ranker-supertraits-transitive.stderr b/src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hrtb-higher-ranker-supertraits-transitive.stderr rename to src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.stderr diff --git a/src/test/ui/compile-fail-migration/hrtb-higher-ranker-supertraits.rs b/src/test/ui/hrtb/hrtb-higher-ranker-supertraits.rs similarity index 100% rename from src/test/ui/compile-fail-migration/hrtb-higher-ranker-supertraits.rs rename to src/test/ui/hrtb/hrtb-higher-ranker-supertraits.rs diff --git a/src/test/ui/compile-fail-migration/hrtb-higher-ranker-supertraits.stderr b/src/test/ui/hrtb/hrtb-higher-ranker-supertraits.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hrtb-higher-ranker-supertraits.stderr rename to src/test/ui/hrtb/hrtb-higher-ranker-supertraits.stderr diff --git a/src/test/ui/compile-fail-migration/hrtb-identity-fn-borrows.ast.nll.stderr b/src/test/ui/hrtb/hrtb-identity-fn-borrows.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hrtb-identity-fn-borrows.ast.nll.stderr rename to src/test/ui/hrtb/hrtb-identity-fn-borrows.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/hrtb-identity-fn-borrows.ast.stderr b/src/test/ui/hrtb/hrtb-identity-fn-borrows.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hrtb-identity-fn-borrows.ast.stderr rename to src/test/ui/hrtb/hrtb-identity-fn-borrows.ast.stderr diff --git a/src/test/ui/compile-fail-migration/hrtb-identity-fn-borrows.mir.stderr b/src/test/ui/hrtb/hrtb-identity-fn-borrows.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hrtb-identity-fn-borrows.mir.stderr rename to src/test/ui/hrtb/hrtb-identity-fn-borrows.mir.stderr diff --git a/src/test/ui/compile-fail-migration/hrtb-identity-fn-borrows.rs b/src/test/ui/hrtb/hrtb-identity-fn-borrows.rs similarity index 100% rename from src/test/ui/compile-fail-migration/hrtb-identity-fn-borrows.rs rename to src/test/ui/hrtb/hrtb-identity-fn-borrows.rs diff --git a/src/test/ui/compile-fail-migration/hrtb-just-for-static.rs b/src/test/ui/hrtb/hrtb-just-for-static.rs similarity index 100% rename from src/test/ui/compile-fail-migration/hrtb-just-for-static.rs rename to src/test/ui/hrtb/hrtb-just-for-static.rs diff --git a/src/test/ui/compile-fail-migration/hrtb-just-for-static.stderr b/src/test/ui/hrtb/hrtb-just-for-static.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hrtb-just-for-static.stderr rename to src/test/ui/hrtb/hrtb-just-for-static.stderr diff --git a/src/test/ui/compile-fail-migration/hrtb-perfect-forwarding.rs b/src/test/ui/hrtb/hrtb-perfect-forwarding.rs similarity index 100% rename from src/test/ui/compile-fail-migration/hrtb-perfect-forwarding.rs rename to src/test/ui/hrtb/hrtb-perfect-forwarding.rs diff --git a/src/test/ui/compile-fail-migration/hrtb-perfect-forwarding.stderr b/src/test/ui/hrtb/hrtb-perfect-forwarding.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hrtb-perfect-forwarding.stderr rename to src/test/ui/hrtb/hrtb-perfect-forwarding.stderr diff --git a/src/test/ui/compile-fail-migration/huge-array-simple.rs b/src/test/ui/huge-array-simple.rs similarity index 100% rename from src/test/ui/compile-fail-migration/huge-array-simple.rs rename to src/test/ui/huge-array-simple.rs diff --git a/src/test/ui/compile-fail-migration/huge-array.rs b/src/test/ui/huge-array.rs similarity index 100% rename from src/test/ui/compile-fail-migration/huge-array.rs rename to src/test/ui/huge-array.rs diff --git a/src/test/ui/compile-fail-migration/huge-array.stderr b/src/test/ui/huge-array.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/huge-array.stderr rename to src/test/ui/huge-array.stderr diff --git a/src/test/ui/compile-fail-migration/huge-enum.rs b/src/test/ui/huge-enum.rs similarity index 100% rename from src/test/ui/compile-fail-migration/huge-enum.rs rename to src/test/ui/huge-enum.rs diff --git a/src/test/ui/compile-fail-migration/huge-enum.stderr b/src/test/ui/huge-enum.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/huge-enum.stderr rename to src/test/ui/huge-enum.stderr diff --git a/src/test/ui/compile-fail-migration/huge-struct.rs b/src/test/ui/huge-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/huge-struct.rs rename to src/test/ui/huge-struct.rs diff --git a/src/test/ui/compile-fail-migration/huge-struct.stderr b/src/test/ui/huge-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/huge-struct.stderr rename to src/test/ui/huge-struct.stderr diff --git a/src/test/ui/compile-fail-migration/hygienic-label-1.rs b/src/test/ui/hygiene/hygienic-label-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/hygienic-label-1.rs rename to src/test/ui/hygiene/hygienic-label-1.rs diff --git a/src/test/ui/compile-fail-migration/hygienic-label-1.stderr b/src/test/ui/hygiene/hygienic-label-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hygienic-label-1.stderr rename to src/test/ui/hygiene/hygienic-label-1.stderr diff --git a/src/test/ui/compile-fail-migration/hygienic-label-2.rs b/src/test/ui/hygiene/hygienic-label-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/hygienic-label-2.rs rename to src/test/ui/hygiene/hygienic-label-2.rs diff --git a/src/test/ui/compile-fail-migration/hygienic-label-2.stderr b/src/test/ui/hygiene/hygienic-label-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hygienic-label-2.stderr rename to src/test/ui/hygiene/hygienic-label-2.stderr diff --git a/src/test/ui/compile-fail-migration/hygienic-label-3.rs b/src/test/ui/hygiene/hygienic-label-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/hygienic-label-3.rs rename to src/test/ui/hygiene/hygienic-label-3.rs diff --git a/src/test/ui/compile-fail-migration/hygienic-label-3.stderr b/src/test/ui/hygiene/hygienic-label-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hygienic-label-3.stderr rename to src/test/ui/hygiene/hygienic-label-3.stderr diff --git a/src/test/ui/compile-fail-migration/hygienic-label-4.rs b/src/test/ui/hygiene/hygienic-label-4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/hygienic-label-4.rs rename to src/test/ui/hygiene/hygienic-label-4.rs diff --git a/src/test/ui/compile-fail-migration/hygienic-label-4.stderr b/src/test/ui/hygiene/hygienic-label-4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/hygienic-label-4.stderr rename to src/test/ui/hygiene/hygienic-label-4.stderr diff --git a/src/test/ui/compile-fail-migration/if-branch-types.rs b/src/test/ui/if/if-branch-types.rs similarity index 100% rename from src/test/ui/compile-fail-migration/if-branch-types.rs rename to src/test/ui/if/if-branch-types.rs diff --git a/src/test/ui/compile-fail-migration/if-branch-types.stderr b/src/test/ui/if/if-branch-types.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/if-branch-types.stderr rename to src/test/ui/if/if-branch-types.stderr diff --git a/src/test/ui/if-let-arm-types.rs b/src/test/ui/if/if-let-arm-types.rs similarity index 100% rename from src/test/ui/if-let-arm-types.rs rename to src/test/ui/if/if-let-arm-types.rs diff --git a/src/test/ui/if-let-arm-types.stderr b/src/test/ui/if/if-let-arm-types.stderr similarity index 100% rename from src/test/ui/if-let-arm-types.stderr rename to src/test/ui/if/if-let-arm-types.stderr diff --git a/src/test/ui/compile-fail-migration/if-let.rs b/src/test/ui/if/if-let.rs similarity index 100% rename from src/test/ui/compile-fail-migration/if-let.rs rename to src/test/ui/if/if-let.rs diff --git a/src/test/ui/compile-fail-migration/if-let.stderr b/src/test/ui/if/if-let.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/if-let.stderr rename to src/test/ui/if/if-let.stderr diff --git a/src/test/ui/compile-fail-migration/if-loop.rs b/src/test/ui/if/if-loop.rs similarity index 100% rename from src/test/ui/compile-fail-migration/if-loop.rs rename to src/test/ui/if/if-loop.rs diff --git a/src/test/ui/compile-fail-migration/if-loop.stderr b/src/test/ui/if/if-loop.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/if-loop.stderr rename to src/test/ui/if/if-loop.stderr diff --git a/src/test/ui/compile-fail-migration/if-typeck.rs b/src/test/ui/if/if-typeck.rs similarity index 100% rename from src/test/ui/compile-fail-migration/if-typeck.rs rename to src/test/ui/if/if-typeck.rs diff --git a/src/test/ui/compile-fail-migration/if-typeck.stderr b/src/test/ui/if/if-typeck.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/if-typeck.stderr rename to src/test/ui/if/if-typeck.stderr diff --git a/src/test/ui/if-without-block.rs b/src/test/ui/if/if-without-block.rs similarity index 100% rename from src/test/ui/if-without-block.rs rename to src/test/ui/if/if-without-block.rs diff --git a/src/test/ui/if-without-block.stderr b/src/test/ui/if/if-without-block.stderr similarity index 100% rename from src/test/ui/if-without-block.stderr rename to src/test/ui/if/if-without-block.stderr diff --git a/src/test/ui/compile-fail-migration/if-without-else-result.rs b/src/test/ui/if/if-without-else-result.rs similarity index 100% rename from src/test/ui/compile-fail-migration/if-without-else-result.rs rename to src/test/ui/if/if-without-else-result.rs diff --git a/src/test/ui/compile-fail-migration/if-without-else-result.stderr b/src/test/ui/if/if-without-else-result.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/if-without-else-result.stderr rename to src/test/ui/if/if-without-else-result.stderr diff --git a/src/test/ui/ifmt-bad-arg.rs b/src/test/ui/if/ifmt-bad-arg.rs similarity index 100% rename from src/test/ui/ifmt-bad-arg.rs rename to src/test/ui/if/ifmt-bad-arg.rs diff --git a/src/test/ui/ifmt-bad-arg.stderr b/src/test/ui/if/ifmt-bad-arg.stderr similarity index 100% rename from src/test/ui/ifmt-bad-arg.stderr rename to src/test/ui/if/ifmt-bad-arg.stderr diff --git a/src/test/ui/compile-fail-migration/ifmt-bad-format-args.rs b/src/test/ui/if/ifmt-bad-format-args.rs similarity index 100% rename from src/test/ui/compile-fail-migration/ifmt-bad-format-args.rs rename to src/test/ui/if/ifmt-bad-format-args.rs diff --git a/src/test/ui/compile-fail-migration/ifmt-bad-format-args.stderr b/src/test/ui/if/ifmt-bad-format-args.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/ifmt-bad-format-args.stderr rename to src/test/ui/if/ifmt-bad-format-args.stderr diff --git a/src/test/ui/compile-fail-migration/ifmt-unimpl.rs b/src/test/ui/if/ifmt-unimpl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/ifmt-unimpl.rs rename to src/test/ui/if/ifmt-unimpl.rs diff --git a/src/test/ui/compile-fail-migration/ifmt-unimpl.stderr b/src/test/ui/if/ifmt-unimpl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/ifmt-unimpl.stderr rename to src/test/ui/if/ifmt-unimpl.stderr diff --git a/src/test/ui/compile-fail-migration/ifmt-unknown-trait.rs b/src/test/ui/if/ifmt-unknown-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/ifmt-unknown-trait.rs rename to src/test/ui/if/ifmt-unknown-trait.rs diff --git a/src/test/ui/compile-fail-migration/ifmt-unknown-trait.stderr b/src/test/ui/if/ifmt-unknown-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/ifmt-unknown-trait.stderr rename to src/test/ui/if/ifmt-unknown-trait.stderr diff --git a/src/test/ui/compile-fail-migration/illegal-ufcs-drop.rs b/src/test/ui/illegal-ufcs-drop.rs similarity index 100% rename from src/test/ui/compile-fail-migration/illegal-ufcs-drop.rs rename to src/test/ui/illegal-ufcs-drop.rs diff --git a/src/test/ui/compile-fail-migration/illegal-ufcs-drop.stderr b/src/test/ui/illegal-ufcs-drop.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/illegal-ufcs-drop.stderr rename to src/test/ui/illegal-ufcs-drop.stderr diff --git a/src/test/ui/compile-fail-migration/immut-function-arguments.ast.nll.stderr b/src/test/ui/immut-function-arguments.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/immut-function-arguments.ast.nll.stderr rename to src/test/ui/immut-function-arguments.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/immut-function-arguments.ast.stderr b/src/test/ui/immut-function-arguments.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/immut-function-arguments.ast.stderr rename to src/test/ui/immut-function-arguments.ast.stderr diff --git a/src/test/ui/compile-fail-migration/immut-function-arguments.mir.stderr b/src/test/ui/immut-function-arguments.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/immut-function-arguments.mir.stderr rename to src/test/ui/immut-function-arguments.mir.stderr diff --git a/src/test/ui/compile-fail-migration/immut-function-arguments.rs b/src/test/ui/immut-function-arguments.rs similarity index 100% rename from src/test/ui/compile-fail-migration/immut-function-arguments.rs rename to src/test/ui/immut-function-arguments.rs diff --git a/src/test/ui/compile-fail-migration/impl-bounds-checking.rs b/src/test/ui/impl-bounds-checking.rs similarity index 100% rename from src/test/ui/compile-fail-migration/impl-bounds-checking.rs rename to src/test/ui/impl-bounds-checking.rs diff --git a/src/test/ui/compile-fail-migration/impl-bounds-checking.stderr b/src/test/ui/impl-bounds-checking.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/impl-bounds-checking.stderr rename to src/test/ui/impl-bounds-checking.stderr diff --git a/src/test/ui/compile-fail-migration/impl-trait/impl-generic-mismatch-ab.rs b/src/test/ui/impl-trait/impl-generic-mismatch-ab.rs similarity index 100% rename from src/test/ui/compile-fail-migration/impl-trait/impl-generic-mismatch-ab.rs rename to src/test/ui/impl-trait/impl-generic-mismatch-ab.rs diff --git a/src/test/ui/compile-fail-migration/impl-trait/impl-generic-mismatch-ab.stderr b/src/test/ui/impl-trait/impl-generic-mismatch-ab.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/impl-trait/impl-generic-mismatch-ab.stderr rename to src/test/ui/impl-trait/impl-generic-mismatch-ab.stderr diff --git a/src/test/ui/impl_trait_projections.rs b/src/test/ui/impl-trait/impl_trait_projections.rs similarity index 100% rename from src/test/ui/impl_trait_projections.rs rename to src/test/ui/impl-trait/impl_trait_projections.rs diff --git a/src/test/ui/impl_trait_projections.stderr b/src/test/ui/impl-trait/impl_trait_projections.stderr similarity index 100% rename from src/test/ui/impl_trait_projections.stderr rename to src/test/ui/impl-trait/impl_trait_projections.stderr diff --git a/src/test/ui/compile-fail-migration/impl-trait/infinite-impl-trait-issue-38064.rs b/src/test/ui/impl-trait/infinite-impl-trait-issue-38064.rs similarity index 100% rename from src/test/ui/compile-fail-migration/impl-trait/infinite-impl-trait-issue-38064.rs rename to src/test/ui/impl-trait/infinite-impl-trait-issue-38064.rs diff --git a/src/test/ui/compile-fail-migration/impl-trait/infinite-impl-trait-issue-38064.stderr b/src/test/ui/impl-trait/infinite-impl-trait-issue-38064.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/impl-trait/infinite-impl-trait-issue-38064.stderr rename to src/test/ui/impl-trait/infinite-impl-trait-issue-38064.stderr diff --git a/src/test/ui/compile-fail-migration/impl-trait/must_outlive_least_region_or_bound.nll.stderr b/src/test/ui/impl-trait/must_outlive_least_region_or_bound.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/impl-trait/must_outlive_least_region_or_bound.nll.stderr rename to src/test/ui/impl-trait/must_outlive_least_region_or_bound.nll.stderr diff --git a/src/test/ui/compile-fail-migration/impl-trait/must_outlive_least_region_or_bound.rs b/src/test/ui/impl-trait/must_outlive_least_region_or_bound.rs similarity index 100% rename from src/test/ui/compile-fail-migration/impl-trait/must_outlive_least_region_or_bound.rs rename to src/test/ui/impl-trait/must_outlive_least_region_or_bound.rs diff --git a/src/test/ui/compile-fail-migration/impl-trait/must_outlive_least_region_or_bound.stderr b/src/test/ui/impl-trait/must_outlive_least_region_or_bound.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/impl-trait/must_outlive_least_region_or_bound.stderr rename to src/test/ui/impl-trait/must_outlive_least_region_or_bound.stderr diff --git a/src/test/ui/compile-fail-migration/impl-trait/needs_least_region_or_bound.rs b/src/test/ui/impl-trait/needs_least_region_or_bound.rs similarity index 100% rename from src/test/ui/compile-fail-migration/impl-trait/needs_least_region_or_bound.rs rename to src/test/ui/impl-trait/needs_least_region_or_bound.rs diff --git a/src/test/ui/compile-fail-migration/impl-trait/needs_least_region_or_bound.stderr b/src/test/ui/impl-trait/needs_least_region_or_bound.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/impl-trait/needs_least_region_or_bound.stderr rename to src/test/ui/impl-trait/needs_least_region_or_bound.stderr diff --git a/src/test/ui/compile-fail-migration/impl-trait/no-trait.rs b/src/test/ui/impl-trait/no-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/impl-trait/no-trait.rs rename to src/test/ui/impl-trait/no-trait.rs diff --git a/src/test/ui/compile-fail-migration/impl-trait/no-trait.stderr b/src/test/ui/impl-trait/no-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/impl-trait/no-trait.stderr rename to src/test/ui/impl-trait/no-trait.stderr diff --git a/src/test/ui/compile-fail-migration/impl-trait/type_parameters_captured.nll.stderr b/src/test/ui/impl-trait/type_parameters_captured.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/impl-trait/type_parameters_captured.nll.stderr rename to src/test/ui/impl-trait/type_parameters_captured.nll.stderr diff --git a/src/test/ui/compile-fail-migration/impl-trait/type_parameters_captured.rs b/src/test/ui/impl-trait/type_parameters_captured.rs similarity index 100% rename from src/test/ui/compile-fail-migration/impl-trait/type_parameters_captured.rs rename to src/test/ui/impl-trait/type_parameters_captured.rs diff --git a/src/test/ui/compile-fail-migration/impl-trait/type_parameters_captured.stderr b/src/test/ui/impl-trait/type_parameters_captured.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/impl-trait/type_parameters_captured.stderr rename to src/test/ui/impl-trait/type_parameters_captured.stderr diff --git a/src/test/ui/compile-fail-migration/impl-trait/where-allowed.rs b/src/test/ui/impl-trait/where-allowed.rs similarity index 100% rename from src/test/ui/compile-fail-migration/impl-trait/where-allowed.rs rename to src/test/ui/impl-trait/where-allowed.rs diff --git a/src/test/ui/compile-fail-migration/impl-trait/where-allowed.stderr b/src/test/ui/impl-trait/where-allowed.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/impl-trait/where-allowed.stderr rename to src/test/ui/impl-trait/where-allowed.stderr diff --git a/src/test/ui/compile-fail-migration/impl-unused-tps-inherent.rs b/src/test/ui/impl-unused-tps-inherent.rs similarity index 100% rename from src/test/ui/compile-fail-migration/impl-unused-tps-inherent.rs rename to src/test/ui/impl-unused-tps-inherent.rs diff --git a/src/test/ui/compile-fail-migration/impl-unused-tps-inherent.stderr b/src/test/ui/impl-unused-tps-inherent.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/impl-unused-tps-inherent.stderr rename to src/test/ui/impl-unused-tps-inherent.stderr diff --git a/src/test/ui/compile-fail-migration/impl-unused-tps.rs b/src/test/ui/impl-unused-tps.rs similarity index 100% rename from src/test/ui/compile-fail-migration/impl-unused-tps.rs rename to src/test/ui/impl-unused-tps.rs diff --git a/src/test/ui/compile-fail-migration/impl-unused-tps.stderr b/src/test/ui/impl-unused-tps.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/impl-unused-tps.stderr rename to src/test/ui/impl-unused-tps.stderr diff --git a/src/test/ui/compile-fail-migration/implicit-method-bind.rs b/src/test/ui/implicit-method-bind.rs similarity index 100% rename from src/test/ui/compile-fail-migration/implicit-method-bind.rs rename to src/test/ui/implicit-method-bind.rs diff --git a/src/test/ui/compile-fail-migration/implicit-method-bind.stderr b/src/test/ui/implicit-method-bind.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/implicit-method-bind.stderr rename to src/test/ui/implicit-method-bind.stderr diff --git a/src/test/ui/compile-fail-migration/import.rs b/src/test/ui/import.rs similarity index 100% rename from src/test/ui/compile-fail-migration/import.rs rename to src/test/ui/import.rs diff --git a/src/test/ui/compile-fail-migration/import.stderr b/src/test/ui/import.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/import.stderr rename to src/test/ui/import.stderr diff --git a/src/test/ui/compile-fail-migration/import2.rs b/src/test/ui/import2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/import2.rs rename to src/test/ui/import2.rs diff --git a/src/test/ui/compile-fail-migration/import2.stderr b/src/test/ui/import2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/import2.stderr rename to src/test/ui/import2.stderr diff --git a/src/test/ui/compile-fail-migration/import3.rs b/src/test/ui/import3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/import3.rs rename to src/test/ui/import3.rs diff --git a/src/test/ui/compile-fail-migration/import3.stderr b/src/test/ui/import3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/import3.stderr rename to src/test/ui/import3.stderr diff --git a/src/test/ui/compile-fail-migration/import4.rs b/src/test/ui/import4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/import4.rs rename to src/test/ui/import4.rs diff --git a/src/test/ui/compile-fail-migration/import4.stderr b/src/test/ui/import4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/import4.stderr rename to src/test/ui/import4.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/import_crate_var.rs b/src/test/ui/imports/auxiliary/import_crate_var.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/import_crate_var.rs rename to src/test/ui/imports/auxiliary/import_crate_var.rs diff --git a/src/test/ui/compile-fail-migration/import-crate-var.rs b/src/test/ui/imports/import-crate-var.rs similarity index 100% rename from src/test/ui/compile-fail-migration/import-crate-var.rs rename to src/test/ui/imports/import-crate-var.rs diff --git a/src/test/ui/compile-fail-migration/import-crate-var.stderr b/src/test/ui/imports/import-crate-var.stderr similarity index 62% rename from src/test/ui/compile-fail-migration/import-crate-var.stderr rename to src/test/ui/imports/import-crate-var.stderr index d2e22391406..3f02223fb67 100644 --- a/src/test/ui/compile-fail-migration/import-crate-var.stderr +++ b/src/test/ui/imports/import-crate-var.stderr @@ -1,5 +1,5 @@ warning: `$crate` may not be imported - --> $DIR/import-crate-var.rs:22:5 + --> $DIR/import-crate-var.rs:19:5 | LL | m!(); | ^^^^^ @@ -8,10 +8,12 @@ LL | m!(); = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) error: compilation successful - --> $DIR/import-crate-var.rs:21:1 + --> $DIR/import-crate-var.rs:18:1 | -LL | / fn main() { +LL | / fn main() { //~ ERROR compilation successful LL | | m!(); +LL | | //~^ WARN `$crate` may not be imported +LL | | //~| NOTE `use $crate;` was erroneously allowed and will become a hard error LL | | } | |_^ diff --git a/src/test/ui/compile-fail-migration/import-from-missing.rs b/src/test/ui/imports/import-from-missing.rs similarity index 100% rename from src/test/ui/compile-fail-migration/import-from-missing.rs rename to src/test/ui/imports/import-from-missing.rs diff --git a/src/test/ui/compile-fail-migration/import-from-missing.stderr b/src/test/ui/imports/import-from-missing.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/import-from-missing.stderr rename to src/test/ui/imports/import-from-missing.stderr diff --git a/src/test/ui/compile-fail-migration/import-glob-0.rs b/src/test/ui/imports/import-glob-0.rs similarity index 100% rename from src/test/ui/compile-fail-migration/import-glob-0.rs rename to src/test/ui/imports/import-glob-0.rs diff --git a/src/test/ui/compile-fail-migration/import-glob-0.stderr b/src/test/ui/imports/import-glob-0.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/import-glob-0.stderr rename to src/test/ui/imports/import-glob-0.stderr diff --git a/src/test/ui/compile-fail-migration/import-glob-circular.rs b/src/test/ui/imports/import-glob-circular.rs similarity index 100% rename from src/test/ui/compile-fail-migration/import-glob-circular.rs rename to src/test/ui/imports/import-glob-circular.rs diff --git a/src/test/ui/compile-fail-migration/import-glob-circular.stderr b/src/test/ui/imports/import-glob-circular.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/import-glob-circular.stderr rename to src/test/ui/imports/import-glob-circular.stderr diff --git a/src/test/ui/compile-fail-migration/import-loop-2.rs b/src/test/ui/imports/import-loop-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/import-loop-2.rs rename to src/test/ui/imports/import-loop-2.rs diff --git a/src/test/ui/compile-fail-migration/import-loop-2.stderr b/src/test/ui/imports/import-loop-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/import-loop-2.stderr rename to src/test/ui/imports/import-loop-2.stderr diff --git a/src/test/ui/compile-fail-migration/import-loop.rs b/src/test/ui/imports/import-loop.rs similarity index 100% rename from src/test/ui/compile-fail-migration/import-loop.rs rename to src/test/ui/imports/import-loop.rs diff --git a/src/test/ui/compile-fail-migration/import-loop.stderr b/src/test/ui/imports/import-loop.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/import-loop.stderr rename to src/test/ui/imports/import-loop.stderr diff --git a/src/test/ui/compile-fail-migration/import-prefix-macro-1.rs b/src/test/ui/imports/import-prefix-macro-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/import-prefix-macro-1.rs rename to src/test/ui/imports/import-prefix-macro-1.rs diff --git a/src/test/ui/compile-fail-migration/import-prefix-macro-1.stderr b/src/test/ui/imports/import-prefix-macro-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/import-prefix-macro-1.stderr rename to src/test/ui/imports/import-prefix-macro-1.stderr diff --git a/src/test/ui/compile-fail-migration/import-prefix-macro-2.rs b/src/test/ui/imports/import-prefix-macro-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/import-prefix-macro-2.rs rename to src/test/ui/imports/import-prefix-macro-2.rs diff --git a/src/test/ui/compile-fail-migration/import-prefix-macro-2.stderr b/src/test/ui/imports/import-prefix-macro-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/import-prefix-macro-2.stderr rename to src/test/ui/imports/import-prefix-macro-2.stderr diff --git a/src/test/ui/compile-fail-migration/import-trait-method.rs b/src/test/ui/imports/import-trait-method.rs similarity index 100% rename from src/test/ui/compile-fail-migration/import-trait-method.rs rename to src/test/ui/imports/import-trait-method.rs diff --git a/src/test/ui/compile-fail-migration/import-trait-method.stderr b/src/test/ui/imports/import-trait-method.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/import-trait-method.stderr rename to src/test/ui/imports/import-trait-method.stderr diff --git a/src/test/ui/compile-fail-migration/imports/reexports.rs b/src/test/ui/imports/reexports.rs similarity index 100% rename from src/test/ui/compile-fail-migration/imports/reexports.rs rename to src/test/ui/imports/reexports.rs diff --git a/src/test/ui/compile-fail-migration/imports/reexports.stderr b/src/test/ui/imports/reexports.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/imports/reexports.stderr rename to src/test/ui/imports/reexports.stderr diff --git a/src/test/ui/compile-fail-migration/imports/unused-macro-use.rs b/src/test/ui/imports/unused-macro-use.rs similarity index 100% rename from src/test/ui/compile-fail-migration/imports/unused-macro-use.rs rename to src/test/ui/imports/unused-macro-use.rs diff --git a/src/test/ui/compile-fail-migration/imports/unused-macro-use.stderr b/src/test/ui/imports/unused-macro-use.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/imports/unused-macro-use.stderr rename to src/test/ui/imports/unused-macro-use.stderr diff --git a/src/test/ui/compile-fail-migration/imports/unused.rs b/src/test/ui/imports/unused.rs similarity index 100% rename from src/test/ui/compile-fail-migration/imports/unused.rs rename to src/test/ui/imports/unused.rs diff --git a/src/test/ui/compile-fail-migration/imports/unused.stderr b/src/test/ui/imports/unused.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/imports/unused.stderr rename to src/test/ui/imports/unused.stderr diff --git a/src/test/ui/compile-fail-migration/inaccessible-test-modules.rs b/src/test/ui/inaccessible-test-modules.rs similarity index 100% rename from src/test/ui/compile-fail-migration/inaccessible-test-modules.rs rename to src/test/ui/inaccessible-test-modules.rs diff --git a/src/test/ui/compile-fail-migration/inaccessible-test-modules.stderr b/src/test/ui/inaccessible-test-modules.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/inaccessible-test-modules.stderr rename to src/test/ui/inaccessible-test-modules.stderr diff --git a/src/test/ui/compile-fail-migration/index-bot.rs b/src/test/ui/index-bot.rs similarity index 100% rename from src/test/ui/compile-fail-migration/index-bot.rs rename to src/test/ui/index-bot.rs diff --git a/src/test/ui/compile-fail-migration/index-bot.stderr b/src/test/ui/index-bot.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/index-bot.stderr rename to src/test/ui/index-bot.stderr diff --git a/src/test/ui/compile-fail-migration/index_message.rs b/src/test/ui/index_message.rs similarity index 100% rename from src/test/ui/compile-fail-migration/index_message.rs rename to src/test/ui/index_message.rs diff --git a/src/test/ui/compile-fail-migration/index_message.stderr b/src/test/ui/index_message.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/index_message.stderr rename to src/test/ui/index_message.stderr diff --git a/src/test/ui/compile-fail-migration/indexing-requires-a-uint.rs b/src/test/ui/indexing-requires-a-uint.rs similarity index 100% rename from src/test/ui/compile-fail-migration/indexing-requires-a-uint.rs rename to src/test/ui/indexing-requires-a-uint.rs diff --git a/src/test/ui/compile-fail-migration/indexing-requires-a-uint.stderr b/src/test/ui/indexing-requires-a-uint.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/indexing-requires-a-uint.stderr rename to src/test/ui/indexing-requires-a-uint.stderr diff --git a/src/test/ui/auxiliary/inference_unstable_iterator.rs b/src/test/ui/inference/auxiliary/inference_unstable_iterator.rs similarity index 100% rename from src/test/ui/auxiliary/inference_unstable_iterator.rs rename to src/test/ui/inference/auxiliary/inference_unstable_iterator.rs diff --git a/src/test/ui/auxiliary/inference_unstable_itertools.rs b/src/test/ui/inference/auxiliary/inference_unstable_itertools.rs similarity index 100% rename from src/test/ui/auxiliary/inference_unstable_itertools.rs rename to src/test/ui/inference/auxiliary/inference_unstable_itertools.rs diff --git a/src/test/ui/inference-variable-behind-raw-pointer.rs b/src/test/ui/inference/inference-variable-behind-raw-pointer.rs similarity index 100% rename from src/test/ui/inference-variable-behind-raw-pointer.rs rename to src/test/ui/inference/inference-variable-behind-raw-pointer.rs diff --git a/src/test/ui/inference-variable-behind-raw-pointer.stderr b/src/test/ui/inference/inference-variable-behind-raw-pointer.stderr similarity index 100% rename from src/test/ui/inference-variable-behind-raw-pointer.stderr rename to src/test/ui/inference/inference-variable-behind-raw-pointer.stderr diff --git a/src/test/ui/inference_unstable.rs b/src/test/ui/inference/inference_unstable.rs similarity index 100% rename from src/test/ui/inference_unstable.rs rename to src/test/ui/inference/inference_unstable.rs diff --git a/src/test/ui/inference_unstable.stderr b/src/test/ui/inference/inference_unstable.stderr similarity index 100% rename from src/test/ui/inference_unstable.stderr rename to src/test/ui/inference/inference_unstable.stderr diff --git a/src/test/ui/inference_unstable_featured.rs b/src/test/ui/inference/inference_unstable_featured.rs similarity index 100% rename from src/test/ui/inference_unstable_featured.rs rename to src/test/ui/inference/inference_unstable_featured.rs diff --git a/src/test/ui/inference_unstable_featured.stderr b/src/test/ui/inference/inference_unstable_featured.stderr similarity index 100% rename from src/test/ui/inference_unstable_featured.stderr rename to src/test/ui/inference/inference_unstable_featured.stderr diff --git a/src/test/ui/inference_unstable_forced.rs b/src/test/ui/inference/inference_unstable_forced.rs similarity index 100% rename from src/test/ui/inference_unstable_forced.rs rename to src/test/ui/inference/inference_unstable_forced.rs diff --git a/src/test/ui/inference_unstable_forced.stderr b/src/test/ui/inference/inference_unstable_forced.stderr similarity index 100% rename from src/test/ui/inference_unstable_forced.stderr rename to src/test/ui/inference/inference_unstable_forced.stderr diff --git a/src/test/ui/compile-fail-migration/infinite-autoderef.rs b/src/test/ui/infinite/infinite-autoderef.rs similarity index 100% rename from src/test/ui/compile-fail-migration/infinite-autoderef.rs rename to src/test/ui/infinite/infinite-autoderef.rs diff --git a/src/test/ui/compile-fail-migration/infinite-autoderef.stderr b/src/test/ui/infinite/infinite-autoderef.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/infinite-autoderef.stderr rename to src/test/ui/infinite/infinite-autoderef.stderr diff --git a/src/test/ui/compile-fail-migration/infinite-instantiation.rs b/src/test/ui/infinite/infinite-instantiation.rs similarity index 100% rename from src/test/ui/compile-fail-migration/infinite-instantiation.rs rename to src/test/ui/infinite/infinite-instantiation.rs diff --git a/src/test/ui/compile-fail-migration/infinite-instantiation.stderr b/src/test/ui/infinite/infinite-instantiation.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/infinite-instantiation.stderr rename to src/test/ui/infinite/infinite-instantiation.stderr diff --git a/src/test/ui/compile-fail-migration/infinite-macro-expansion.rs b/src/test/ui/infinite/infinite-macro-expansion.rs similarity index 100% rename from src/test/ui/compile-fail-migration/infinite-macro-expansion.rs rename to src/test/ui/infinite/infinite-macro-expansion.rs diff --git a/src/test/ui/compile-fail-migration/infinite-macro-expansion.stderr b/src/test/ui/infinite/infinite-macro-expansion.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/infinite-macro-expansion.stderr rename to src/test/ui/infinite/infinite-macro-expansion.stderr diff --git a/src/test/ui/infinite-recursion-const-fn.rs b/src/test/ui/infinite/infinite-recursion-const-fn.rs similarity index 100% rename from src/test/ui/infinite-recursion-const-fn.rs rename to src/test/ui/infinite/infinite-recursion-const-fn.rs diff --git a/src/test/ui/infinite-recursion-const-fn.stderr b/src/test/ui/infinite/infinite-recursion-const-fn.stderr similarity index 100% rename from src/test/ui/infinite-recursion-const-fn.stderr rename to src/test/ui/infinite/infinite-recursion-const-fn.stderr diff --git a/src/test/ui/compile-fail-migration/infinite-tag-type-recursion.rs b/src/test/ui/infinite/infinite-tag-type-recursion.rs similarity index 100% rename from src/test/ui/compile-fail-migration/infinite-tag-type-recursion.rs rename to src/test/ui/infinite/infinite-tag-type-recursion.rs diff --git a/src/test/ui/compile-fail-migration/infinite-tag-type-recursion.stderr b/src/test/ui/infinite/infinite-tag-type-recursion.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/infinite-tag-type-recursion.stderr rename to src/test/ui/infinite/infinite-tag-type-recursion.stderr diff --git a/src/test/ui/compile-fail-migration/infinite-vec-type-recursion.rs b/src/test/ui/infinite/infinite-vec-type-recursion.rs similarity index 100% rename from src/test/ui/compile-fail-migration/infinite-vec-type-recursion.rs rename to src/test/ui/infinite/infinite-vec-type-recursion.rs diff --git a/src/test/ui/compile-fail-migration/infinite-vec-type-recursion.stderr b/src/test/ui/infinite/infinite-vec-type-recursion.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/infinite-vec-type-recursion.stderr rename to src/test/ui/infinite/infinite-vec-type-recursion.stderr diff --git a/src/test/ui/compile-fail-migration/inhabitedness-infinite-loop.rs b/src/test/ui/inhabitedness-infinite-loop.rs similarity index 100% rename from src/test/ui/compile-fail-migration/inhabitedness-infinite-loop.rs rename to src/test/ui/inhabitedness-infinite-loop.rs diff --git a/src/test/ui/compile-fail-migration/inhabitedness-infinite-loop.stderr b/src/test/ui/inhabitedness-infinite-loop.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/inhabitedness-infinite-loop.stderr rename to src/test/ui/inhabitedness-infinite-loop.stderr diff --git a/src/test/ui/compile-fail-migration/init-unsafe.rs b/src/test/ui/init-unsafe.rs similarity index 100% rename from src/test/ui/compile-fail-migration/init-unsafe.rs rename to src/test/ui/init-unsafe.rs diff --git a/src/test/ui/compile-fail-migration/init-unsafe.stderr b/src/test/ui/init-unsafe.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/init-unsafe.stderr rename to src/test/ui/init-unsafe.stderr diff --git a/src/test/ui/compile-fail-migration/inner-static-type-parameter.rs b/src/test/ui/inner-static-type-parameter.rs similarity index 100% rename from src/test/ui/compile-fail-migration/inner-static-type-parameter.rs rename to src/test/ui/inner-static-type-parameter.rs diff --git a/src/test/ui/compile-fail-migration/inner-static-type-parameter.stderr b/src/test/ui/inner-static-type-parameter.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/inner-static-type-parameter.stderr rename to src/test/ui/inner-static-type-parameter.stderr diff --git a/src/test/ui/compile-fail-migration/integer-literal-suffix-inference.rs b/src/test/ui/integer-literal-suffix-inference.rs similarity index 100% rename from src/test/ui/compile-fail-migration/integer-literal-suffix-inference.rs rename to src/test/ui/integer-literal-suffix-inference.rs diff --git a/src/test/ui/compile-fail-migration/integer-literal-suffix-inference.stderr b/src/test/ui/integer-literal-suffix-inference.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/integer-literal-suffix-inference.stderr rename to src/test/ui/integer-literal-suffix-inference.stderr diff --git a/src/test/ui/compile-fail-migration/integral-indexing.rs b/src/test/ui/integral-indexing.rs similarity index 100% rename from src/test/ui/compile-fail-migration/integral-indexing.rs rename to src/test/ui/integral-indexing.rs diff --git a/src/test/ui/compile-fail-migration/integral-indexing.stderr b/src/test/ui/integral-indexing.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/integral-indexing.stderr rename to src/test/ui/integral-indexing.stderr diff --git a/src/test/ui/compile-fail-migration/integral-variable-unification-error.rs b/src/test/ui/integral-variable-unification-error.rs similarity index 100% rename from src/test/ui/compile-fail-migration/integral-variable-unification-error.rs rename to src/test/ui/integral-variable-unification-error.rs diff --git a/src/test/ui/compile-fail-migration/integral-variable-unification-error.stderr b/src/test/ui/integral-variable-unification-error.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/integral-variable-unification-error.stderr rename to src/test/ui/integral-variable-unification-error.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/internal_unstable.rs b/src/test/ui/internal/auxiliary/internal_unstable.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/internal_unstable.rs rename to src/test/ui/internal/auxiliary/internal_unstable.rs diff --git a/src/test/ui/compile-fail-migration/internal-unstable-noallow.rs b/src/test/ui/internal/internal-unstable-noallow.rs similarity index 100% rename from src/test/ui/compile-fail-migration/internal-unstable-noallow.rs rename to src/test/ui/internal/internal-unstable-noallow.rs diff --git a/src/test/ui/compile-fail-migration/internal-unstable-noallow.stderr b/src/test/ui/internal/internal-unstable-noallow.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/internal-unstable-noallow.stderr rename to src/test/ui/internal/internal-unstable-noallow.stderr diff --git a/src/test/ui/compile-fail-migration/internal-unstable-thread-local.rs b/src/test/ui/internal/internal-unstable-thread-local.rs similarity index 100% rename from src/test/ui/compile-fail-migration/internal-unstable-thread-local.rs rename to src/test/ui/internal/internal-unstable-thread-local.rs diff --git a/src/test/ui/compile-fail-migration/internal-unstable-thread-local.stderr b/src/test/ui/internal/internal-unstable-thread-local.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/internal-unstable-thread-local.stderr rename to src/test/ui/internal/internal-unstable-thread-local.stderr diff --git a/src/test/ui/compile-fail-migration/internal-unstable.rs b/src/test/ui/internal/internal-unstable.rs similarity index 100% rename from src/test/ui/compile-fail-migration/internal-unstable.rs rename to src/test/ui/internal/internal-unstable.rs diff --git a/src/test/ui/compile-fail-migration/internal-unstable.stderr b/src/test/ui/internal/internal-unstable.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/internal-unstable.stderr rename to src/test/ui/internal/internal-unstable.stderr diff --git a/src/test/ui/compile-fail-migration/intrinsic-invalid-number-of-arguments.rs b/src/test/ui/intrinsic-invalid-number-of-arguments.rs similarity index 100% rename from src/test/ui/compile-fail-migration/intrinsic-invalid-number-of-arguments.rs rename to src/test/ui/intrinsic-invalid-number-of-arguments.rs diff --git a/src/test/ui/compile-fail-migration/intrinsic-invalid-number-of-arguments.stderr b/src/test/ui/intrinsic-invalid-number-of-arguments.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/intrinsic-invalid-number-of-arguments.stderr rename to src/test/ui/intrinsic-invalid-number-of-arguments.stderr diff --git a/src/test/ui/compile-fail-migration/invalid-crate-type.rs b/src/test/ui/invalid/invalid-crate-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/invalid-crate-type.rs rename to src/test/ui/invalid/invalid-crate-type.rs diff --git a/src/test/ui/compile-fail-migration/invalid-crate-type.stderr b/src/test/ui/invalid/invalid-crate-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/invalid-crate-type.stderr rename to src/test/ui/invalid/invalid-crate-type.stderr diff --git a/src/test/ui/compile-fail-migration/invalid-inline.rs b/src/test/ui/invalid/invalid-inline.rs similarity index 100% rename from src/test/ui/compile-fail-migration/invalid-inline.rs rename to src/test/ui/invalid/invalid-inline.rs diff --git a/src/test/ui/compile-fail-migration/invalid-inline.stderr b/src/test/ui/invalid/invalid-inline.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/invalid-inline.stderr rename to src/test/ui/invalid/invalid-inline.stderr diff --git a/src/test/ui/compile-fail-migration/invalid-macro-matcher.rs b/src/test/ui/invalid/invalid-macro-matcher.rs similarity index 100% rename from src/test/ui/compile-fail-migration/invalid-macro-matcher.rs rename to src/test/ui/invalid/invalid-macro-matcher.rs diff --git a/src/test/ui/compile-fail-migration/invalid-macro-matcher.stderr b/src/test/ui/invalid/invalid-macro-matcher.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/invalid-macro-matcher.stderr rename to src/test/ui/invalid/invalid-macro-matcher.stderr diff --git a/src/test/ui/invalid-path-in-const.rs b/src/test/ui/invalid/invalid-path-in-const.rs similarity index 100% rename from src/test/ui/invalid-path-in-const.rs rename to src/test/ui/invalid/invalid-path-in-const.rs diff --git a/src/test/ui/invalid-path-in-const.stderr b/src/test/ui/invalid/invalid-path-in-const.stderr similarity index 100% rename from src/test/ui/invalid-path-in-const.stderr rename to src/test/ui/invalid/invalid-path-in-const.stderr diff --git a/src/test/ui/compile-fail-migration/invalid-plugin-attr.rs b/src/test/ui/invalid/invalid-plugin-attr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/invalid-plugin-attr.rs rename to src/test/ui/invalid/invalid-plugin-attr.rs diff --git a/src/test/ui/compile-fail-migration/invalid-plugin-attr.stderr b/src/test/ui/invalid/invalid-plugin-attr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/invalid-plugin-attr.stderr rename to src/test/ui/invalid/invalid-plugin-attr.stderr diff --git a/src/test/ui/invalid-variadic-function.rs b/src/test/ui/invalid/invalid-variadic-function.rs similarity index 100% rename from src/test/ui/invalid-variadic-function.rs rename to src/test/ui/invalid/invalid-variadic-function.rs diff --git a/src/test/ui/invalid-variadic-function.stderr b/src/test/ui/invalid/invalid-variadic-function.stderr similarity index 100% rename from src/test/ui/invalid-variadic-function.stderr rename to src/test/ui/invalid/invalid-variadic-function.stderr diff --git a/src/test/ui/compile-fail-migration/invalid_crate_type_syntax.rs b/src/test/ui/invalid_crate_type_syntax.rs similarity index 100% rename from src/test/ui/compile-fail-migration/invalid_crate_type_syntax.rs rename to src/test/ui/invalid_crate_type_syntax.rs diff --git a/src/test/ui/compile-fail-migration/invalid_crate_type_syntax.stderr b/src/test/ui/invalid_crate_type_syntax.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/invalid_crate_type_syntax.stderr rename to src/test/ui/invalid_crate_type_syntax.stderr diff --git a/src/test/ui/issues/auxiliary/empty-struct.rs b/src/test/ui/issues/auxiliary/empty-struct.rs new file mode 100644 index 00000000000..4a302865634 --- /dev/null +++ b/src/test/ui/issues/auxiliary/empty-struct.rs @@ -0,0 +1,19 @@ +// Copyright 2015 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +pub struct XEmpty1 {} +pub struct XEmpty2; +pub struct XEmpty6(); + +pub enum XE { + XEmpty3 {}, + XEmpty4, + XEmpty5(), +} diff --git a/src/test/ui/compile-fail-migration/auxiliary/issue-19163.rs b/src/test/ui/issues/auxiliary/issue-19163.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/issue-19163.rs rename to src/test/ui/issues/auxiliary/issue-19163.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/issue-21146-inc.rs b/src/test/ui/issues/auxiliary/issue-21146-inc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/issue-21146-inc.rs rename to src/test/ui/issues/auxiliary/issue-21146-inc.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/issue-29181.rs b/src/test/ui/issues/auxiliary/issue-29181.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/issue-29181.rs rename to src/test/ui/issues/auxiliary/issue-29181.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/issue-30535.rs b/src/test/ui/issues/auxiliary/issue-30535.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/issue-30535.rs rename to src/test/ui/issues/auxiliary/issue-30535.rs diff --git a/src/test/ui/auxiliary/issue-36708.rs b/src/test/ui/issues/auxiliary/issue-36708.rs similarity index 100% rename from src/test/ui/auxiliary/issue-36708.rs rename to src/test/ui/issues/auxiliary/issue-36708.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/issue-36881-aux.rs b/src/test/ui/issues/auxiliary/issue-36881-aux.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/issue-36881-aux.rs rename to src/test/ui/issues/auxiliary/issue-36881-aux.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/issue-52489.rs b/src/test/ui/issues/auxiliary/issue-52489.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/issue-52489.rs rename to src/test/ui/issues/auxiliary/issue-52489.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/issue_11680.rs b/src/test/ui/issues/auxiliary/issue_11680.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/issue_11680.rs rename to src/test/ui/issues/auxiliary/issue_11680.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/issue_16725.rs b/src/test/ui/issues/auxiliary/issue_16725.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/issue_16725.rs rename to src/test/ui/issues/auxiliary/issue_16725.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/issue_17718_const_privacy.rs b/src/test/ui/issues/auxiliary/issue_17718_const_privacy.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/issue_17718_const_privacy.rs rename to src/test/ui/issues/auxiliary/issue_17718_const_privacy.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/issue_1920.rs b/src/test/ui/issues/auxiliary/issue_1920.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/issue_1920.rs rename to src/test/ui/issues/auxiliary/issue_1920.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/issue_21202.rs b/src/test/ui/issues/auxiliary/issue_21202.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/issue_21202.rs rename to src/test/ui/issues/auxiliary/issue_21202.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/issue_30123_aux.rs b/src/test/ui/issues/auxiliary/issue_30123_aux.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/issue_30123_aux.rs rename to src/test/ui/issues/auxiliary/issue_30123_aux.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/issue_41549.rs b/src/test/ui/issues/auxiliary/issue_41549.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/issue_41549.rs rename to src/test/ui/issues/auxiliary/issue_41549.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/issue_5844_aux.rs b/src/test/ui/issues/auxiliary/issue_5844_aux.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/issue_5844_aux.rs rename to src/test/ui/issues/auxiliary/issue_5844_aux.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/lint_stability.rs b/src/test/ui/issues/auxiliary/lint_stability.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/lint_stability.rs rename to src/test/ui/issues/auxiliary/lint_stability.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/private_trait_xc.rs b/src/test/ui/issues/auxiliary/private_trait_xc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/private_trait_xc.rs rename to src/test/ui/issues/auxiliary/private_trait_xc.rs diff --git a/src/test/ui/auxiliary/xcrate_issue_43189_a.rs b/src/test/ui/issues/auxiliary/xcrate_issue_43189_a.rs similarity index 100% rename from src/test/ui/auxiliary/xcrate_issue_43189_a.rs rename to src/test/ui/issues/auxiliary/xcrate_issue_43189_a.rs diff --git a/src/test/ui/auxiliary/xcrate_issue_43189_b.rs b/src/test/ui/issues/auxiliary/xcrate_issue_43189_b.rs similarity index 100% rename from src/test/ui/auxiliary/xcrate_issue_43189_b.rs rename to src/test/ui/issues/auxiliary/xcrate_issue_43189_b.rs diff --git a/src/test/ui/auxiliary/xcrate_issue_46112_rexport_core.rs b/src/test/ui/issues/auxiliary/xcrate_issue_46112_rexport_core.rs similarity index 100% rename from src/test/ui/auxiliary/xcrate_issue_46112_rexport_core.rs rename to src/test/ui/issues/auxiliary/xcrate_issue_46112_rexport_core.rs diff --git a/src/test/ui/issue-10176.rs b/src/test/ui/issues/issue-10176.rs similarity index 100% rename from src/test/ui/issue-10176.rs rename to src/test/ui/issues/issue-10176.rs diff --git a/src/test/ui/issue-10176.stderr b/src/test/ui/issues/issue-10176.stderr similarity index 100% rename from src/test/ui/issue-10176.stderr rename to src/test/ui/issues/issue-10176.stderr diff --git a/src/test/ui/issue-10200.rs b/src/test/ui/issues/issue-10200.rs similarity index 100% rename from src/test/ui/issue-10200.rs rename to src/test/ui/issues/issue-10200.rs diff --git a/src/test/ui/issue-10200.stderr b/src/test/ui/issues/issue-10200.stderr similarity index 100% rename from src/test/ui/issue-10200.stderr rename to src/test/ui/issues/issue-10200.stderr diff --git a/src/test/ui/issue-10291.nll.stderr b/src/test/ui/issues/issue-10291.nll.stderr similarity index 100% rename from src/test/ui/issue-10291.nll.stderr rename to src/test/ui/issues/issue-10291.nll.stderr diff --git a/src/test/ui/issue-10291.rs b/src/test/ui/issues/issue-10291.rs similarity index 100% rename from src/test/ui/issue-10291.rs rename to src/test/ui/issues/issue-10291.rs diff --git a/src/test/ui/issue-10291.stderr b/src/test/ui/issues/issue-10291.stderr similarity index 100% rename from src/test/ui/issue-10291.stderr rename to src/test/ui/issues/issue-10291.stderr diff --git a/src/test/ui/issue-10398.nll.stderr b/src/test/ui/issues/issue-10398.nll.stderr similarity index 100% rename from src/test/ui/issue-10398.nll.stderr rename to src/test/ui/issues/issue-10398.nll.stderr diff --git a/src/test/ui/issue-10398.rs b/src/test/ui/issues/issue-10398.rs similarity index 100% rename from src/test/ui/issue-10398.rs rename to src/test/ui/issues/issue-10398.rs diff --git a/src/test/ui/issue-10398.stderr b/src/test/ui/issues/issue-10398.stderr similarity index 100% rename from src/test/ui/issue-10398.stderr rename to src/test/ui/issues/issue-10398.stderr diff --git a/src/test/ui/issue-10401.rs b/src/test/ui/issues/issue-10401.rs similarity index 100% rename from src/test/ui/issue-10401.rs rename to src/test/ui/issues/issue-10401.rs diff --git a/src/test/ui/issue-10401.stderr b/src/test/ui/issues/issue-10401.stderr similarity index 100% rename from src/test/ui/issue-10401.stderr rename to src/test/ui/issues/issue-10401.stderr diff --git a/src/test/ui/issue-10412.rs b/src/test/ui/issues/issue-10412.rs similarity index 100% rename from src/test/ui/issue-10412.rs rename to src/test/ui/issues/issue-10412.rs diff --git a/src/test/ui/issue-10412.stderr b/src/test/ui/issues/issue-10412.stderr similarity index 100% rename from src/test/ui/issue-10412.stderr rename to src/test/ui/issues/issue-10412.stderr diff --git a/src/test/ui/issue-10465.rs b/src/test/ui/issues/issue-10465.rs similarity index 100% rename from src/test/ui/issue-10465.rs rename to src/test/ui/issues/issue-10465.rs diff --git a/src/test/ui/issue-10465.stderr b/src/test/ui/issues/issue-10465.stderr similarity index 100% rename from src/test/ui/issue-10465.stderr rename to src/test/ui/issues/issue-10465.stderr diff --git a/src/test/ui/issue-10536.rs b/src/test/ui/issues/issue-10536.rs similarity index 100% rename from src/test/ui/issue-10536.rs rename to src/test/ui/issues/issue-10536.rs diff --git a/src/test/ui/issue-10536.stderr b/src/test/ui/issues/issue-10536.stderr similarity index 100% rename from src/test/ui/issue-10536.stderr rename to src/test/ui/issues/issue-10536.stderr diff --git a/src/test/ui/issue-10545.rs b/src/test/ui/issues/issue-10545.rs similarity index 100% rename from src/test/ui/issue-10545.rs rename to src/test/ui/issues/issue-10545.rs diff --git a/src/test/ui/issue-10545.stderr b/src/test/ui/issues/issue-10545.stderr similarity index 100% rename from src/test/ui/issue-10545.stderr rename to src/test/ui/issues/issue-10545.stderr diff --git a/src/test/ui/issue-10656.rs b/src/test/ui/issues/issue-10656.rs similarity index 100% rename from src/test/ui/issue-10656.rs rename to src/test/ui/issues/issue-10656.rs diff --git a/src/test/ui/issue-10656.stderr b/src/test/ui/issues/issue-10656.stderr similarity index 100% rename from src/test/ui/issue-10656.stderr rename to src/test/ui/issues/issue-10656.stderr diff --git a/src/test/ui/compile-fail-migration/issue-10755.rs b/src/test/ui/issues/issue-10755.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-10755.rs rename to src/test/ui/issues/issue-10755.rs diff --git a/src/test/ui/compile-fail-migration/issue-10755.stderr b/src/test/ui/issues/issue-10755.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-10755.stderr rename to src/test/ui/issues/issue-10755.stderr diff --git a/src/test/ui/issue-10764.rs b/src/test/ui/issues/issue-10764.rs similarity index 100% rename from src/test/ui/issue-10764.rs rename to src/test/ui/issues/issue-10764.rs diff --git a/src/test/ui/issue-10764.stderr b/src/test/ui/issues/issue-10764.stderr similarity index 100% rename from src/test/ui/issue-10764.stderr rename to src/test/ui/issues/issue-10764.stderr diff --git a/src/test/ui/issue-10877.rs b/src/test/ui/issues/issue-10877.rs similarity index 100% rename from src/test/ui/issue-10877.rs rename to src/test/ui/issues/issue-10877.rs diff --git a/src/test/ui/issue-10877.stderr b/src/test/ui/issues/issue-10877.stderr similarity index 100% rename from src/test/ui/issue-10877.stderr rename to src/test/ui/issues/issue-10877.stderr diff --git a/src/test/ui/issue-10969.rs b/src/test/ui/issues/issue-10969.rs similarity index 100% rename from src/test/ui/issue-10969.rs rename to src/test/ui/issues/issue-10969.rs diff --git a/src/test/ui/issue-10969.stderr b/src/test/ui/issues/issue-10969.stderr similarity index 100% rename from src/test/ui/issue-10969.stderr rename to src/test/ui/issues/issue-10969.stderr diff --git a/src/test/ui/issue-10991.rs b/src/test/ui/issues/issue-10991.rs similarity index 100% rename from src/test/ui/issue-10991.rs rename to src/test/ui/issues/issue-10991.rs diff --git a/src/test/ui/issue-10991.stderr b/src/test/ui/issues/issue-10991.stderr similarity index 100% rename from src/test/ui/issue-10991.stderr rename to src/test/ui/issues/issue-10991.stderr diff --git a/src/test/ui/issue-11004.rs b/src/test/ui/issues/issue-11004.rs similarity index 100% rename from src/test/ui/issue-11004.rs rename to src/test/ui/issues/issue-11004.rs diff --git a/src/test/ui/issue-11004.stderr b/src/test/ui/issues/issue-11004.stderr similarity index 100% rename from src/test/ui/issue-11004.stderr rename to src/test/ui/issues/issue-11004.stderr diff --git a/src/test/ui/issue-11154.rs b/src/test/ui/issues/issue-11154.rs similarity index 100% rename from src/test/ui/issue-11154.rs rename to src/test/ui/issues/issue-11154.rs diff --git a/src/test/ui/issue-11154.stderr b/src/test/ui/issues/issue-11154.stderr similarity index 100% rename from src/test/ui/issue-11154.stderr rename to src/test/ui/issues/issue-11154.stderr diff --git a/src/test/ui/issue-11192.nll.stderr b/src/test/ui/issues/issue-11192.nll.stderr similarity index 100% rename from src/test/ui/issue-11192.nll.stderr rename to src/test/ui/issues/issue-11192.nll.stderr diff --git a/src/test/ui/issue-11192.rs b/src/test/ui/issues/issue-11192.rs similarity index 100% rename from src/test/ui/issue-11192.rs rename to src/test/ui/issues/issue-11192.rs diff --git a/src/test/ui/issue-11192.stderr b/src/test/ui/issues/issue-11192.stderr similarity index 100% rename from src/test/ui/issue-11192.stderr rename to src/test/ui/issues/issue-11192.stderr diff --git a/src/test/ui/issue-11319.rs b/src/test/ui/issues/issue-11319.rs similarity index 100% rename from src/test/ui/issue-11319.rs rename to src/test/ui/issues/issue-11319.rs diff --git a/src/test/ui/issue-11319.stderr b/src/test/ui/issues/issue-11319.stderr similarity index 100% rename from src/test/ui/issue-11319.stderr rename to src/test/ui/issues/issue-11319.stderr diff --git a/src/test/ui/issue-11374.rs b/src/test/ui/issues/issue-11374.rs similarity index 100% rename from src/test/ui/issue-11374.rs rename to src/test/ui/issues/issue-11374.rs diff --git a/src/test/ui/issue-11374.stderr b/src/test/ui/issues/issue-11374.stderr similarity index 100% rename from src/test/ui/issue-11374.stderr rename to src/test/ui/issues/issue-11374.stderr diff --git a/src/test/ui/issue-11493.ast.stderr b/src/test/ui/issues/issue-11493.ast.stderr similarity index 100% rename from src/test/ui/issue-11493.ast.stderr rename to src/test/ui/issues/issue-11493.ast.stderr diff --git a/src/test/ui/issue-11493.mir.stderr b/src/test/ui/issues/issue-11493.mir.stderr similarity index 100% rename from src/test/ui/issue-11493.mir.stderr rename to src/test/ui/issues/issue-11493.mir.stderr diff --git a/src/test/ui/issue-11493.rs b/src/test/ui/issues/issue-11493.rs similarity index 100% rename from src/test/ui/issue-11493.rs rename to src/test/ui/issues/issue-11493.rs diff --git a/src/test/ui/issue-11515.rs b/src/test/ui/issues/issue-11515.rs similarity index 100% rename from src/test/ui/issue-11515.rs rename to src/test/ui/issues/issue-11515.rs diff --git a/src/test/ui/issue-11515.stderr b/src/test/ui/issues/issue-11515.stderr similarity index 100% rename from src/test/ui/issue-11515.stderr rename to src/test/ui/issues/issue-11515.stderr diff --git a/src/test/ui/compile-fail-migration/issue-11593.rs b/src/test/ui/issues/issue-11593.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-11593.rs rename to src/test/ui/issues/issue-11593.rs diff --git a/src/test/ui/compile-fail-migration/issue-11593.stderr b/src/test/ui/issues/issue-11593.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-11593.stderr rename to src/test/ui/issues/issue-11593.stderr diff --git a/src/test/ui/compile-fail-migration/issue-11680.rs b/src/test/ui/issues/issue-11680.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-11680.rs rename to src/test/ui/issues/issue-11680.rs diff --git a/src/test/ui/compile-fail-migration/issue-11680.stderr b/src/test/ui/issues/issue-11680.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-11680.stderr rename to src/test/ui/issues/issue-11680.stderr diff --git a/src/test/ui/issue-11681.rs b/src/test/ui/issues/issue-11681.rs similarity index 100% rename from src/test/ui/issue-11681.rs rename to src/test/ui/issues/issue-11681.rs diff --git a/src/test/ui/issue-11681.stderr b/src/test/ui/issues/issue-11681.stderr similarity index 100% rename from src/test/ui/issue-11681.stderr rename to src/test/ui/issues/issue-11681.stderr diff --git a/src/test/ui/issue-11692-1.rs b/src/test/ui/issues/issue-11692-1.rs similarity index 100% rename from src/test/ui/issue-11692-1.rs rename to src/test/ui/issues/issue-11692-1.rs diff --git a/src/test/ui/issue-11692-1.stderr b/src/test/ui/issues/issue-11692-1.stderr similarity index 100% rename from src/test/ui/issue-11692-1.stderr rename to src/test/ui/issues/issue-11692-1.stderr diff --git a/src/test/ui/issue-11692-2.rs b/src/test/ui/issues/issue-11692-2.rs similarity index 100% rename from src/test/ui/issue-11692-2.rs rename to src/test/ui/issues/issue-11692-2.rs diff --git a/src/test/ui/issue-11692-2.stderr b/src/test/ui/issues/issue-11692-2.stderr similarity index 100% rename from src/test/ui/issue-11692-2.stderr rename to src/test/ui/issues/issue-11692-2.stderr diff --git a/src/test/ui/issue-11740.rs b/src/test/ui/issues/issue-11740.rs similarity index 100% rename from src/test/ui/issue-11740.rs rename to src/test/ui/issues/issue-11740.rs diff --git a/src/test/ui/issue-11740.stderr b/src/test/ui/issues/issue-11740.stderr similarity index 100% rename from src/test/ui/issue-11740.stderr rename to src/test/ui/issues/issue-11740.stderr diff --git a/src/test/ui/issue-11771.rs b/src/test/ui/issues/issue-11771.rs similarity index 100% rename from src/test/ui/issue-11771.rs rename to src/test/ui/issues/issue-11771.rs diff --git a/src/test/ui/issue-11771.stderr b/src/test/ui/issues/issue-11771.stderr similarity index 100% rename from src/test/ui/issue-11771.stderr rename to src/test/ui/issues/issue-11771.stderr diff --git a/src/test/ui/issue-11844.rs b/src/test/ui/issues/issue-11844.rs similarity index 100% rename from src/test/ui/issue-11844.rs rename to src/test/ui/issues/issue-11844.rs diff --git a/src/test/ui/issue-11844.stderr b/src/test/ui/issues/issue-11844.stderr similarity index 100% rename from src/test/ui/issue-11844.stderr rename to src/test/ui/issues/issue-11844.stderr diff --git a/src/test/ui/issue-11873.nll.stderr b/src/test/ui/issues/issue-11873.nll.stderr similarity index 100% rename from src/test/ui/issue-11873.nll.stderr rename to src/test/ui/issues/issue-11873.nll.stderr diff --git a/src/test/ui/issue-11873.rs b/src/test/ui/issues/issue-11873.rs similarity index 100% rename from src/test/ui/issue-11873.rs rename to src/test/ui/issues/issue-11873.rs diff --git a/src/test/ui/issue-11873.stderr b/src/test/ui/issues/issue-11873.stderr similarity index 100% rename from src/test/ui/issue-11873.stderr rename to src/test/ui/issues/issue-11873.stderr diff --git a/src/test/ui/issue-12028.rs b/src/test/ui/issues/issue-12028.rs similarity index 100% rename from src/test/ui/issue-12028.rs rename to src/test/ui/issues/issue-12028.rs diff --git a/src/test/ui/issue-12028.stderr b/src/test/ui/issues/issue-12028.stderr similarity index 100% rename from src/test/ui/issue-12028.stderr rename to src/test/ui/issues/issue-12028.stderr diff --git a/src/test/ui/issue-12041.nll.stderr b/src/test/ui/issues/issue-12041.nll.stderr similarity index 100% rename from src/test/ui/issue-12041.nll.stderr rename to src/test/ui/issues/issue-12041.nll.stderr diff --git a/src/test/ui/issue-12041.rs b/src/test/ui/issues/issue-12041.rs similarity index 100% rename from src/test/ui/issue-12041.rs rename to src/test/ui/issues/issue-12041.rs diff --git a/src/test/ui/issue-12041.stderr b/src/test/ui/issues/issue-12041.stderr similarity index 100% rename from src/test/ui/issue-12041.stderr rename to src/test/ui/issues/issue-12041.stderr diff --git a/src/test/ui/issue-12116.rs b/src/test/ui/issues/issue-12116.rs similarity index 100% rename from src/test/ui/issue-12116.rs rename to src/test/ui/issues/issue-12116.rs diff --git a/src/test/ui/issue-12116.stderr b/src/test/ui/issues/issue-12116.stderr similarity index 100% rename from src/test/ui/issue-12116.stderr rename to src/test/ui/issues/issue-12116.stderr diff --git a/src/test/ui/issue-12127.rs b/src/test/ui/issues/issue-12127.rs similarity index 100% rename from src/test/ui/issue-12127.rs rename to src/test/ui/issues/issue-12127.rs diff --git a/src/test/ui/issue-12127.stderr b/src/test/ui/issues/issue-12127.stderr similarity index 100% rename from src/test/ui/issue-12127.stderr rename to src/test/ui/issues/issue-12127.stderr diff --git a/src/test/ui/issue-12187-1.rs b/src/test/ui/issues/issue-12187-1.rs similarity index 100% rename from src/test/ui/issue-12187-1.rs rename to src/test/ui/issues/issue-12187-1.rs diff --git a/src/test/ui/issue-12187-1.stderr b/src/test/ui/issues/issue-12187-1.stderr similarity index 100% rename from src/test/ui/issue-12187-1.stderr rename to src/test/ui/issues/issue-12187-1.stderr diff --git a/src/test/ui/issue-12187-2.rs b/src/test/ui/issues/issue-12187-2.rs similarity index 100% rename from src/test/ui/issue-12187-2.rs rename to src/test/ui/issues/issue-12187-2.rs diff --git a/src/test/ui/issue-12187-2.stderr b/src/test/ui/issues/issue-12187-2.stderr similarity index 100% rename from src/test/ui/issue-12187-2.stderr rename to src/test/ui/issues/issue-12187-2.stderr diff --git a/src/test/ui/issue-12369.rs b/src/test/ui/issues/issue-12369.rs similarity index 100% rename from src/test/ui/issue-12369.rs rename to src/test/ui/issues/issue-12369.rs diff --git a/src/test/ui/issue-12369.stderr b/src/test/ui/issues/issue-12369.stderr similarity index 100% rename from src/test/ui/issue-12369.stderr rename to src/test/ui/issues/issue-12369.stderr diff --git a/src/test/ui/issue-12470.nll.stderr b/src/test/ui/issues/issue-12470.nll.stderr similarity index 100% rename from src/test/ui/issue-12470.nll.stderr rename to src/test/ui/issues/issue-12470.nll.stderr diff --git a/src/test/ui/issue-12470.rs b/src/test/ui/issues/issue-12470.rs similarity index 100% rename from src/test/ui/issue-12470.rs rename to src/test/ui/issues/issue-12470.rs diff --git a/src/test/ui/issue-12470.stderr b/src/test/ui/issues/issue-12470.stderr similarity index 100% rename from src/test/ui/issue-12470.stderr rename to src/test/ui/issues/issue-12470.stderr diff --git a/src/test/ui/issue-12511.rs b/src/test/ui/issues/issue-12511.rs similarity index 100% rename from src/test/ui/issue-12511.rs rename to src/test/ui/issues/issue-12511.rs diff --git a/src/test/ui/issue-12511.stderr b/src/test/ui/issues/issue-12511.stderr similarity index 100% rename from src/test/ui/issue-12511.stderr rename to src/test/ui/issues/issue-12511.stderr diff --git a/src/test/ui/issue-12552.rs b/src/test/ui/issues/issue-12552.rs similarity index 100% rename from src/test/ui/issue-12552.rs rename to src/test/ui/issues/issue-12552.rs diff --git a/src/test/ui/issue-12552.stderr b/src/test/ui/issues/issue-12552.stderr similarity index 100% rename from src/test/ui/issue-12552.stderr rename to src/test/ui/issues/issue-12552.stderr diff --git a/src/test/ui/issue-12567.nll.stderr b/src/test/ui/issues/issue-12567.nll.stderr similarity index 100% rename from src/test/ui/issue-12567.nll.stderr rename to src/test/ui/issues/issue-12567.nll.stderr diff --git a/src/test/ui/issue-12567.rs b/src/test/ui/issues/issue-12567.rs similarity index 100% rename from src/test/ui/issue-12567.rs rename to src/test/ui/issues/issue-12567.rs diff --git a/src/test/ui/issue-12567.stderr b/src/test/ui/issues/issue-12567.stderr similarity index 100% rename from src/test/ui/issue-12567.stderr rename to src/test/ui/issues/issue-12567.stderr diff --git a/src/test/ui/issue-12796.rs b/src/test/ui/issues/issue-12796.rs similarity index 100% rename from src/test/ui/issue-12796.rs rename to src/test/ui/issues/issue-12796.rs diff --git a/src/test/ui/issue-12796.stderr b/src/test/ui/issues/issue-12796.stderr similarity index 100% rename from src/test/ui/issue-12796.stderr rename to src/test/ui/issues/issue-12796.stderr diff --git a/src/test/ui/issue-12863.rs b/src/test/ui/issues/issue-12863.rs similarity index 100% rename from src/test/ui/issue-12863.rs rename to src/test/ui/issues/issue-12863.rs diff --git a/src/test/ui/issue-12863.stderr b/src/test/ui/issues/issue-12863.stderr similarity index 100% rename from src/test/ui/issue-12863.stderr rename to src/test/ui/issues/issue-12863.stderr diff --git a/src/test/ui/issue-12997-1.rs b/src/test/ui/issues/issue-12997-1.rs similarity index 100% rename from src/test/ui/issue-12997-1.rs rename to src/test/ui/issues/issue-12997-1.rs diff --git a/src/test/ui/issue-12997-1.stderr b/src/test/ui/issues/issue-12997-1.stderr similarity index 100% rename from src/test/ui/issue-12997-1.stderr rename to src/test/ui/issues/issue-12997-1.stderr diff --git a/src/test/ui/issue-12997-2.rs b/src/test/ui/issues/issue-12997-2.rs similarity index 100% rename from src/test/ui/issue-12997-2.rs rename to src/test/ui/issues/issue-12997-2.rs diff --git a/src/test/ui/issue-12997-2.stderr b/src/test/ui/issues/issue-12997-2.stderr similarity index 100% rename from src/test/ui/issue-12997-2.stderr rename to src/test/ui/issues/issue-12997-2.stderr diff --git a/src/test/ui/issue-13033.rs b/src/test/ui/issues/issue-13033.rs similarity index 100% rename from src/test/ui/issue-13033.rs rename to src/test/ui/issues/issue-13033.rs diff --git a/src/test/ui/issue-13033.stderr b/src/test/ui/issues/issue-13033.stderr similarity index 100% rename from src/test/ui/issue-13033.stderr rename to src/test/ui/issues/issue-13033.stderr diff --git a/src/test/ui/issue-13058.nll.stderr b/src/test/ui/issues/issue-13058.nll.stderr similarity index 100% rename from src/test/ui/issue-13058.nll.stderr rename to src/test/ui/issues/issue-13058.nll.stderr diff --git a/src/test/ui/issue-13058.rs b/src/test/ui/issues/issue-13058.rs similarity index 100% rename from src/test/ui/issue-13058.rs rename to src/test/ui/issues/issue-13058.rs diff --git a/src/test/ui/issue-13058.stderr b/src/test/ui/issues/issue-13058.stderr similarity index 100% rename from src/test/ui/issue-13058.stderr rename to src/test/ui/issues/issue-13058.stderr diff --git a/src/test/ui/issue-13352.rs b/src/test/ui/issues/issue-13352.rs similarity index 100% rename from src/test/ui/issue-13352.rs rename to src/test/ui/issues/issue-13352.rs diff --git a/src/test/ui/issue-13352.stderr b/src/test/ui/issues/issue-13352.stderr similarity index 100% rename from src/test/ui/issue-13352.stderr rename to src/test/ui/issues/issue-13352.stderr diff --git a/src/test/ui/issue-13359.rs b/src/test/ui/issues/issue-13359.rs similarity index 100% rename from src/test/ui/issue-13359.rs rename to src/test/ui/issues/issue-13359.rs diff --git a/src/test/ui/issue-13359.stderr b/src/test/ui/issues/issue-13359.stderr similarity index 100% rename from src/test/ui/issue-13359.stderr rename to src/test/ui/issues/issue-13359.stderr diff --git a/src/test/ui/issue-13404.rs b/src/test/ui/issues/issue-13404.rs similarity index 100% rename from src/test/ui/issue-13404.rs rename to src/test/ui/issues/issue-13404.rs diff --git a/src/test/ui/issue-13404.stderr b/src/test/ui/issues/issue-13404.stderr similarity index 100% rename from src/test/ui/issue-13404.stderr rename to src/test/ui/issues/issue-13404.stderr diff --git a/src/test/ui/issue-13407.rs b/src/test/ui/issues/issue-13407.rs similarity index 100% rename from src/test/ui/issue-13407.rs rename to src/test/ui/issues/issue-13407.rs diff --git a/src/test/ui/issue-13407.stderr b/src/test/ui/issues/issue-13407.stderr similarity index 100% rename from src/test/ui/issue-13407.stderr rename to src/test/ui/issues/issue-13407.stderr diff --git a/src/test/ui/issue-13446.rs b/src/test/ui/issues/issue-13446.rs similarity index 100% rename from src/test/ui/issue-13446.rs rename to src/test/ui/issues/issue-13446.rs diff --git a/src/test/ui/issue-13446.stderr b/src/test/ui/issues/issue-13446.stderr similarity index 100% rename from src/test/ui/issue-13446.stderr rename to src/test/ui/issues/issue-13446.stderr diff --git a/src/test/ui/issue-13466.rs b/src/test/ui/issues/issue-13466.rs similarity index 100% rename from src/test/ui/issue-13466.rs rename to src/test/ui/issues/issue-13466.rs diff --git a/src/test/ui/issue-13466.stderr b/src/test/ui/issues/issue-13466.stderr similarity index 100% rename from src/test/ui/issue-13466.stderr rename to src/test/ui/issues/issue-13466.stderr diff --git a/src/test/ui/issue-13482-2.rs b/src/test/ui/issues/issue-13482-2.rs similarity index 100% rename from src/test/ui/issue-13482-2.rs rename to src/test/ui/issues/issue-13482-2.rs diff --git a/src/test/ui/issue-13482-2.stderr b/src/test/ui/issues/issue-13482-2.stderr similarity index 100% rename from src/test/ui/issue-13482-2.stderr rename to src/test/ui/issues/issue-13482-2.stderr diff --git a/src/test/ui/issue-13482.rs b/src/test/ui/issues/issue-13482.rs similarity index 100% rename from src/test/ui/issue-13482.rs rename to src/test/ui/issues/issue-13482.rs diff --git a/src/test/ui/issue-13482.stderr b/src/test/ui/issues/issue-13482.stderr similarity index 100% rename from src/test/ui/issue-13482.stderr rename to src/test/ui/issues/issue-13482.stderr diff --git a/src/test/ui/issue-13483.rs b/src/test/ui/issues/issue-13483.rs similarity index 100% rename from src/test/ui/issue-13483.rs rename to src/test/ui/issues/issue-13483.rs diff --git a/src/test/ui/issue-13483.stderr b/src/test/ui/issues/issue-13483.stderr similarity index 100% rename from src/test/ui/issue-13483.stderr rename to src/test/ui/issues/issue-13483.stderr diff --git a/src/test/ui/issue-13497-2.nll.stderr b/src/test/ui/issues/issue-13497-2.nll.stderr similarity index 100% rename from src/test/ui/issue-13497-2.nll.stderr rename to src/test/ui/issues/issue-13497-2.nll.stderr diff --git a/src/test/ui/issue-13497-2.rs b/src/test/ui/issues/issue-13497-2.rs similarity index 100% rename from src/test/ui/issue-13497-2.rs rename to src/test/ui/issues/issue-13497-2.rs diff --git a/src/test/ui/issue-13497-2.stderr b/src/test/ui/issues/issue-13497-2.stderr similarity index 100% rename from src/test/ui/issue-13497-2.stderr rename to src/test/ui/issues/issue-13497-2.stderr diff --git a/src/test/ui/issue-13497.rs b/src/test/ui/issues/issue-13497.rs similarity index 100% rename from src/test/ui/issue-13497.rs rename to src/test/ui/issues/issue-13497.rs diff --git a/src/test/ui/issue-13497.stderr b/src/test/ui/issues/issue-13497.stderr similarity index 100% rename from src/test/ui/issue-13497.stderr rename to src/test/ui/issues/issue-13497.stderr diff --git a/src/test/ui/issue-1362.rs b/src/test/ui/issues/issue-1362.rs similarity index 100% rename from src/test/ui/issue-1362.rs rename to src/test/ui/issues/issue-1362.rs diff --git a/src/test/ui/issue-1362.stderr b/src/test/ui/issues/issue-1362.stderr similarity index 100% rename from src/test/ui/issue-1362.stderr rename to src/test/ui/issues/issue-1362.stderr diff --git a/src/test/ui/issue-13641.rs b/src/test/ui/issues/issue-13641.rs similarity index 100% rename from src/test/ui/issue-13641.rs rename to src/test/ui/issues/issue-13641.rs diff --git a/src/test/ui/issue-13641.stderr b/src/test/ui/issues/issue-13641.stderr similarity index 100% rename from src/test/ui/issue-13641.stderr rename to src/test/ui/issues/issue-13641.stderr diff --git a/src/test/ui/issue-13727.rs b/src/test/ui/issues/issue-13727.rs similarity index 100% rename from src/test/ui/issue-13727.rs rename to src/test/ui/issues/issue-13727.rs diff --git a/src/test/ui/issue-13727.stderr b/src/test/ui/issues/issue-13727.stderr similarity index 100% rename from src/test/ui/issue-13727.stderr rename to src/test/ui/issues/issue-13727.stderr diff --git a/src/test/ui/issue-13847.rs b/src/test/ui/issues/issue-13847.rs similarity index 100% rename from src/test/ui/issue-13847.rs rename to src/test/ui/issues/issue-13847.rs diff --git a/src/test/ui/issue-13847.stderr b/src/test/ui/issues/issue-13847.stderr similarity index 100% rename from src/test/ui/issue-13847.stderr rename to src/test/ui/issues/issue-13847.stderr diff --git a/src/test/ui/issue-13853-2.rs b/src/test/ui/issues/issue-13853-2.rs similarity index 100% rename from src/test/ui/issue-13853-2.rs rename to src/test/ui/issues/issue-13853-2.rs diff --git a/src/test/ui/issue-13853-2.stderr b/src/test/ui/issues/issue-13853-2.stderr similarity index 100% rename from src/test/ui/issue-13853-2.stderr rename to src/test/ui/issues/issue-13853-2.stderr diff --git a/src/test/ui/issue-13853-5.rs b/src/test/ui/issues/issue-13853-5.rs similarity index 100% rename from src/test/ui/issue-13853-5.rs rename to src/test/ui/issues/issue-13853-5.rs diff --git a/src/test/ui/issue-13853-5.stderr b/src/test/ui/issues/issue-13853-5.stderr similarity index 100% rename from src/test/ui/issue-13853-5.stderr rename to src/test/ui/issues/issue-13853-5.stderr diff --git a/src/test/ui/issue-13853.rs b/src/test/ui/issues/issue-13853.rs similarity index 100% rename from src/test/ui/issue-13853.rs rename to src/test/ui/issues/issue-13853.rs diff --git a/src/test/ui/issue-13853.stderr b/src/test/ui/issues/issue-13853.stderr similarity index 100% rename from src/test/ui/issue-13853.stderr rename to src/test/ui/issues/issue-13853.stderr diff --git a/src/test/ui/issue-14091-2.rs b/src/test/ui/issues/issue-14091-2.rs similarity index 100% rename from src/test/ui/issue-14091-2.rs rename to src/test/ui/issues/issue-14091-2.rs diff --git a/src/test/ui/issue-14091-2.stderr b/src/test/ui/issues/issue-14091-2.stderr similarity index 100% rename from src/test/ui/issue-14091-2.stderr rename to src/test/ui/issues/issue-14091-2.stderr diff --git a/src/test/ui/issue-14091.rs b/src/test/ui/issues/issue-14091.rs similarity index 100% rename from src/test/ui/issue-14091.rs rename to src/test/ui/issues/issue-14091.rs diff --git a/src/test/ui/issue-14091.stderr b/src/test/ui/issues/issue-14091.stderr similarity index 100% rename from src/test/ui/issue-14091.stderr rename to src/test/ui/issues/issue-14091.stderr diff --git a/src/test/ui/issue-14092.rs b/src/test/ui/issues/issue-14092.rs similarity index 100% rename from src/test/ui/issue-14092.rs rename to src/test/ui/issues/issue-14092.rs diff --git a/src/test/ui/issue-14092.stderr b/src/test/ui/issues/issue-14092.stderr similarity index 100% rename from src/test/ui/issue-14092.stderr rename to src/test/ui/issues/issue-14092.stderr diff --git a/src/test/ui/issue-14221.rs b/src/test/ui/issues/issue-14221.rs similarity index 100% rename from src/test/ui/issue-14221.rs rename to src/test/ui/issues/issue-14221.rs diff --git a/src/test/ui/issue-14221.stderr b/src/test/ui/issues/issue-14221.stderr similarity index 100% rename from src/test/ui/issue-14221.stderr rename to src/test/ui/issues/issue-14221.stderr diff --git a/src/test/ui/issue-14227.rs b/src/test/ui/issues/issue-14227.rs similarity index 100% rename from src/test/ui/issue-14227.rs rename to src/test/ui/issues/issue-14227.rs diff --git a/src/test/ui/issue-14227.stderr b/src/test/ui/issues/issue-14227.stderr similarity index 100% rename from src/test/ui/issue-14227.stderr rename to src/test/ui/issues/issue-14227.stderr diff --git a/src/test/ui/issue-14285.nll.stderr b/src/test/ui/issues/issue-14285.nll.stderr similarity index 100% rename from src/test/ui/issue-14285.nll.stderr rename to src/test/ui/issues/issue-14285.nll.stderr diff --git a/src/test/ui/issue-14285.rs b/src/test/ui/issues/issue-14285.rs similarity index 100% rename from src/test/ui/issue-14285.rs rename to src/test/ui/issues/issue-14285.rs diff --git a/src/test/ui/issue-14285.stderr b/src/test/ui/issues/issue-14285.stderr similarity index 100% rename from src/test/ui/issue-14285.stderr rename to src/test/ui/issues/issue-14285.stderr diff --git a/src/test/ui/issue-14309.rs b/src/test/ui/issues/issue-14309.rs similarity index 100% rename from src/test/ui/issue-14309.rs rename to src/test/ui/issues/issue-14309.rs diff --git a/src/test/ui/issue-14309.stderr b/src/test/ui/issues/issue-14309.stderr similarity index 100% rename from src/test/ui/issue-14309.stderr rename to src/test/ui/issues/issue-14309.stderr diff --git a/src/test/ui/issue-14366.rs b/src/test/ui/issues/issue-14366.rs similarity index 100% rename from src/test/ui/issue-14366.rs rename to src/test/ui/issues/issue-14366.rs diff --git a/src/test/ui/issue-14366.stderr b/src/test/ui/issues/issue-14366.stderr similarity index 100% rename from src/test/ui/issue-14366.stderr rename to src/test/ui/issues/issue-14366.stderr diff --git a/src/test/ui/issue-1448-2.rs b/src/test/ui/issues/issue-1448-2.rs similarity index 100% rename from src/test/ui/issue-1448-2.rs rename to src/test/ui/issues/issue-1448-2.rs diff --git a/src/test/ui/issue-1448-2.stderr b/src/test/ui/issues/issue-1448-2.stderr similarity index 100% rename from src/test/ui/issue-1448-2.stderr rename to src/test/ui/issues/issue-1448-2.stderr diff --git a/src/test/ui/issue-14541.rs b/src/test/ui/issues/issue-14541.rs similarity index 100% rename from src/test/ui/issue-14541.rs rename to src/test/ui/issues/issue-14541.rs diff --git a/src/test/ui/issue-14541.stderr b/src/test/ui/issues/issue-14541.stderr similarity index 100% rename from src/test/ui/issue-14541.stderr rename to src/test/ui/issues/issue-14541.stderr diff --git a/src/test/ui/issue-14721.rs b/src/test/ui/issues/issue-14721.rs similarity index 100% rename from src/test/ui/issue-14721.rs rename to src/test/ui/issues/issue-14721.rs diff --git a/src/test/ui/issue-14721.stderr b/src/test/ui/issues/issue-14721.stderr similarity index 100% rename from src/test/ui/issue-14721.stderr rename to src/test/ui/issues/issue-14721.stderr diff --git a/src/test/ui/issue-1476.rs b/src/test/ui/issues/issue-1476.rs similarity index 100% rename from src/test/ui/issue-1476.rs rename to src/test/ui/issues/issue-1476.rs diff --git a/src/test/ui/issue-1476.stderr b/src/test/ui/issues/issue-1476.stderr similarity index 100% rename from src/test/ui/issue-1476.stderr rename to src/test/ui/issues/issue-1476.stderr diff --git a/src/test/ui/issue-14772.rs b/src/test/ui/issues/issue-14772.rs similarity index 100% rename from src/test/ui/issue-14772.rs rename to src/test/ui/issues/issue-14772.rs diff --git a/src/test/ui/issue-14772.stderr b/src/test/ui/issues/issue-14772.stderr similarity index 100% rename from src/test/ui/issue-14772.stderr rename to src/test/ui/issues/issue-14772.stderr diff --git a/src/test/ui/issue-14845.rs b/src/test/ui/issues/issue-14845.rs similarity index 100% rename from src/test/ui/issue-14845.rs rename to src/test/ui/issues/issue-14845.rs diff --git a/src/test/ui/issue-14845.stderr b/src/test/ui/issues/issue-14845.stderr similarity index 100% rename from src/test/ui/issue-14845.stderr rename to src/test/ui/issues/issue-14845.stderr diff --git a/src/test/ui/issue-14853.rs b/src/test/ui/issues/issue-14853.rs similarity index 100% rename from src/test/ui/issue-14853.rs rename to src/test/ui/issues/issue-14853.rs diff --git a/src/test/ui/issue-14853.stderr b/src/test/ui/issues/issue-14853.stderr similarity index 100% rename from src/test/ui/issue-14853.stderr rename to src/test/ui/issues/issue-14853.stderr diff --git a/src/test/ui/issue-14915.rs b/src/test/ui/issues/issue-14915.rs similarity index 100% rename from src/test/ui/issue-14915.rs rename to src/test/ui/issues/issue-14915.rs diff --git a/src/test/ui/issue-14915.stderr b/src/test/ui/issues/issue-14915.stderr similarity index 100% rename from src/test/ui/issue-14915.stderr rename to src/test/ui/issues/issue-14915.stderr diff --git a/src/test/ui/issue-15034.nll.stderr b/src/test/ui/issues/issue-15034.nll.stderr similarity index 100% rename from src/test/ui/issue-15034.nll.stderr rename to src/test/ui/issues/issue-15034.nll.stderr diff --git a/src/test/ui/issue-15034.rs b/src/test/ui/issues/issue-15034.rs similarity index 100% rename from src/test/ui/issue-15034.rs rename to src/test/ui/issues/issue-15034.rs diff --git a/src/test/ui/issue-15034.stderr b/src/test/ui/issues/issue-15034.stderr similarity index 100% rename from src/test/ui/issue-15034.stderr rename to src/test/ui/issues/issue-15034.stderr diff --git a/src/test/ui/issue-15094.rs b/src/test/ui/issues/issue-15094.rs similarity index 100% rename from src/test/ui/issue-15094.rs rename to src/test/ui/issues/issue-15094.rs diff --git a/src/test/ui/issue-15094.stderr b/src/test/ui/issues/issue-15094.stderr similarity index 100% rename from src/test/ui/issue-15094.stderr rename to src/test/ui/issues/issue-15094.stderr diff --git a/src/test/ui/issue-15129.rs b/src/test/ui/issues/issue-15129.rs similarity index 100% rename from src/test/ui/issue-15129.rs rename to src/test/ui/issues/issue-15129.rs diff --git a/src/test/ui/issue-15129.stderr b/src/test/ui/issues/issue-15129.stderr similarity index 100% rename from src/test/ui/issue-15129.stderr rename to src/test/ui/issues/issue-15129.stderr diff --git a/src/test/ui/issue-15167.rs b/src/test/ui/issues/issue-15167.rs similarity index 100% rename from src/test/ui/issue-15167.rs rename to src/test/ui/issues/issue-15167.rs diff --git a/src/test/ui/issue-15167.stderr b/src/test/ui/issues/issue-15167.stderr similarity index 100% rename from src/test/ui/issue-15167.stderr rename to src/test/ui/issues/issue-15167.stderr diff --git a/src/test/ui/issue-15207.rs b/src/test/ui/issues/issue-15207.rs similarity index 100% rename from src/test/ui/issue-15207.rs rename to src/test/ui/issues/issue-15207.rs diff --git a/src/test/ui/issue-15207.stderr b/src/test/ui/issues/issue-15207.stderr similarity index 100% rename from src/test/ui/issue-15207.stderr rename to src/test/ui/issues/issue-15207.stderr diff --git a/src/test/ui/issue-15260.rs b/src/test/ui/issues/issue-15260.rs similarity index 100% rename from src/test/ui/issue-15260.rs rename to src/test/ui/issues/issue-15260.rs diff --git a/src/test/ui/issue-15260.stderr b/src/test/ui/issues/issue-15260.stderr similarity index 100% rename from src/test/ui/issue-15260.stderr rename to src/test/ui/issues/issue-15260.stderr diff --git a/src/test/ui/issue-15381.rs b/src/test/ui/issues/issue-15381.rs similarity index 100% rename from src/test/ui/issue-15381.rs rename to src/test/ui/issues/issue-15381.rs diff --git a/src/test/ui/issue-15381.stderr b/src/test/ui/issues/issue-15381.stderr similarity index 100% rename from src/test/ui/issue-15381.stderr rename to src/test/ui/issues/issue-15381.stderr diff --git a/src/test/ui/issue-15524.rs b/src/test/ui/issues/issue-15524.rs similarity index 100% rename from src/test/ui/issue-15524.rs rename to src/test/ui/issues/issue-15524.rs diff --git a/src/test/ui/issue-15524.stderr b/src/test/ui/issues/issue-15524.stderr similarity index 100% rename from src/test/ui/issue-15524.stderr rename to src/test/ui/issues/issue-15524.stderr diff --git a/src/test/ui/issue-15756.rs b/src/test/ui/issues/issue-15756.rs similarity index 100% rename from src/test/ui/issue-15756.rs rename to src/test/ui/issues/issue-15756.rs diff --git a/src/test/ui/issue-15756.stderr b/src/test/ui/issues/issue-15756.stderr similarity index 100% rename from src/test/ui/issue-15756.stderr rename to src/test/ui/issues/issue-15756.stderr diff --git a/src/test/ui/issue-15783.rs b/src/test/ui/issues/issue-15783.rs similarity index 100% rename from src/test/ui/issue-15783.rs rename to src/test/ui/issues/issue-15783.rs diff --git a/src/test/ui/issue-15783.stderr b/src/test/ui/issues/issue-15783.stderr similarity index 100% rename from src/test/ui/issue-15783.stderr rename to src/test/ui/issues/issue-15783.stderr diff --git a/src/test/ui/issue-15896.rs b/src/test/ui/issues/issue-15896.rs similarity index 100% rename from src/test/ui/issue-15896.rs rename to src/test/ui/issues/issue-15896.rs diff --git a/src/test/ui/issue-15896.stderr b/src/test/ui/issues/issue-15896.stderr similarity index 100% rename from src/test/ui/issue-15896.stderr rename to src/test/ui/issues/issue-15896.stderr diff --git a/src/test/ui/compile-fail-migration/issue-15919.rs b/src/test/ui/issues/issue-15919.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-15919.rs rename to src/test/ui/issues/issue-15919.rs diff --git a/src/test/ui/compile-fail-migration/issue-15919.stderr b/src/test/ui/issues/issue-15919.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-15919.stderr rename to src/test/ui/issues/issue-15919.stderr diff --git a/src/test/ui/issue-15965.rs b/src/test/ui/issues/issue-15965.rs similarity index 100% rename from src/test/ui/issue-15965.rs rename to src/test/ui/issues/issue-15965.rs diff --git a/src/test/ui/issue-15965.stderr b/src/test/ui/issues/issue-15965.stderr similarity index 100% rename from src/test/ui/issue-15965.stderr rename to src/test/ui/issues/issue-15965.stderr diff --git a/src/test/ui/issue-16048.rs b/src/test/ui/issues/issue-16048.rs similarity index 100% rename from src/test/ui/issue-16048.rs rename to src/test/ui/issues/issue-16048.rs diff --git a/src/test/ui/issue-16048.stderr b/src/test/ui/issues/issue-16048.stderr similarity index 100% rename from src/test/ui/issue-16048.stderr rename to src/test/ui/issues/issue-16048.stderr diff --git a/src/test/ui/issue-16098.rs b/src/test/ui/issues/issue-16098.rs similarity index 100% rename from src/test/ui/issue-16098.rs rename to src/test/ui/issues/issue-16098.rs diff --git a/src/test/ui/issue-16098.stderr b/src/test/ui/issues/issue-16098.stderr similarity index 100% rename from src/test/ui/issue-16098.stderr rename to src/test/ui/issues/issue-16098.stderr diff --git a/src/test/ui/issue-16149.rs b/src/test/ui/issues/issue-16149.rs similarity index 100% rename from src/test/ui/issue-16149.rs rename to src/test/ui/issues/issue-16149.rs diff --git a/src/test/ui/issue-16149.stderr b/src/test/ui/issues/issue-16149.stderr similarity index 100% rename from src/test/ui/issue-16149.stderr rename to src/test/ui/issues/issue-16149.stderr diff --git a/src/test/ui/issue-16250.rs b/src/test/ui/issues/issue-16250.rs similarity index 100% rename from src/test/ui/issue-16250.rs rename to src/test/ui/issues/issue-16250.rs diff --git a/src/test/ui/issue-16250.stderr b/src/test/ui/issues/issue-16250.stderr similarity index 100% rename from src/test/ui/issue-16250.stderr rename to src/test/ui/issues/issue-16250.stderr diff --git a/src/test/ui/issue-16338.rs b/src/test/ui/issues/issue-16338.rs similarity index 100% rename from src/test/ui/issue-16338.rs rename to src/test/ui/issues/issue-16338.rs diff --git a/src/test/ui/issue-16338.stderr b/src/test/ui/issues/issue-16338.stderr similarity index 100% rename from src/test/ui/issue-16338.stderr rename to src/test/ui/issues/issue-16338.stderr diff --git a/src/test/ui/issue-16401.rs b/src/test/ui/issues/issue-16401.rs similarity index 100% rename from src/test/ui/issue-16401.rs rename to src/test/ui/issues/issue-16401.rs diff --git a/src/test/ui/issue-16401.stderr b/src/test/ui/issues/issue-16401.stderr similarity index 100% rename from src/test/ui/issue-16401.stderr rename to src/test/ui/issues/issue-16401.stderr diff --git a/src/test/ui/issue-16538.rs b/src/test/ui/issues/issue-16538.rs similarity index 100% rename from src/test/ui/issue-16538.rs rename to src/test/ui/issues/issue-16538.rs diff --git a/src/test/ui/issue-16538.stderr b/src/test/ui/issues/issue-16538.stderr similarity index 100% rename from src/test/ui/issue-16538.stderr rename to src/test/ui/issues/issue-16538.stderr diff --git a/src/test/ui/issue-16562.rs b/src/test/ui/issues/issue-16562.rs similarity index 100% rename from src/test/ui/issue-16562.rs rename to src/test/ui/issues/issue-16562.rs diff --git a/src/test/ui/issue-16562.stderr b/src/test/ui/issues/issue-16562.stderr similarity index 100% rename from src/test/ui/issue-16562.stderr rename to src/test/ui/issues/issue-16562.stderr diff --git a/src/test/ui/issue-16683.nll.stderr b/src/test/ui/issues/issue-16683.nll.stderr similarity index 100% rename from src/test/ui/issue-16683.nll.stderr rename to src/test/ui/issues/issue-16683.nll.stderr diff --git a/src/test/ui/issue-16683.rs b/src/test/ui/issues/issue-16683.rs similarity index 100% rename from src/test/ui/issue-16683.rs rename to src/test/ui/issues/issue-16683.rs diff --git a/src/test/ui/issue-16683.stderr b/src/test/ui/issues/issue-16683.stderr similarity index 100% rename from src/test/ui/issue-16683.stderr rename to src/test/ui/issues/issue-16683.stderr diff --git a/src/test/ui/compile-fail-migration/issue-16725.rs b/src/test/ui/issues/issue-16725.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-16725.rs rename to src/test/ui/issues/issue-16725.rs diff --git a/src/test/ui/compile-fail-migration/issue-16725.stderr b/src/test/ui/issues/issue-16725.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-16725.stderr rename to src/test/ui/issues/issue-16725.stderr diff --git a/src/test/ui/issue-16922.nll.stderr b/src/test/ui/issues/issue-16922.nll.stderr similarity index 100% rename from src/test/ui/issue-16922.nll.stderr rename to src/test/ui/issues/issue-16922.nll.stderr diff --git a/src/test/ui/issue-16922.rs b/src/test/ui/issues/issue-16922.rs similarity index 100% rename from src/test/ui/issue-16922.rs rename to src/test/ui/issues/issue-16922.rs diff --git a/src/test/ui/issue-16922.stderr b/src/test/ui/issues/issue-16922.stderr similarity index 100% rename from src/test/ui/issue-16922.stderr rename to src/test/ui/issues/issue-16922.stderr diff --git a/src/test/ui/issue-16939.rs b/src/test/ui/issues/issue-16939.rs similarity index 100% rename from src/test/ui/issue-16939.rs rename to src/test/ui/issues/issue-16939.rs diff --git a/src/test/ui/issue-16939.stderr b/src/test/ui/issues/issue-16939.stderr similarity index 100% rename from src/test/ui/issue-16939.stderr rename to src/test/ui/issues/issue-16939.stderr diff --git a/src/test/ui/issue-16966.rs b/src/test/ui/issues/issue-16966.rs similarity index 100% rename from src/test/ui/issue-16966.rs rename to src/test/ui/issues/issue-16966.rs diff --git a/src/test/ui/issue-16966.stderr b/src/test/ui/issues/issue-16966.stderr similarity index 100% rename from src/test/ui/issue-16966.stderr rename to src/test/ui/issues/issue-16966.stderr diff --git a/src/test/ui/issue-1697.rs b/src/test/ui/issues/issue-1697.rs similarity index 100% rename from src/test/ui/issue-1697.rs rename to src/test/ui/issues/issue-1697.rs diff --git a/src/test/ui/issue-1697.stderr b/src/test/ui/issues/issue-1697.stderr similarity index 100% rename from src/test/ui/issue-1697.stderr rename to src/test/ui/issues/issue-1697.stderr diff --git a/src/test/ui/issue-16994.rs b/src/test/ui/issues/issue-16994.rs similarity index 100% rename from src/test/ui/issue-16994.rs rename to src/test/ui/issues/issue-16994.rs diff --git a/src/test/ui/issue-16994.stderr b/src/test/ui/issues/issue-16994.stderr similarity index 100% rename from src/test/ui/issue-16994.stderr rename to src/test/ui/issues/issue-16994.stderr diff --git a/src/test/ui/issue-17001.rs b/src/test/ui/issues/issue-17001.rs similarity index 100% rename from src/test/ui/issue-17001.rs rename to src/test/ui/issues/issue-17001.rs diff --git a/src/test/ui/issue-17001.stderr b/src/test/ui/issues/issue-17001.stderr similarity index 100% rename from src/test/ui/issue-17001.stderr rename to src/test/ui/issues/issue-17001.stderr diff --git a/src/test/ui/issue-17025.rs b/src/test/ui/issues/issue-17025.rs similarity index 100% rename from src/test/ui/issue-17025.rs rename to src/test/ui/issues/issue-17025.rs diff --git a/src/test/ui/issue-17033.rs b/src/test/ui/issues/issue-17033.rs similarity index 100% rename from src/test/ui/issue-17033.rs rename to src/test/ui/issues/issue-17033.rs diff --git a/src/test/ui/issue-17033.stderr b/src/test/ui/issues/issue-17033.stderr similarity index 100% rename from src/test/ui/issue-17033.stderr rename to src/test/ui/issues/issue-17033.stderr diff --git a/src/test/ui/issue-17252.rs b/src/test/ui/issues/issue-17252.rs similarity index 100% rename from src/test/ui/issue-17252.rs rename to src/test/ui/issues/issue-17252.rs diff --git a/src/test/ui/issue-17252.stderr b/src/test/ui/issues/issue-17252.stderr similarity index 100% rename from src/test/ui/issue-17252.stderr rename to src/test/ui/issues/issue-17252.stderr diff --git a/src/test/ui/issue-17263.nll.stderr b/src/test/ui/issues/issue-17263.nll.stderr similarity index 100% rename from src/test/ui/issue-17263.nll.stderr rename to src/test/ui/issues/issue-17263.nll.stderr diff --git a/src/test/ui/issue-17263.rs b/src/test/ui/issues/issue-17263.rs similarity index 100% rename from src/test/ui/issue-17263.rs rename to src/test/ui/issues/issue-17263.rs diff --git a/src/test/ui/issue-17263.stderr b/src/test/ui/issues/issue-17263.stderr similarity index 100% rename from src/test/ui/issue-17263.stderr rename to src/test/ui/issues/issue-17263.stderr diff --git a/src/test/ui/issue-17337.rs b/src/test/ui/issues/issue-17337.rs similarity index 100% rename from src/test/ui/issue-17337.rs rename to src/test/ui/issues/issue-17337.rs diff --git a/src/test/ui/issue-17337.stderr b/src/test/ui/issues/issue-17337.stderr similarity index 100% rename from src/test/ui/issue-17337.stderr rename to src/test/ui/issues/issue-17337.stderr diff --git a/src/test/ui/issue-17373.rs b/src/test/ui/issues/issue-17373.rs similarity index 100% rename from src/test/ui/issue-17373.rs rename to src/test/ui/issues/issue-17373.rs diff --git a/src/test/ui/issue-17373.stderr b/src/test/ui/issues/issue-17373.stderr similarity index 100% rename from src/test/ui/issue-17373.stderr rename to src/test/ui/issues/issue-17373.stderr diff --git a/src/test/ui/issue-17385.nll.stderr b/src/test/ui/issues/issue-17385.nll.stderr similarity index 100% rename from src/test/ui/issue-17385.nll.stderr rename to src/test/ui/issues/issue-17385.nll.stderr diff --git a/src/test/ui/issue-17385.rs b/src/test/ui/issues/issue-17385.rs similarity index 100% rename from src/test/ui/issue-17385.rs rename to src/test/ui/issues/issue-17385.rs diff --git a/src/test/ui/issue-17385.stderr b/src/test/ui/issues/issue-17385.stderr similarity index 100% rename from src/test/ui/issue-17385.stderr rename to src/test/ui/issues/issue-17385.stderr diff --git a/src/test/ui/issue-17405.rs b/src/test/ui/issues/issue-17405.rs similarity index 100% rename from src/test/ui/issue-17405.rs rename to src/test/ui/issues/issue-17405.rs diff --git a/src/test/ui/issue-17405.stderr b/src/test/ui/issues/issue-17405.stderr similarity index 100% rename from src/test/ui/issue-17405.stderr rename to src/test/ui/issues/issue-17405.stderr diff --git a/src/test/ui/issue-17431-1.rs b/src/test/ui/issues/issue-17431-1.rs similarity index 100% rename from src/test/ui/issue-17431-1.rs rename to src/test/ui/issues/issue-17431-1.rs diff --git a/src/test/ui/issue-17431-1.stderr b/src/test/ui/issues/issue-17431-1.stderr similarity index 100% rename from src/test/ui/issue-17431-1.stderr rename to src/test/ui/issues/issue-17431-1.stderr diff --git a/src/test/ui/issue-17431-2.rs b/src/test/ui/issues/issue-17431-2.rs similarity index 100% rename from src/test/ui/issue-17431-2.rs rename to src/test/ui/issues/issue-17431-2.rs diff --git a/src/test/ui/issue-17431-2.stderr b/src/test/ui/issues/issue-17431-2.stderr similarity index 100% rename from src/test/ui/issue-17431-2.stderr rename to src/test/ui/issues/issue-17431-2.stderr diff --git a/src/test/ui/issue-17431-3.rs b/src/test/ui/issues/issue-17431-3.rs similarity index 100% rename from src/test/ui/issue-17431-3.rs rename to src/test/ui/issues/issue-17431-3.rs diff --git a/src/test/ui/issue-17431-3.stderr b/src/test/ui/issues/issue-17431-3.stderr similarity index 100% rename from src/test/ui/issue-17431-3.stderr rename to src/test/ui/issues/issue-17431-3.stderr diff --git a/src/test/ui/issue-17431-4.rs b/src/test/ui/issues/issue-17431-4.rs similarity index 100% rename from src/test/ui/issue-17431-4.rs rename to src/test/ui/issues/issue-17431-4.rs diff --git a/src/test/ui/issue-17431-4.stderr b/src/test/ui/issues/issue-17431-4.stderr similarity index 100% rename from src/test/ui/issue-17431-4.stderr rename to src/test/ui/issues/issue-17431-4.stderr diff --git a/src/test/ui/issue-17431-5.rs b/src/test/ui/issues/issue-17431-5.rs similarity index 100% rename from src/test/ui/issue-17431-5.rs rename to src/test/ui/issues/issue-17431-5.rs diff --git a/src/test/ui/issue-17431-5.stderr b/src/test/ui/issues/issue-17431-5.stderr similarity index 100% rename from src/test/ui/issue-17431-5.stderr rename to src/test/ui/issues/issue-17431-5.stderr diff --git a/src/test/ui/issue-17431-6.rs b/src/test/ui/issues/issue-17431-6.rs similarity index 100% rename from src/test/ui/issue-17431-6.rs rename to src/test/ui/issues/issue-17431-6.rs diff --git a/src/test/ui/issue-17431-6.stderr b/src/test/ui/issues/issue-17431-6.stderr similarity index 100% rename from src/test/ui/issue-17431-6.stderr rename to src/test/ui/issues/issue-17431-6.stderr diff --git a/src/test/ui/issue-17431-7.rs b/src/test/ui/issues/issue-17431-7.rs similarity index 100% rename from src/test/ui/issue-17431-7.rs rename to src/test/ui/issues/issue-17431-7.rs diff --git a/src/test/ui/issue-17431-7.stderr b/src/test/ui/issues/issue-17431-7.stderr similarity index 100% rename from src/test/ui/issue-17431-7.stderr rename to src/test/ui/issues/issue-17431-7.stderr diff --git a/src/test/ui/issue-17441.rs b/src/test/ui/issues/issue-17441.rs similarity index 100% rename from src/test/ui/issue-17441.rs rename to src/test/ui/issues/issue-17441.rs diff --git a/src/test/ui/issue-17441.stderr b/src/test/ui/issues/issue-17441.stderr similarity index 100% rename from src/test/ui/issue-17441.stderr rename to src/test/ui/issues/issue-17441.stderr diff --git a/src/test/ui/issue-17444.rs b/src/test/ui/issues/issue-17444.rs similarity index 100% rename from src/test/ui/issue-17444.rs rename to src/test/ui/issues/issue-17444.rs diff --git a/src/test/ui/issue-17444.stderr b/src/test/ui/issues/issue-17444.stderr similarity index 100% rename from src/test/ui/issue-17444.stderr rename to src/test/ui/issues/issue-17444.stderr diff --git a/src/test/ui/issue-17458.rs b/src/test/ui/issues/issue-17458.rs similarity index 100% rename from src/test/ui/issue-17458.rs rename to src/test/ui/issues/issue-17458.rs diff --git a/src/test/ui/issue-17458.stderr b/src/test/ui/issues/issue-17458.stderr similarity index 100% rename from src/test/ui/issue-17458.stderr rename to src/test/ui/issues/issue-17458.stderr diff --git a/src/test/ui/issue-17545.nll.stderr b/src/test/ui/issues/issue-17545.nll.stderr similarity index 100% rename from src/test/ui/issue-17545.nll.stderr rename to src/test/ui/issues/issue-17545.nll.stderr diff --git a/src/test/ui/issue-17545.rs b/src/test/ui/issues/issue-17545.rs similarity index 100% rename from src/test/ui/issue-17545.rs rename to src/test/ui/issues/issue-17545.rs diff --git a/src/test/ui/issue-17545.stderr b/src/test/ui/issues/issue-17545.stderr similarity index 100% rename from src/test/ui/issue-17545.stderr rename to src/test/ui/issues/issue-17545.stderr diff --git a/src/test/ui/issue-17546.rs b/src/test/ui/issues/issue-17546.rs similarity index 100% rename from src/test/ui/issue-17546.rs rename to src/test/ui/issues/issue-17546.rs diff --git a/src/test/ui/issue-17546.stderr b/src/test/ui/issues/issue-17546.stderr similarity index 100% rename from src/test/ui/issue-17546.stderr rename to src/test/ui/issues/issue-17546.stderr diff --git a/src/test/ui/issue-17551.rs b/src/test/ui/issues/issue-17551.rs similarity index 100% rename from src/test/ui/issue-17551.rs rename to src/test/ui/issues/issue-17551.rs diff --git a/src/test/ui/issue-17551.stderr b/src/test/ui/issues/issue-17551.stderr similarity index 100% rename from src/test/ui/issue-17551.stderr rename to src/test/ui/issues/issue-17551.stderr diff --git a/src/test/ui/issue-17651.rs b/src/test/ui/issues/issue-17651.rs similarity index 100% rename from src/test/ui/issue-17651.rs rename to src/test/ui/issues/issue-17651.rs diff --git a/src/test/ui/issue-17651.stderr b/src/test/ui/issues/issue-17651.stderr similarity index 100% rename from src/test/ui/issue-17651.stderr rename to src/test/ui/issues/issue-17651.stderr diff --git a/src/test/ui/issue-17718-const-bad-values.rs b/src/test/ui/issues/issue-17718-const-bad-values.rs similarity index 100% rename from src/test/ui/issue-17718-const-bad-values.rs rename to src/test/ui/issues/issue-17718-const-bad-values.rs diff --git a/src/test/ui/issue-17718-const-bad-values.stderr b/src/test/ui/issues/issue-17718-const-bad-values.stderr similarity index 100% rename from src/test/ui/issue-17718-const-bad-values.stderr rename to src/test/ui/issues/issue-17718-const-bad-values.stderr diff --git a/src/test/ui/issue-17718-const-borrow.rs b/src/test/ui/issues/issue-17718-const-borrow.rs similarity index 100% rename from src/test/ui/issue-17718-const-borrow.rs rename to src/test/ui/issues/issue-17718-const-borrow.rs diff --git a/src/test/ui/issue-17718-const-borrow.stderr b/src/test/ui/issues/issue-17718-const-borrow.stderr similarity index 100% rename from src/test/ui/issue-17718-const-borrow.stderr rename to src/test/ui/issues/issue-17718-const-borrow.stderr diff --git a/src/test/ui/issue-17718-const-naming.rs b/src/test/ui/issues/issue-17718-const-naming.rs similarity index 100% rename from src/test/ui/issue-17718-const-naming.rs rename to src/test/ui/issues/issue-17718-const-naming.rs diff --git a/src/test/ui/issue-17718-const-naming.stderr b/src/test/ui/issues/issue-17718-const-naming.stderr similarity index 100% rename from src/test/ui/issue-17718-const-naming.stderr rename to src/test/ui/issues/issue-17718-const-naming.stderr diff --git a/src/test/ui/compile-fail-migration/issue-17718-const-privacy.rs b/src/test/ui/issues/issue-17718-const-privacy.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-17718-const-privacy.rs rename to src/test/ui/issues/issue-17718-const-privacy.rs diff --git a/src/test/ui/compile-fail-migration/issue-17718-const-privacy.stderr b/src/test/ui/issues/issue-17718-const-privacy.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-17718-const-privacy.stderr rename to src/test/ui/issues/issue-17718-const-privacy.stderr diff --git a/src/test/ui/issue-17718-constants-not-static.rs b/src/test/ui/issues/issue-17718-constants-not-static.rs similarity index 100% rename from src/test/ui/issue-17718-constants-not-static.rs rename to src/test/ui/issues/issue-17718-constants-not-static.rs diff --git a/src/test/ui/issue-17718-constants-not-static.stderr b/src/test/ui/issues/issue-17718-constants-not-static.stderr similarity index 100% rename from src/test/ui/issue-17718-constants-not-static.stderr rename to src/test/ui/issues/issue-17718-constants-not-static.stderr diff --git a/src/test/ui/issue-17718-patterns.rs b/src/test/ui/issues/issue-17718-patterns.rs similarity index 100% rename from src/test/ui/issue-17718-patterns.rs rename to src/test/ui/issues/issue-17718-patterns.rs diff --git a/src/test/ui/issue-17718-patterns.stderr b/src/test/ui/issues/issue-17718-patterns.stderr similarity index 100% rename from src/test/ui/issue-17718-patterns.stderr rename to src/test/ui/issues/issue-17718-patterns.stderr diff --git a/src/test/ui/issue-17718-references.rs b/src/test/ui/issues/issue-17718-references.rs similarity index 100% rename from src/test/ui/issue-17718-references.rs rename to src/test/ui/issues/issue-17718-references.rs diff --git a/src/test/ui/issue-17718-references.stderr b/src/test/ui/issues/issue-17718-references.stderr similarity index 100% rename from src/test/ui/issue-17718-references.stderr rename to src/test/ui/issues/issue-17718-references.stderr diff --git a/src/test/ui/issue-17718-static-move.rs b/src/test/ui/issues/issue-17718-static-move.rs similarity index 100% rename from src/test/ui/issue-17718-static-move.rs rename to src/test/ui/issues/issue-17718-static-move.rs diff --git a/src/test/ui/issue-17718-static-move.stderr b/src/test/ui/issues/issue-17718-static-move.stderr similarity index 100% rename from src/test/ui/issue-17718-static-move.stderr rename to src/test/ui/issues/issue-17718-static-move.stderr diff --git a/src/test/ui/issue-17718-static-sync.rs b/src/test/ui/issues/issue-17718-static-sync.rs similarity index 100% rename from src/test/ui/issue-17718-static-sync.rs rename to src/test/ui/issues/issue-17718-static-sync.rs diff --git a/src/test/ui/issue-17718-static-sync.stderr b/src/test/ui/issues/issue-17718-static-sync.stderr similarity index 100% rename from src/test/ui/issue-17718-static-sync.stderr rename to src/test/ui/issues/issue-17718-static-sync.stderr diff --git a/src/test/ui/issue-17728.nll.stderr b/src/test/ui/issues/issue-17728.nll.stderr similarity index 100% rename from src/test/ui/issue-17728.nll.stderr rename to src/test/ui/issues/issue-17728.nll.stderr diff --git a/src/test/ui/issue-17728.rs b/src/test/ui/issues/issue-17728.rs similarity index 100% rename from src/test/ui/issue-17728.rs rename to src/test/ui/issues/issue-17728.rs diff --git a/src/test/ui/issue-17728.stderr b/src/test/ui/issues/issue-17728.stderr similarity index 100% rename from src/test/ui/issue-17728.stderr rename to src/test/ui/issues/issue-17728.stderr diff --git a/src/test/ui/issue-17740.rs b/src/test/ui/issues/issue-17740.rs similarity index 100% rename from src/test/ui/issue-17740.rs rename to src/test/ui/issues/issue-17740.rs diff --git a/src/test/ui/issue-17740.stderr b/src/test/ui/issues/issue-17740.stderr similarity index 100% rename from src/test/ui/issue-17740.stderr rename to src/test/ui/issues/issue-17740.stderr diff --git a/src/test/ui/issue-17758.nll.stderr b/src/test/ui/issues/issue-17758.nll.stderr similarity index 100% rename from src/test/ui/issue-17758.nll.stderr rename to src/test/ui/issues/issue-17758.nll.stderr diff --git a/src/test/ui/issue-17758.rs b/src/test/ui/issues/issue-17758.rs similarity index 100% rename from src/test/ui/issue-17758.rs rename to src/test/ui/issues/issue-17758.rs diff --git a/src/test/ui/issue-17758.stderr b/src/test/ui/issues/issue-17758.stderr similarity index 100% rename from src/test/ui/issue-17758.stderr rename to src/test/ui/issues/issue-17758.stderr diff --git a/src/test/ui/issue-17800.rs b/src/test/ui/issues/issue-17800.rs similarity index 100% rename from src/test/ui/issue-17800.rs rename to src/test/ui/issues/issue-17800.rs diff --git a/src/test/ui/issue-17800.stderr b/src/test/ui/issues/issue-17800.stderr similarity index 100% rename from src/test/ui/issue-17800.stderr rename to src/test/ui/issues/issue-17800.stderr diff --git a/src/test/ui/issue-17904-2.rs b/src/test/ui/issues/issue-17904-2.rs similarity index 100% rename from src/test/ui/issue-17904-2.rs rename to src/test/ui/issues/issue-17904-2.rs diff --git a/src/test/ui/issue-17904-2.stderr b/src/test/ui/issues/issue-17904-2.stderr similarity index 100% rename from src/test/ui/issue-17904-2.stderr rename to src/test/ui/issues/issue-17904-2.stderr diff --git a/src/test/ui/issue-17905.rs b/src/test/ui/issues/issue-17905.rs similarity index 100% rename from src/test/ui/issue-17905.rs rename to src/test/ui/issues/issue-17905.rs diff --git a/src/test/ui/issue-17905.stderr b/src/test/ui/issues/issue-17905.stderr similarity index 100% rename from src/test/ui/issue-17905.stderr rename to src/test/ui/issues/issue-17905.stderr diff --git a/src/test/ui/compile-fail-migration/issue-17913.rs b/src/test/ui/issues/issue-17913.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-17913.rs rename to src/test/ui/issues/issue-17913.rs diff --git a/src/test/ui/compile-fail-migration/issue-17913.stderr b/src/test/ui/issues/issue-17913.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-17913.stderr rename to src/test/ui/issues/issue-17913.stderr diff --git a/src/test/ui/issue-17933.rs b/src/test/ui/issues/issue-17933.rs similarity index 100% rename from src/test/ui/issue-17933.rs rename to src/test/ui/issues/issue-17933.rs diff --git a/src/test/ui/issue-17933.stderr b/src/test/ui/issues/issue-17933.stderr similarity index 100% rename from src/test/ui/issue-17933.stderr rename to src/test/ui/issues/issue-17933.stderr diff --git a/src/test/ui/issue-17954.nll.stderr b/src/test/ui/issues/issue-17954.nll.stderr similarity index 100% rename from src/test/ui/issue-17954.nll.stderr rename to src/test/ui/issues/issue-17954.nll.stderr diff --git a/src/test/ui/issue-17954.rs b/src/test/ui/issues/issue-17954.rs similarity index 100% rename from src/test/ui/issue-17954.rs rename to src/test/ui/issues/issue-17954.rs diff --git a/src/test/ui/issue-17954.stderr b/src/test/ui/issues/issue-17954.stderr similarity index 100% rename from src/test/ui/issue-17954.stderr rename to src/test/ui/issues/issue-17954.stderr diff --git a/src/test/ui/issue-17959.rs b/src/test/ui/issues/issue-17959.rs similarity index 100% rename from src/test/ui/issue-17959.rs rename to src/test/ui/issues/issue-17959.rs diff --git a/src/test/ui/issue-17959.stderr b/src/test/ui/issues/issue-17959.stderr similarity index 100% rename from src/test/ui/issue-17959.stderr rename to src/test/ui/issues/issue-17959.stderr diff --git a/src/test/ui/issue-17994.rs b/src/test/ui/issues/issue-17994.rs similarity index 100% rename from src/test/ui/issue-17994.rs rename to src/test/ui/issues/issue-17994.rs diff --git a/src/test/ui/issue-17994.stderr b/src/test/ui/issues/issue-17994.stderr similarity index 100% rename from src/test/ui/issue-17994.stderr rename to src/test/ui/issues/issue-17994.stderr diff --git a/src/test/ui/issue-17999.rs b/src/test/ui/issues/issue-17999.rs similarity index 100% rename from src/test/ui/issue-17999.rs rename to src/test/ui/issues/issue-17999.rs diff --git a/src/test/ui/issue-17999.stderr b/src/test/ui/issues/issue-17999.stderr similarity index 100% rename from src/test/ui/issue-17999.stderr rename to src/test/ui/issues/issue-17999.stderr diff --git a/src/test/ui/issue-18058.rs b/src/test/ui/issues/issue-18058.rs similarity index 100% rename from src/test/ui/issue-18058.rs rename to src/test/ui/issues/issue-18058.rs diff --git a/src/test/ui/issue-18058.stderr b/src/test/ui/issues/issue-18058.stderr similarity index 100% rename from src/test/ui/issue-18058.stderr rename to src/test/ui/issues/issue-18058.stderr diff --git a/src/test/ui/issue-18107.rs b/src/test/ui/issues/issue-18107.rs similarity index 100% rename from src/test/ui/issue-18107.rs rename to src/test/ui/issues/issue-18107.rs diff --git a/src/test/ui/issue-18107.stderr b/src/test/ui/issues/issue-18107.stderr similarity index 100% rename from src/test/ui/issue-18107.stderr rename to src/test/ui/issues/issue-18107.stderr diff --git a/src/test/ui/issue-18118-2.rs b/src/test/ui/issues/issue-18118-2.rs similarity index 100% rename from src/test/ui/issue-18118-2.rs rename to src/test/ui/issues/issue-18118-2.rs diff --git a/src/test/ui/issue-18118-2.stderr b/src/test/ui/issues/issue-18118-2.stderr similarity index 100% rename from src/test/ui/issue-18118-2.stderr rename to src/test/ui/issues/issue-18118-2.stderr diff --git a/src/test/ui/issue-18118.nll.stderr b/src/test/ui/issues/issue-18118.nll.stderr similarity index 100% rename from src/test/ui/issue-18118.nll.stderr rename to src/test/ui/issues/issue-18118.nll.stderr diff --git a/src/test/ui/issue-18118.rs b/src/test/ui/issues/issue-18118.rs similarity index 100% rename from src/test/ui/issue-18118.rs rename to src/test/ui/issues/issue-18118.rs diff --git a/src/test/ui/issue-18118.stderr b/src/test/ui/issues/issue-18118.stderr similarity index 100% rename from src/test/ui/issue-18118.stderr rename to src/test/ui/issues/issue-18118.stderr diff --git a/src/test/ui/issue-18119.rs b/src/test/ui/issues/issue-18119.rs similarity index 100% rename from src/test/ui/issue-18119.rs rename to src/test/ui/issues/issue-18119.rs diff --git a/src/test/ui/issue-18119.stderr b/src/test/ui/issues/issue-18119.stderr similarity index 100% rename from src/test/ui/issue-18119.stderr rename to src/test/ui/issues/issue-18119.stderr diff --git a/src/test/ui/issue-18159.rs b/src/test/ui/issues/issue-18159.rs similarity index 100% rename from src/test/ui/issue-18159.rs rename to src/test/ui/issues/issue-18159.rs diff --git a/src/test/ui/issue-18159.stderr b/src/test/ui/issues/issue-18159.stderr similarity index 100% rename from src/test/ui/issue-18159.stderr rename to src/test/ui/issues/issue-18159.stderr diff --git a/src/test/ui/issue-18183.rs b/src/test/ui/issues/issue-18183.rs similarity index 100% rename from src/test/ui/issue-18183.rs rename to src/test/ui/issues/issue-18183.rs diff --git a/src/test/ui/issue-18183.stderr b/src/test/ui/issues/issue-18183.stderr similarity index 100% rename from src/test/ui/issue-18183.stderr rename to src/test/ui/issues/issue-18183.stderr diff --git a/src/test/ui/issue-18294.rs b/src/test/ui/issues/issue-18294.rs similarity index 100% rename from src/test/ui/issue-18294.rs rename to src/test/ui/issues/issue-18294.rs diff --git a/src/test/ui/issue-18294.stderr b/src/test/ui/issues/issue-18294.stderr similarity index 100% rename from src/test/ui/issue-18294.stderr rename to src/test/ui/issues/issue-18294.stderr diff --git a/src/test/ui/issue-18389.rs b/src/test/ui/issues/issue-18389.rs similarity index 100% rename from src/test/ui/issue-18389.rs rename to src/test/ui/issues/issue-18389.rs diff --git a/src/test/ui/issue-18389.stderr b/src/test/ui/issues/issue-18389.stderr similarity index 100% rename from src/test/ui/issue-18389.stderr rename to src/test/ui/issues/issue-18389.stderr diff --git a/src/test/ui/issue-18400.rs b/src/test/ui/issues/issue-18400.rs similarity index 100% rename from src/test/ui/issue-18400.rs rename to src/test/ui/issues/issue-18400.rs diff --git a/src/test/ui/issue-18400.stderr b/src/test/ui/issues/issue-18400.stderr similarity index 100% rename from src/test/ui/issue-18400.stderr rename to src/test/ui/issues/issue-18400.stderr diff --git a/src/test/ui/issue-18423.rs b/src/test/ui/issues/issue-18423.rs similarity index 100% rename from src/test/ui/issue-18423.rs rename to src/test/ui/issues/issue-18423.rs diff --git a/src/test/ui/issue-18423.stderr b/src/test/ui/issues/issue-18423.stderr similarity index 100% rename from src/test/ui/issue-18423.stderr rename to src/test/ui/issues/issue-18423.stderr diff --git a/src/test/ui/issue-18446.rs b/src/test/ui/issues/issue-18446.rs similarity index 100% rename from src/test/ui/issue-18446.rs rename to src/test/ui/issues/issue-18446.rs diff --git a/src/test/ui/issue-18446.stderr b/src/test/ui/issues/issue-18446.stderr similarity index 100% rename from src/test/ui/issue-18446.stderr rename to src/test/ui/issues/issue-18446.stderr diff --git a/src/test/ui/issue-18532.rs b/src/test/ui/issues/issue-18532.rs similarity index 100% rename from src/test/ui/issue-18532.rs rename to src/test/ui/issues/issue-18532.rs diff --git a/src/test/ui/issue-18532.stderr b/src/test/ui/issues/issue-18532.stderr similarity index 100% rename from src/test/ui/issue-18532.stderr rename to src/test/ui/issues/issue-18532.stderr diff --git a/src/test/ui/issue-18566.nll.stderr b/src/test/ui/issues/issue-18566.nll.stderr similarity index 100% rename from src/test/ui/issue-18566.nll.stderr rename to src/test/ui/issues/issue-18566.nll.stderr diff --git a/src/test/ui/issue-18566.rs b/src/test/ui/issues/issue-18566.rs similarity index 100% rename from src/test/ui/issue-18566.rs rename to src/test/ui/issues/issue-18566.rs diff --git a/src/test/ui/issue-18566.stderr b/src/test/ui/issues/issue-18566.stderr similarity index 100% rename from src/test/ui/issue-18566.stderr rename to src/test/ui/issues/issue-18566.stderr diff --git a/src/test/ui/issue-18611.rs b/src/test/ui/issues/issue-18611.rs similarity index 100% rename from src/test/ui/issue-18611.rs rename to src/test/ui/issues/issue-18611.rs diff --git a/src/test/ui/issue-18611.stderr b/src/test/ui/issues/issue-18611.stderr similarity index 100% rename from src/test/ui/issue-18611.stderr rename to src/test/ui/issues/issue-18611.stderr diff --git a/src/test/ui/issue-1871.rs b/src/test/ui/issues/issue-1871.rs similarity index 100% rename from src/test/ui/issue-1871.rs rename to src/test/ui/issues/issue-1871.rs diff --git a/src/test/ui/issue-1871.stderr b/src/test/ui/issues/issue-1871.stderr similarity index 100% rename from src/test/ui/issue-1871.stderr rename to src/test/ui/issues/issue-1871.stderr diff --git a/src/test/ui/issue-18783.nll.stderr b/src/test/ui/issues/issue-18783.nll.stderr similarity index 100% rename from src/test/ui/issue-18783.nll.stderr rename to src/test/ui/issues/issue-18783.nll.stderr diff --git a/src/test/ui/issue-18783.rs b/src/test/ui/issues/issue-18783.rs similarity index 100% rename from src/test/ui/issue-18783.rs rename to src/test/ui/issues/issue-18783.rs diff --git a/src/test/ui/issue-18783.stderr b/src/test/ui/issues/issue-18783.stderr similarity index 100% rename from src/test/ui/issue-18783.stderr rename to src/test/ui/issues/issue-18783.stderr diff --git a/src/test/ui/issue-18819.rs b/src/test/ui/issues/issue-18819.rs similarity index 100% rename from src/test/ui/issue-18819.rs rename to src/test/ui/issues/issue-18819.rs diff --git a/src/test/ui/issue-18819.stderr b/src/test/ui/issues/issue-18819.stderr similarity index 100% rename from src/test/ui/issue-18819.stderr rename to src/test/ui/issues/issue-18819.stderr diff --git a/src/test/ui/issue-18919.rs b/src/test/ui/issues/issue-18919.rs similarity index 100% rename from src/test/ui/issue-18919.rs rename to src/test/ui/issues/issue-18919.rs diff --git a/src/test/ui/issue-18919.stderr b/src/test/ui/issues/issue-18919.stderr similarity index 100% rename from src/test/ui/issue-18919.stderr rename to src/test/ui/issues/issue-18919.stderr diff --git a/src/test/ui/issue-18937.rs b/src/test/ui/issues/issue-18937.rs similarity index 100% rename from src/test/ui/issue-18937.rs rename to src/test/ui/issues/issue-18937.rs diff --git a/src/test/ui/issue-18937.stderr b/src/test/ui/issues/issue-18937.stderr similarity index 100% rename from src/test/ui/issue-18937.stderr rename to src/test/ui/issues/issue-18937.stderr diff --git a/src/test/ui/issue-18959.rs b/src/test/ui/issues/issue-18959.rs similarity index 100% rename from src/test/ui/issue-18959.rs rename to src/test/ui/issues/issue-18959.rs diff --git a/src/test/ui/issue-18959.stderr b/src/test/ui/issues/issue-18959.stderr similarity index 100% rename from src/test/ui/issue-18959.stderr rename to src/test/ui/issues/issue-18959.stderr diff --git a/src/test/ui/issue-1900.rs b/src/test/ui/issues/issue-1900.rs similarity index 100% rename from src/test/ui/issue-1900.rs rename to src/test/ui/issues/issue-1900.rs diff --git a/src/test/ui/issue-1900.stderr b/src/test/ui/issues/issue-1900.stderr similarity index 100% rename from src/test/ui/issue-1900.stderr rename to src/test/ui/issues/issue-1900.stderr diff --git a/src/test/ui/issue-19086.rs b/src/test/ui/issues/issue-19086.rs similarity index 100% rename from src/test/ui/issue-19086.rs rename to src/test/ui/issues/issue-19086.rs diff --git a/src/test/ui/issue-19086.stderr b/src/test/ui/issues/issue-19086.stderr similarity index 100% rename from src/test/ui/issue-19086.stderr rename to src/test/ui/issues/issue-19086.stderr diff --git a/src/test/ui/issue-19100.fixed b/src/test/ui/issues/issue-19100.fixed similarity index 100% rename from src/test/ui/issue-19100.fixed rename to src/test/ui/issues/issue-19100.fixed diff --git a/src/test/ui/issue-19100.rs b/src/test/ui/issues/issue-19100.rs similarity index 100% rename from src/test/ui/issue-19100.rs rename to src/test/ui/issues/issue-19100.rs diff --git a/src/test/ui/issue-19100.stderr b/src/test/ui/issues/issue-19100.stderr similarity index 100% rename from src/test/ui/issue-19100.stderr rename to src/test/ui/issues/issue-19100.stderr diff --git a/src/test/ui/compile-fail-migration/issue-19163.nll.stderr b/src/test/ui/issues/issue-19163.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-19163.nll.stderr rename to src/test/ui/issues/issue-19163.nll.stderr diff --git a/src/test/ui/compile-fail-migration/issue-19163.rs b/src/test/ui/issues/issue-19163.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-19163.rs rename to src/test/ui/issues/issue-19163.rs diff --git a/src/test/ui/compile-fail-migration/issue-19163.stderr b/src/test/ui/issues/issue-19163.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-19163.stderr rename to src/test/ui/issues/issue-19163.stderr diff --git a/src/test/ui/compile-fail-migration/issue-1920-1.rs b/src/test/ui/issues/issue-1920-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-1920-1.rs rename to src/test/ui/issues/issue-1920-1.rs diff --git a/src/test/ui/compile-fail-migration/issue-1920-1.stderr b/src/test/ui/issues/issue-1920-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-1920-1.stderr rename to src/test/ui/issues/issue-1920-1.stderr diff --git a/src/test/ui/compile-fail-migration/issue-1920-2.rs b/src/test/ui/issues/issue-1920-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-1920-2.rs rename to src/test/ui/issues/issue-1920-2.rs diff --git a/src/test/ui/compile-fail-migration/issue-1920-2.stderr b/src/test/ui/issues/issue-1920-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-1920-2.stderr rename to src/test/ui/issues/issue-1920-2.stderr diff --git a/src/test/ui/compile-fail-migration/issue-1920-3.rs b/src/test/ui/issues/issue-1920-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-1920-3.rs rename to src/test/ui/issues/issue-1920-3.rs diff --git a/src/test/ui/compile-fail-migration/issue-1920-3.stderr b/src/test/ui/issues/issue-1920-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-1920-3.stderr rename to src/test/ui/issues/issue-1920-3.stderr diff --git a/src/test/ui/issue-19244-1.rs b/src/test/ui/issues/issue-19244-1.rs similarity index 100% rename from src/test/ui/issue-19244-1.rs rename to src/test/ui/issues/issue-19244-1.rs diff --git a/src/test/ui/issue-19244-1.stderr b/src/test/ui/issues/issue-19244-1.stderr similarity index 100% rename from src/test/ui/issue-19244-1.stderr rename to src/test/ui/issues/issue-19244-1.stderr diff --git a/src/test/ui/issue-19244-2.rs b/src/test/ui/issues/issue-19244-2.rs similarity index 100% rename from src/test/ui/issue-19244-2.rs rename to src/test/ui/issues/issue-19244-2.rs diff --git a/src/test/ui/issue-19244-2.stderr b/src/test/ui/issues/issue-19244-2.stderr similarity index 100% rename from src/test/ui/issue-19244-2.stderr rename to src/test/ui/issues/issue-19244-2.stderr diff --git a/src/test/ui/issue-19380.rs b/src/test/ui/issues/issue-19380.rs similarity index 100% rename from src/test/ui/issue-19380.rs rename to src/test/ui/issues/issue-19380.rs diff --git a/src/test/ui/issue-19380.stderr b/src/test/ui/issues/issue-19380.stderr similarity index 100% rename from src/test/ui/issue-19380.stderr rename to src/test/ui/issues/issue-19380.stderr diff --git a/src/test/ui/issue-19482.rs b/src/test/ui/issues/issue-19482.rs similarity index 100% rename from src/test/ui/issue-19482.rs rename to src/test/ui/issues/issue-19482.rs diff --git a/src/test/ui/issue-19482.stderr b/src/test/ui/issues/issue-19482.stderr similarity index 100% rename from src/test/ui/issue-19482.stderr rename to src/test/ui/issues/issue-19482.stderr diff --git a/src/test/ui/issue-19498.rs b/src/test/ui/issues/issue-19498.rs similarity index 100% rename from src/test/ui/issue-19498.rs rename to src/test/ui/issues/issue-19498.rs diff --git a/src/test/ui/issue-19498.stderr b/src/test/ui/issues/issue-19498.stderr similarity index 100% rename from src/test/ui/issue-19498.stderr rename to src/test/ui/issues/issue-19498.stderr diff --git a/src/test/ui/issue-19521.rs b/src/test/ui/issues/issue-19521.rs similarity index 100% rename from src/test/ui/issue-19521.rs rename to src/test/ui/issues/issue-19521.rs diff --git a/src/test/ui/issue-19521.stderr b/src/test/ui/issues/issue-19521.stderr similarity index 100% rename from src/test/ui/issue-19521.stderr rename to src/test/ui/issues/issue-19521.stderr diff --git a/src/test/ui/issue-19538.rs b/src/test/ui/issues/issue-19538.rs similarity index 100% rename from src/test/ui/issue-19538.rs rename to src/test/ui/issues/issue-19538.rs diff --git a/src/test/ui/issue-19538.stderr b/src/test/ui/issues/issue-19538.stderr similarity index 100% rename from src/test/ui/issue-19538.stderr rename to src/test/ui/issues/issue-19538.stderr diff --git a/src/test/ui/issue-19601.rs b/src/test/ui/issues/issue-19601.rs similarity index 100% rename from src/test/ui/issue-19601.rs rename to src/test/ui/issues/issue-19601.rs diff --git a/src/test/ui/issue-19601.stderr b/src/test/ui/issues/issue-19601.stderr similarity index 100% rename from src/test/ui/issue-19601.stderr rename to src/test/ui/issues/issue-19601.stderr diff --git a/src/test/ui/issue-1962.rs b/src/test/ui/issues/issue-1962.rs similarity index 100% rename from src/test/ui/issue-1962.rs rename to src/test/ui/issues/issue-1962.rs diff --git a/src/test/ui/issue-1962.stderr b/src/test/ui/issues/issue-1962.stderr similarity index 100% rename from src/test/ui/issue-1962.stderr rename to src/test/ui/issues/issue-1962.stderr diff --git a/src/test/ui/issue-19660.rs b/src/test/ui/issues/issue-19660.rs similarity index 100% rename from src/test/ui/issue-19660.rs rename to src/test/ui/issues/issue-19660.rs diff --git a/src/test/ui/issue-19660.stderr b/src/test/ui/issues/issue-19660.stderr similarity index 100% rename from src/test/ui/issue-19660.stderr rename to src/test/ui/issues/issue-19660.stderr diff --git a/src/test/ui/issue-19692.rs b/src/test/ui/issues/issue-19692.rs similarity index 100% rename from src/test/ui/issue-19692.rs rename to src/test/ui/issues/issue-19692.rs diff --git a/src/test/ui/issue-19692.stderr b/src/test/ui/issues/issue-19692.stderr similarity index 100% rename from src/test/ui/issue-19692.stderr rename to src/test/ui/issues/issue-19692.stderr diff --git a/src/test/ui/issue-19707.rs b/src/test/ui/issues/issue-19707.rs similarity index 100% rename from src/test/ui/issue-19707.rs rename to src/test/ui/issues/issue-19707.rs diff --git a/src/test/ui/issue-19707.stderr b/src/test/ui/issues/issue-19707.stderr similarity index 100% rename from src/test/ui/issue-19707.stderr rename to src/test/ui/issues/issue-19707.stderr diff --git a/src/test/ui/issue-19734.rs b/src/test/ui/issues/issue-19734.rs similarity index 100% rename from src/test/ui/issue-19734.rs rename to src/test/ui/issues/issue-19734.rs diff --git a/src/test/ui/issue-19734.stderr b/src/test/ui/issues/issue-19734.stderr similarity index 100% rename from src/test/ui/issue-19734.stderr rename to src/test/ui/issues/issue-19734.stderr diff --git a/src/test/ui/issue-19883.rs b/src/test/ui/issues/issue-19883.rs similarity index 100% rename from src/test/ui/issue-19883.rs rename to src/test/ui/issues/issue-19883.rs diff --git a/src/test/ui/issue-19883.stderr b/src/test/ui/issues/issue-19883.stderr similarity index 100% rename from src/test/ui/issue-19883.stderr rename to src/test/ui/issues/issue-19883.stderr diff --git a/src/test/ui/issue-19922.rs b/src/test/ui/issues/issue-19922.rs similarity index 100% rename from src/test/ui/issue-19922.rs rename to src/test/ui/issues/issue-19922.rs diff --git a/src/test/ui/issue-19922.stderr b/src/test/ui/issues/issue-19922.stderr similarity index 100% rename from src/test/ui/issue-19922.stderr rename to src/test/ui/issues/issue-19922.stderr diff --git a/src/test/ui/issue-19982.rs b/src/test/ui/issues/issue-19982.rs similarity index 100% rename from src/test/ui/issue-19982.rs rename to src/test/ui/issues/issue-19982.rs diff --git a/src/test/ui/issue-19982.stderr b/src/test/ui/issues/issue-19982.stderr similarity index 100% rename from src/test/ui/issue-19982.stderr rename to src/test/ui/issues/issue-19982.stderr diff --git a/src/test/ui/issue-19991.rs b/src/test/ui/issues/issue-19991.rs similarity index 100% rename from src/test/ui/issue-19991.rs rename to src/test/ui/issues/issue-19991.rs diff --git a/src/test/ui/issue-19991.stderr b/src/test/ui/issues/issue-19991.stderr similarity index 100% rename from src/test/ui/issue-19991.stderr rename to src/test/ui/issues/issue-19991.stderr diff --git a/src/test/ui/issue-20005.rs b/src/test/ui/issues/issue-20005.rs similarity index 100% rename from src/test/ui/issue-20005.rs rename to src/test/ui/issues/issue-20005.rs diff --git a/src/test/ui/issue-20005.stderr b/src/test/ui/issues/issue-20005.stderr similarity index 100% rename from src/test/ui/issue-20005.stderr rename to src/test/ui/issues/issue-20005.stderr diff --git a/src/test/ui/issue-20162.rs b/src/test/ui/issues/issue-20162.rs similarity index 100% rename from src/test/ui/issue-20162.rs rename to src/test/ui/issues/issue-20162.rs diff --git a/src/test/ui/issue-20162.stderr b/src/test/ui/issues/issue-20162.stderr similarity index 100% rename from src/test/ui/issue-20162.stderr rename to src/test/ui/issues/issue-20162.stderr diff --git a/src/test/ui/issue-20225.rs b/src/test/ui/issues/issue-20225.rs similarity index 100% rename from src/test/ui/issue-20225.rs rename to src/test/ui/issues/issue-20225.rs diff --git a/src/test/ui/issue-20225.stderr b/src/test/ui/issues/issue-20225.stderr similarity index 100% rename from src/test/ui/issue-20225.stderr rename to src/test/ui/issues/issue-20225.stderr diff --git a/src/test/ui/issue-20261.rs b/src/test/ui/issues/issue-20261.rs similarity index 100% rename from src/test/ui/issue-20261.rs rename to src/test/ui/issues/issue-20261.rs diff --git a/src/test/ui/issue-20261.stderr b/src/test/ui/issues/issue-20261.stderr similarity index 100% rename from src/test/ui/issue-20261.stderr rename to src/test/ui/issues/issue-20261.stderr diff --git a/src/test/ui/issue-20313.rs b/src/test/ui/issues/issue-20313.rs similarity index 100% rename from src/test/ui/issue-20313.rs rename to src/test/ui/issues/issue-20313.rs diff --git a/src/test/ui/issue-20313.stderr b/src/test/ui/issues/issue-20313.stderr similarity index 100% rename from src/test/ui/issue-20313.stderr rename to src/test/ui/issues/issue-20313.stderr diff --git a/src/test/ui/issue-20413.rs b/src/test/ui/issues/issue-20413.rs similarity index 100% rename from src/test/ui/issue-20413.rs rename to src/test/ui/issues/issue-20413.rs diff --git a/src/test/ui/issue-20413.stderr b/src/test/ui/issues/issue-20413.stderr similarity index 100% rename from src/test/ui/issue-20413.stderr rename to src/test/ui/issues/issue-20413.stderr diff --git a/src/test/ui/issue-20433.rs b/src/test/ui/issues/issue-20433.rs similarity index 100% rename from src/test/ui/issue-20433.rs rename to src/test/ui/issues/issue-20433.rs diff --git a/src/test/ui/issue-20433.stderr b/src/test/ui/issues/issue-20433.stderr similarity index 100% rename from src/test/ui/issue-20433.stderr rename to src/test/ui/issues/issue-20433.stderr diff --git a/src/test/ui/issue-20605.rs b/src/test/ui/issues/issue-20605.rs similarity index 100% rename from src/test/ui/issue-20605.rs rename to src/test/ui/issues/issue-20605.rs diff --git a/src/test/ui/issue-20605.stderr b/src/test/ui/issues/issue-20605.stderr similarity index 100% rename from src/test/ui/issue-20605.stderr rename to src/test/ui/issues/issue-20605.stderr diff --git a/src/test/ui/issue-20616-1.rs b/src/test/ui/issues/issue-20616-1.rs similarity index 100% rename from src/test/ui/issue-20616-1.rs rename to src/test/ui/issues/issue-20616-1.rs diff --git a/src/test/ui/issue-20616-1.stderr b/src/test/ui/issues/issue-20616-1.stderr similarity index 100% rename from src/test/ui/issue-20616-1.stderr rename to src/test/ui/issues/issue-20616-1.stderr diff --git a/src/test/ui/issue-20616-2.rs b/src/test/ui/issues/issue-20616-2.rs similarity index 100% rename from src/test/ui/issue-20616-2.rs rename to src/test/ui/issues/issue-20616-2.rs diff --git a/src/test/ui/issue-20616-2.stderr b/src/test/ui/issues/issue-20616-2.stderr similarity index 100% rename from src/test/ui/issue-20616-2.stderr rename to src/test/ui/issues/issue-20616-2.stderr diff --git a/src/test/ui/issue-20616-3.rs b/src/test/ui/issues/issue-20616-3.rs similarity index 100% rename from src/test/ui/issue-20616-3.rs rename to src/test/ui/issues/issue-20616-3.rs diff --git a/src/test/ui/issue-20616-3.stderr b/src/test/ui/issues/issue-20616-3.stderr similarity index 100% rename from src/test/ui/issue-20616-3.stderr rename to src/test/ui/issues/issue-20616-3.stderr diff --git a/src/test/ui/issue-20616-4.rs b/src/test/ui/issues/issue-20616-4.rs similarity index 100% rename from src/test/ui/issue-20616-4.rs rename to src/test/ui/issues/issue-20616-4.rs diff --git a/src/test/ui/issue-20616-4.stderr b/src/test/ui/issues/issue-20616-4.stderr similarity index 100% rename from src/test/ui/issue-20616-4.stderr rename to src/test/ui/issues/issue-20616-4.stderr diff --git a/src/test/ui/issue-20616-5.rs b/src/test/ui/issues/issue-20616-5.rs similarity index 100% rename from src/test/ui/issue-20616-5.rs rename to src/test/ui/issues/issue-20616-5.rs diff --git a/src/test/ui/issue-20616-5.stderr b/src/test/ui/issues/issue-20616-5.stderr similarity index 100% rename from src/test/ui/issue-20616-5.stderr rename to src/test/ui/issues/issue-20616-5.stderr diff --git a/src/test/ui/issue-20616-6.rs b/src/test/ui/issues/issue-20616-6.rs similarity index 100% rename from src/test/ui/issue-20616-6.rs rename to src/test/ui/issues/issue-20616-6.rs diff --git a/src/test/ui/issue-20616-6.stderr b/src/test/ui/issues/issue-20616-6.stderr similarity index 100% rename from src/test/ui/issue-20616-6.stderr rename to src/test/ui/issues/issue-20616-6.stderr diff --git a/src/test/ui/issue-20616-7.rs b/src/test/ui/issues/issue-20616-7.rs similarity index 100% rename from src/test/ui/issue-20616-7.rs rename to src/test/ui/issues/issue-20616-7.rs diff --git a/src/test/ui/issue-20616-7.stderr b/src/test/ui/issues/issue-20616-7.stderr similarity index 100% rename from src/test/ui/issue-20616-7.stderr rename to src/test/ui/issues/issue-20616-7.stderr diff --git a/src/test/ui/issue-20616-8.rs b/src/test/ui/issues/issue-20616-8.rs similarity index 100% rename from src/test/ui/issue-20616-8.rs rename to src/test/ui/issues/issue-20616-8.rs diff --git a/src/test/ui/issue-20616-8.stderr b/src/test/ui/issues/issue-20616-8.stderr similarity index 100% rename from src/test/ui/issue-20616-8.stderr rename to src/test/ui/issues/issue-20616-8.stderr diff --git a/src/test/ui/issue-20616-9.rs b/src/test/ui/issues/issue-20616-9.rs similarity index 100% rename from src/test/ui/issue-20616-9.rs rename to src/test/ui/issues/issue-20616-9.rs diff --git a/src/test/ui/issue-20616-9.stderr b/src/test/ui/issues/issue-20616-9.stderr similarity index 100% rename from src/test/ui/issue-20616-9.stderr rename to src/test/ui/issues/issue-20616-9.stderr diff --git a/src/test/ui/issue-20692.rs b/src/test/ui/issues/issue-20692.rs similarity index 100% rename from src/test/ui/issue-20692.rs rename to src/test/ui/issues/issue-20692.rs diff --git a/src/test/ui/issue-20692.stderr b/src/test/ui/issues/issue-20692.stderr similarity index 100% rename from src/test/ui/issue-20692.stderr rename to src/test/ui/issues/issue-20692.stderr diff --git a/src/test/ui/issue-20714.rs b/src/test/ui/issues/issue-20714.rs similarity index 100% rename from src/test/ui/issue-20714.rs rename to src/test/ui/issues/issue-20714.rs diff --git a/src/test/ui/issue-20714.stderr b/src/test/ui/issues/issue-20714.stderr similarity index 100% rename from src/test/ui/issue-20714.stderr rename to src/test/ui/issues/issue-20714.stderr diff --git a/src/test/ui/issue-20772.rs b/src/test/ui/issues/issue-20772.rs similarity index 100% rename from src/test/ui/issue-20772.rs rename to src/test/ui/issues/issue-20772.rs diff --git a/src/test/ui/issue-20772.stderr b/src/test/ui/issues/issue-20772.stderr similarity index 100% rename from src/test/ui/issue-20772.stderr rename to src/test/ui/issues/issue-20772.stderr diff --git a/src/test/ui/issue-20801.nll.stderr b/src/test/ui/issues/issue-20801.nll.stderr similarity index 100% rename from src/test/ui/issue-20801.nll.stderr rename to src/test/ui/issues/issue-20801.nll.stderr diff --git a/src/test/ui/issue-20801.rs b/src/test/ui/issues/issue-20801.rs similarity index 100% rename from src/test/ui/issue-20801.rs rename to src/test/ui/issues/issue-20801.rs diff --git a/src/test/ui/issue-20801.stderr b/src/test/ui/issues/issue-20801.stderr similarity index 100% rename from src/test/ui/issue-20801.stderr rename to src/test/ui/issues/issue-20801.stderr diff --git a/src/test/ui/issue-20825.rs b/src/test/ui/issues/issue-20825.rs similarity index 100% rename from src/test/ui/issue-20825.rs rename to src/test/ui/issues/issue-20825.rs diff --git a/src/test/ui/issue-20825.stderr b/src/test/ui/issues/issue-20825.stderr similarity index 100% rename from src/test/ui/issue-20825.stderr rename to src/test/ui/issues/issue-20825.stderr diff --git a/src/test/ui/issue-20831-debruijn.rs b/src/test/ui/issues/issue-20831-debruijn.rs similarity index 100% rename from src/test/ui/issue-20831-debruijn.rs rename to src/test/ui/issues/issue-20831-debruijn.rs diff --git a/src/test/ui/issue-20831-debruijn.stderr b/src/test/ui/issues/issue-20831-debruijn.stderr similarity index 100% rename from src/test/ui/issue-20831-debruijn.stderr rename to src/test/ui/issues/issue-20831-debruijn.stderr diff --git a/src/test/ui/issue-20939.rs b/src/test/ui/issues/issue-20939.rs similarity index 100% rename from src/test/ui/issue-20939.rs rename to src/test/ui/issues/issue-20939.rs diff --git a/src/test/ui/issue-20939.stderr b/src/test/ui/issues/issue-20939.stderr similarity index 100% rename from src/test/ui/issue-20939.stderr rename to src/test/ui/issues/issue-20939.stderr diff --git a/src/test/ui/issue-2111.rs b/src/test/ui/issues/issue-2111.rs similarity index 100% rename from src/test/ui/issue-2111.rs rename to src/test/ui/issues/issue-2111.rs diff --git a/src/test/ui/issue-2111.stderr b/src/test/ui/issues/issue-2111.stderr similarity index 100% rename from src/test/ui/issue-2111.stderr rename to src/test/ui/issues/issue-2111.stderr diff --git a/src/test/ui/compile-fail-migration/issue-21146.rs b/src/test/ui/issues/issue-21146.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-21146.rs rename to src/test/ui/issues/issue-21146.rs diff --git a/src/test/ui/compile-fail-migration/issue-21146.stderr b/src/test/ui/issues/issue-21146.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-21146.stderr rename to src/test/ui/issues/issue-21146.stderr diff --git a/src/test/ui/issue-21160.rs b/src/test/ui/issues/issue-21160.rs similarity index 100% rename from src/test/ui/issue-21160.rs rename to src/test/ui/issues/issue-21160.rs diff --git a/src/test/ui/issue-21160.stderr b/src/test/ui/issues/issue-21160.stderr similarity index 100% rename from src/test/ui/issue-21160.stderr rename to src/test/ui/issues/issue-21160.stderr diff --git a/src/test/ui/issue-21174.rs b/src/test/ui/issues/issue-21174.rs similarity index 100% rename from src/test/ui/issue-21174.rs rename to src/test/ui/issues/issue-21174.rs diff --git a/src/test/ui/issue-21174.stderr b/src/test/ui/issues/issue-21174.stderr similarity index 100% rename from src/test/ui/issue-21174.stderr rename to src/test/ui/issues/issue-21174.stderr diff --git a/src/test/ui/issue-21177.rs b/src/test/ui/issues/issue-21177.rs similarity index 100% rename from src/test/ui/issue-21177.rs rename to src/test/ui/issues/issue-21177.rs diff --git a/src/test/ui/issue-21177.stderr b/src/test/ui/issues/issue-21177.stderr similarity index 100% rename from src/test/ui/issue-21177.stderr rename to src/test/ui/issues/issue-21177.stderr diff --git a/src/test/ui/compile-fail-migration/issue-21202.rs b/src/test/ui/issues/issue-21202.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-21202.rs rename to src/test/ui/issues/issue-21202.rs diff --git a/src/test/ui/compile-fail-migration/issue-21202.stderr b/src/test/ui/issues/issue-21202.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-21202.stderr rename to src/test/ui/issues/issue-21202.stderr diff --git a/src/test/ui/issue-21332.rs b/src/test/ui/issues/issue-21332.rs similarity index 100% rename from src/test/ui/issue-21332.rs rename to src/test/ui/issues/issue-21332.rs diff --git a/src/test/ui/issue-21332.stderr b/src/test/ui/issues/issue-21332.stderr similarity index 100% rename from src/test/ui/issue-21332.stderr rename to src/test/ui/issues/issue-21332.stderr diff --git a/src/test/ui/issue-21356.rs b/src/test/ui/issues/issue-21356.rs similarity index 100% rename from src/test/ui/issue-21356.rs rename to src/test/ui/issues/issue-21356.rs diff --git a/src/test/ui/issue-21356.stderr b/src/test/ui/issues/issue-21356.stderr similarity index 100% rename from src/test/ui/issue-21356.stderr rename to src/test/ui/issues/issue-21356.stderr diff --git a/src/test/ui/issue-21449.rs b/src/test/ui/issues/issue-21449.rs similarity index 100% rename from src/test/ui/issue-21449.rs rename to src/test/ui/issues/issue-21449.rs diff --git a/src/test/ui/issue-21449.stderr b/src/test/ui/issues/issue-21449.stderr similarity index 100% rename from src/test/ui/issue-21449.stderr rename to src/test/ui/issues/issue-21449.stderr diff --git a/src/test/ui/issue-2149.rs b/src/test/ui/issues/issue-2149.rs similarity index 100% rename from src/test/ui/issue-2149.rs rename to src/test/ui/issues/issue-2149.rs diff --git a/src/test/ui/issue-2149.stderr b/src/test/ui/issues/issue-2149.stderr similarity index 100% rename from src/test/ui/issue-2149.stderr rename to src/test/ui/issues/issue-2149.stderr diff --git a/src/test/ui/issue-2150.rs b/src/test/ui/issues/issue-2150.rs similarity index 100% rename from src/test/ui/issue-2150.rs rename to src/test/ui/issues/issue-2150.rs diff --git a/src/test/ui/issue-2150.stderr b/src/test/ui/issues/issue-2150.stderr similarity index 100% rename from src/test/ui/issue-2150.stderr rename to src/test/ui/issues/issue-2150.stderr diff --git a/src/test/ui/issue-2151.rs b/src/test/ui/issues/issue-2151.rs similarity index 100% rename from src/test/ui/issue-2151.rs rename to src/test/ui/issues/issue-2151.rs diff --git a/src/test/ui/issue-2151.stderr b/src/test/ui/issues/issue-2151.stderr similarity index 100% rename from src/test/ui/issue-2151.stderr rename to src/test/ui/issues/issue-2151.stderr diff --git a/src/test/ui/issue-21546.rs b/src/test/ui/issues/issue-21546.rs similarity index 100% rename from src/test/ui/issue-21546.rs rename to src/test/ui/issues/issue-21546.rs diff --git a/src/test/ui/issue-21546.stderr b/src/test/ui/issues/issue-21546.stderr similarity index 100% rename from src/test/ui/issue-21546.stderr rename to src/test/ui/issues/issue-21546.stderr diff --git a/src/test/ui/issue-21554.rs b/src/test/ui/issues/issue-21554.rs similarity index 100% rename from src/test/ui/issue-21554.rs rename to src/test/ui/issues/issue-21554.rs diff --git a/src/test/ui/issue-21554.stderr b/src/test/ui/issues/issue-21554.stderr similarity index 100% rename from src/test/ui/issue-21554.stderr rename to src/test/ui/issues/issue-21554.stderr diff --git a/src/test/ui/issue-21600.nll.stderr b/src/test/ui/issues/issue-21600.nll.stderr similarity index 100% rename from src/test/ui/issue-21600.nll.stderr rename to src/test/ui/issues/issue-21600.nll.stderr diff --git a/src/test/ui/issue-21600.rs b/src/test/ui/issues/issue-21600.rs similarity index 100% rename from src/test/ui/issue-21600.rs rename to src/test/ui/issues/issue-21600.rs diff --git a/src/test/ui/issue-21600.stderr b/src/test/ui/issues/issue-21600.stderr similarity index 100% rename from src/test/ui/issue-21600.stderr rename to src/test/ui/issues/issue-21600.stderr diff --git a/src/test/ui/issue-21701.rs b/src/test/ui/issues/issue-21701.rs similarity index 100% rename from src/test/ui/issue-21701.rs rename to src/test/ui/issues/issue-21701.rs diff --git a/src/test/ui/issue-21701.stderr b/src/test/ui/issues/issue-21701.stderr similarity index 100% rename from src/test/ui/issue-21701.stderr rename to src/test/ui/issues/issue-21701.stderr diff --git a/src/test/ui/issue-21763.rs b/src/test/ui/issues/issue-21763.rs similarity index 100% rename from src/test/ui/issue-21763.rs rename to src/test/ui/issues/issue-21763.rs diff --git a/src/test/ui/issue-21763.stderr b/src/test/ui/issues/issue-21763.stderr similarity index 100% rename from src/test/ui/issue-21763.stderr rename to src/test/ui/issues/issue-21763.stderr diff --git a/src/test/ui/issue-21837.rs b/src/test/ui/issues/issue-21837.rs similarity index 100% rename from src/test/ui/issue-21837.rs rename to src/test/ui/issues/issue-21837.rs diff --git a/src/test/ui/issue-21837.stderr b/src/test/ui/issues/issue-21837.stderr similarity index 100% rename from src/test/ui/issue-21837.stderr rename to src/test/ui/issues/issue-21837.stderr diff --git a/src/test/ui/issue-21946.rs b/src/test/ui/issues/issue-21946.rs similarity index 100% rename from src/test/ui/issue-21946.rs rename to src/test/ui/issues/issue-21946.rs diff --git a/src/test/ui/issue-21946.stderr b/src/test/ui/issues/issue-21946.stderr similarity index 100% rename from src/test/ui/issue-21946.stderr rename to src/test/ui/issues/issue-21946.stderr diff --git a/src/test/ui/issue-21950.rs b/src/test/ui/issues/issue-21950.rs similarity index 100% rename from src/test/ui/issue-21950.rs rename to src/test/ui/issues/issue-21950.rs diff --git a/src/test/ui/issue-21950.stderr b/src/test/ui/issues/issue-21950.stderr similarity index 100% rename from src/test/ui/issue-21950.stderr rename to src/test/ui/issues/issue-21950.stderr diff --git a/src/test/ui/issue-21974.rs b/src/test/ui/issues/issue-21974.rs similarity index 100% rename from src/test/ui/issue-21974.rs rename to src/test/ui/issues/issue-21974.rs diff --git a/src/test/ui/issue-21974.stderr b/src/test/ui/issues/issue-21974.stderr similarity index 100% rename from src/test/ui/issue-21974.stderr rename to src/test/ui/issues/issue-21974.stderr diff --git a/src/test/ui/issue-22034.rs b/src/test/ui/issues/issue-22034.rs similarity index 100% rename from src/test/ui/issue-22034.rs rename to src/test/ui/issues/issue-22034.rs diff --git a/src/test/ui/issue-22034.stderr b/src/test/ui/issues/issue-22034.stderr similarity index 100% rename from src/test/ui/issue-22034.stderr rename to src/test/ui/issues/issue-22034.stderr diff --git a/src/test/ui/issue-22037.rs b/src/test/ui/issues/issue-22037.rs similarity index 100% rename from src/test/ui/issue-22037.rs rename to src/test/ui/issues/issue-22037.rs diff --git a/src/test/ui/issue-22037.stderr b/src/test/ui/issues/issue-22037.stderr similarity index 100% rename from src/test/ui/issue-22037.stderr rename to src/test/ui/issues/issue-22037.stderr diff --git a/src/test/ui/issue-22289.rs b/src/test/ui/issues/issue-22289.rs similarity index 100% rename from src/test/ui/issue-22289.rs rename to src/test/ui/issues/issue-22289.rs diff --git a/src/test/ui/issue-22289.stderr b/src/test/ui/issues/issue-22289.stderr similarity index 100% rename from src/test/ui/issue-22289.stderr rename to src/test/ui/issues/issue-22289.stderr diff --git a/src/test/ui/issue-22312.rs b/src/test/ui/issues/issue-22312.rs similarity index 100% rename from src/test/ui/issue-22312.rs rename to src/test/ui/issues/issue-22312.rs diff --git a/src/test/ui/issue-22312.stderr b/src/test/ui/issues/issue-22312.stderr similarity index 100% rename from src/test/ui/issue-22312.stderr rename to src/test/ui/issues/issue-22312.stderr diff --git a/src/test/ui/issue-22370.rs b/src/test/ui/issues/issue-22370.rs similarity index 100% rename from src/test/ui/issue-22370.rs rename to src/test/ui/issues/issue-22370.rs diff --git a/src/test/ui/issue-22370.stderr b/src/test/ui/issues/issue-22370.stderr similarity index 100% rename from src/test/ui/issue-22370.stderr rename to src/test/ui/issues/issue-22370.stderr diff --git a/src/test/ui/issue-22384.rs b/src/test/ui/issues/issue-22384.rs similarity index 100% rename from src/test/ui/issue-22384.rs rename to src/test/ui/issues/issue-22384.rs diff --git a/src/test/ui/issue-22384.stderr b/src/test/ui/issues/issue-22384.stderr similarity index 100% rename from src/test/ui/issue-22384.stderr rename to src/test/ui/issues/issue-22384.stderr diff --git a/src/test/ui/issue-22434.rs b/src/test/ui/issues/issue-22434.rs similarity index 100% rename from src/test/ui/issue-22434.rs rename to src/test/ui/issues/issue-22434.rs diff --git a/src/test/ui/issue-22434.stderr b/src/test/ui/issues/issue-22434.stderr similarity index 100% rename from src/test/ui/issue-22434.stderr rename to src/test/ui/issues/issue-22434.stderr diff --git a/src/test/ui/issue-22468.rs b/src/test/ui/issues/issue-22468.rs similarity index 100% rename from src/test/ui/issue-22468.rs rename to src/test/ui/issues/issue-22468.rs diff --git a/src/test/ui/issue-22468.stderr b/src/test/ui/issues/issue-22468.stderr similarity index 100% rename from src/test/ui/issue-22468.stderr rename to src/test/ui/issues/issue-22468.stderr diff --git a/src/test/ui/issue-22560.rs b/src/test/ui/issues/issue-22560.rs similarity index 100% rename from src/test/ui/issue-22560.rs rename to src/test/ui/issues/issue-22560.rs diff --git a/src/test/ui/issue-22560.stderr b/src/test/ui/issues/issue-22560.stderr similarity index 100% rename from src/test/ui/issue-22560.stderr rename to src/test/ui/issues/issue-22560.stderr diff --git a/src/test/ui/issue-22599.rs b/src/test/ui/issues/issue-22599.rs similarity index 100% rename from src/test/ui/issue-22599.rs rename to src/test/ui/issues/issue-22599.rs diff --git a/src/test/ui/issue-22599.stderr b/src/test/ui/issues/issue-22599.stderr similarity index 100% rename from src/test/ui/issue-22599.stderr rename to src/test/ui/issues/issue-22599.stderr diff --git a/src/test/ui/issue-22603.rs b/src/test/ui/issues/issue-22603.rs similarity index 100% rename from src/test/ui/issue-22603.rs rename to src/test/ui/issues/issue-22603.rs diff --git a/src/test/ui/issue-22603.stderr b/src/test/ui/issues/issue-22603.stderr similarity index 100% rename from src/test/ui/issue-22603.stderr rename to src/test/ui/issues/issue-22603.stderr diff --git a/src/test/ui/compile-fail-migration/issue-22638.rs b/src/test/ui/issues/issue-22638.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-22638.rs rename to src/test/ui/issues/issue-22638.rs diff --git a/src/test/ui/compile-fail-migration/issue-22638.stderr b/src/test/ui/issues/issue-22638.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-22638.stderr rename to src/test/ui/issues/issue-22638.stderr diff --git a/src/test/ui/issue-22644.rs b/src/test/ui/issues/issue-22644.rs similarity index 100% rename from src/test/ui/issue-22644.rs rename to src/test/ui/issues/issue-22644.rs diff --git a/src/test/ui/issue-22644.stderr b/src/test/ui/issues/issue-22644.stderr similarity index 100% rename from src/test/ui/issue-22644.stderr rename to src/test/ui/issues/issue-22644.stderr diff --git a/src/test/ui/issue-22673.rs b/src/test/ui/issues/issue-22673.rs similarity index 100% rename from src/test/ui/issue-22673.rs rename to src/test/ui/issues/issue-22673.rs diff --git a/src/test/ui/issue-22673.stderr b/src/test/ui/issues/issue-22673.stderr similarity index 100% rename from src/test/ui/issue-22673.stderr rename to src/test/ui/issues/issue-22673.stderr diff --git a/src/test/ui/issue-22684.rs b/src/test/ui/issues/issue-22684.rs similarity index 100% rename from src/test/ui/issue-22684.rs rename to src/test/ui/issues/issue-22684.rs diff --git a/src/test/ui/issue-22684.stderr b/src/test/ui/issues/issue-22684.stderr similarity index 100% rename from src/test/ui/issue-22684.stderr rename to src/test/ui/issues/issue-22684.stderr diff --git a/src/test/ui/issue-22706.rs b/src/test/ui/issues/issue-22706.rs similarity index 100% rename from src/test/ui/issue-22706.rs rename to src/test/ui/issues/issue-22706.rs diff --git a/src/test/ui/issue-22706.stderr b/src/test/ui/issues/issue-22706.stderr similarity index 100% rename from src/test/ui/issue-22706.stderr rename to src/test/ui/issues/issue-22706.stderr diff --git a/src/test/ui/issue-22789.rs b/src/test/ui/issues/issue-22789.rs similarity index 100% rename from src/test/ui/issue-22789.rs rename to src/test/ui/issues/issue-22789.rs diff --git a/src/test/ui/issue-22789.stderr b/src/test/ui/issues/issue-22789.stderr similarity index 100% rename from src/test/ui/issue-22789.stderr rename to src/test/ui/issues/issue-22789.stderr diff --git a/src/test/ui/issue-2281-part1.rs b/src/test/ui/issues/issue-2281-part1.rs similarity index 100% rename from src/test/ui/issue-2281-part1.rs rename to src/test/ui/issues/issue-2281-part1.rs diff --git a/src/test/ui/issue-2281-part1.stderr b/src/test/ui/issues/issue-2281-part1.stderr similarity index 100% rename from src/test/ui/issue-2281-part1.stderr rename to src/test/ui/issues/issue-2281-part1.stderr diff --git a/src/test/ui/issue-22874.rs b/src/test/ui/issues/issue-22874.rs similarity index 100% rename from src/test/ui/issue-22874.rs rename to src/test/ui/issues/issue-22874.rs diff --git a/src/test/ui/issue-22874.stderr b/src/test/ui/issues/issue-22874.stderr similarity index 100% rename from src/test/ui/issue-22874.stderr rename to src/test/ui/issues/issue-22874.stderr diff --git a/src/test/ui/issue-22886.rs b/src/test/ui/issues/issue-22886.rs similarity index 100% rename from src/test/ui/issue-22886.rs rename to src/test/ui/issues/issue-22886.rs diff --git a/src/test/ui/issue-22886.stderr b/src/test/ui/issues/issue-22886.stderr similarity index 100% rename from src/test/ui/issue-22886.stderr rename to src/test/ui/issues/issue-22886.stderr diff --git a/src/test/ui/issue-22933-1.rs b/src/test/ui/issues/issue-22933-1.rs similarity index 100% rename from src/test/ui/issue-22933-1.rs rename to src/test/ui/issues/issue-22933-1.rs diff --git a/src/test/ui/issue-22933-1.stderr b/src/test/ui/issues/issue-22933-1.stderr similarity index 100% rename from src/test/ui/issue-22933-1.stderr rename to src/test/ui/issues/issue-22933-1.stderr diff --git a/src/test/ui/issue-22933-2.rs b/src/test/ui/issues/issue-22933-2.rs similarity index 100% rename from src/test/ui/issue-22933-2.rs rename to src/test/ui/issues/issue-22933-2.rs diff --git a/src/test/ui/issue-22933-2.stderr b/src/test/ui/issues/issue-22933-2.stderr similarity index 100% rename from src/test/ui/issue-22933-2.stderr rename to src/test/ui/issues/issue-22933-2.stderr diff --git a/src/test/ui/issue-22933-3.rs b/src/test/ui/issues/issue-22933-3.rs similarity index 100% rename from src/test/ui/issue-22933-3.rs rename to src/test/ui/issues/issue-22933-3.rs diff --git a/src/test/ui/issue-22933-3.stderr b/src/test/ui/issues/issue-22933-3.stderr similarity index 100% rename from src/test/ui/issue-22933-3.stderr rename to src/test/ui/issues/issue-22933-3.stderr diff --git a/src/test/ui/issue-23024.rs b/src/test/ui/issues/issue-23024.rs similarity index 100% rename from src/test/ui/issue-23024.rs rename to src/test/ui/issues/issue-23024.rs diff --git a/src/test/ui/issue-23024.stderr b/src/test/ui/issues/issue-23024.stderr similarity index 100% rename from src/test/ui/issue-23024.stderr rename to src/test/ui/issues/issue-23024.stderr diff --git a/src/test/ui/issue-23041.rs b/src/test/ui/issues/issue-23041.rs similarity index 100% rename from src/test/ui/issue-23041.rs rename to src/test/ui/issues/issue-23041.rs diff --git a/src/test/ui/issue-23041.stderr b/src/test/ui/issues/issue-23041.stderr similarity index 100% rename from src/test/ui/issue-23041.stderr rename to src/test/ui/issues/issue-23041.stderr diff --git a/src/test/ui/issue-23046.rs b/src/test/ui/issues/issue-23046.rs similarity index 100% rename from src/test/ui/issue-23046.rs rename to src/test/ui/issues/issue-23046.rs diff --git a/src/test/ui/issue-23046.stderr b/src/test/ui/issues/issue-23046.stderr similarity index 100% rename from src/test/ui/issue-23046.stderr rename to src/test/ui/issues/issue-23046.stderr diff --git a/src/test/ui/issue-23073.rs b/src/test/ui/issues/issue-23073.rs similarity index 100% rename from src/test/ui/issue-23073.rs rename to src/test/ui/issues/issue-23073.rs diff --git a/src/test/ui/issue-23073.stderr b/src/test/ui/issues/issue-23073.stderr similarity index 100% rename from src/test/ui/issue-23073.stderr rename to src/test/ui/issues/issue-23073.stderr diff --git a/src/test/ui/issue-23080-2.rs b/src/test/ui/issues/issue-23080-2.rs similarity index 100% rename from src/test/ui/issue-23080-2.rs rename to src/test/ui/issues/issue-23080-2.rs diff --git a/src/test/ui/issue-23080-2.stderr b/src/test/ui/issues/issue-23080-2.stderr similarity index 100% rename from src/test/ui/issue-23080-2.stderr rename to src/test/ui/issues/issue-23080-2.stderr diff --git a/src/test/ui/issue-23080.rs b/src/test/ui/issues/issue-23080.rs similarity index 100% rename from src/test/ui/issue-23080.rs rename to src/test/ui/issues/issue-23080.rs diff --git a/src/test/ui/issue-23080.stderr b/src/test/ui/issues/issue-23080.stderr similarity index 100% rename from src/test/ui/issue-23080.stderr rename to src/test/ui/issues/issue-23080.stderr diff --git a/src/test/ui/issue-23122-1.rs b/src/test/ui/issues/issue-23122-1.rs similarity index 100% rename from src/test/ui/issue-23122-1.rs rename to src/test/ui/issues/issue-23122-1.rs diff --git a/src/test/ui/issue-23122-1.stderr b/src/test/ui/issues/issue-23122-1.stderr similarity index 100% rename from src/test/ui/issue-23122-1.stderr rename to src/test/ui/issues/issue-23122-1.stderr diff --git a/src/test/ui/issue-23122-2.rs b/src/test/ui/issues/issue-23122-2.rs similarity index 100% rename from src/test/ui/issue-23122-2.rs rename to src/test/ui/issues/issue-23122-2.rs diff --git a/src/test/ui/issue-23122-2.stderr b/src/test/ui/issues/issue-23122-2.stderr similarity index 100% rename from src/test/ui/issue-23122-2.stderr rename to src/test/ui/issues/issue-23122-2.stderr diff --git a/src/test/ui/issue-23173.rs b/src/test/ui/issues/issue-23173.rs similarity index 100% rename from src/test/ui/issue-23173.rs rename to src/test/ui/issues/issue-23173.rs diff --git a/src/test/ui/issue-23173.stderr b/src/test/ui/issues/issue-23173.stderr similarity index 100% rename from src/test/ui/issue-23173.stderr rename to src/test/ui/issues/issue-23173.stderr diff --git a/src/test/ui/issue-23217.rs b/src/test/ui/issues/issue-23217.rs similarity index 100% rename from src/test/ui/issue-23217.rs rename to src/test/ui/issues/issue-23217.rs diff --git a/src/test/ui/issue-23217.stderr b/src/test/ui/issues/issue-23217.stderr similarity index 100% rename from src/test/ui/issue-23217.stderr rename to src/test/ui/issues/issue-23217.stderr diff --git a/src/test/ui/issue-23253.rs b/src/test/ui/issues/issue-23253.rs similarity index 100% rename from src/test/ui/issue-23253.rs rename to src/test/ui/issues/issue-23253.rs diff --git a/src/test/ui/issue-23253.stderr b/src/test/ui/issues/issue-23253.stderr similarity index 100% rename from src/test/ui/issue-23253.stderr rename to src/test/ui/issues/issue-23253.stderr diff --git a/src/test/ui/issue-23281.rs b/src/test/ui/issues/issue-23281.rs similarity index 100% rename from src/test/ui/issue-23281.rs rename to src/test/ui/issues/issue-23281.rs diff --git a/src/test/ui/issue-23281.stderr b/src/test/ui/issues/issue-23281.stderr similarity index 100% rename from src/test/ui/issue-23281.stderr rename to src/test/ui/issues/issue-23281.stderr diff --git a/src/test/ui/issue-2330.rs b/src/test/ui/issues/issue-2330.rs similarity index 100% rename from src/test/ui/issue-2330.rs rename to src/test/ui/issues/issue-2330.rs diff --git a/src/test/ui/issue-2330.stderr b/src/test/ui/issues/issue-2330.stderr similarity index 100% rename from src/test/ui/issue-2330.stderr rename to src/test/ui/issues/issue-2330.stderr diff --git a/src/test/ui/issue-23302-1.rs b/src/test/ui/issues/issue-23302-1.rs similarity index 100% rename from src/test/ui/issue-23302-1.rs rename to src/test/ui/issues/issue-23302-1.rs diff --git a/src/test/ui/issue-23302-1.stderr b/src/test/ui/issues/issue-23302-1.stderr similarity index 100% rename from src/test/ui/issue-23302-1.stderr rename to src/test/ui/issues/issue-23302-1.stderr diff --git a/src/test/ui/issue-23302-2.rs b/src/test/ui/issues/issue-23302-2.rs similarity index 100% rename from src/test/ui/issue-23302-2.rs rename to src/test/ui/issues/issue-23302-2.rs diff --git a/src/test/ui/issue-23302-2.stderr b/src/test/ui/issues/issue-23302-2.stderr similarity index 100% rename from src/test/ui/issue-23302-2.stderr rename to src/test/ui/issues/issue-23302-2.stderr diff --git a/src/test/ui/issue-23302-3.rs b/src/test/ui/issues/issue-23302-3.rs similarity index 100% rename from src/test/ui/issue-23302-3.rs rename to src/test/ui/issues/issue-23302-3.rs diff --git a/src/test/ui/issue-23302-3.stderr b/src/test/ui/issues/issue-23302-3.stderr similarity index 100% rename from src/test/ui/issue-23302-3.stderr rename to src/test/ui/issues/issue-23302-3.stderr diff --git a/src/test/ui/issue-23543.rs b/src/test/ui/issues/issue-23543.rs similarity index 100% rename from src/test/ui/issue-23543.rs rename to src/test/ui/issues/issue-23543.rs diff --git a/src/test/ui/issue-23543.stderr b/src/test/ui/issues/issue-23543.stderr similarity index 100% rename from src/test/ui/issue-23543.stderr rename to src/test/ui/issues/issue-23543.stderr diff --git a/src/test/ui/issue-23544.rs b/src/test/ui/issues/issue-23544.rs similarity index 100% rename from src/test/ui/issue-23544.rs rename to src/test/ui/issues/issue-23544.rs diff --git a/src/test/ui/issue-23544.stderr b/src/test/ui/issues/issue-23544.stderr similarity index 100% rename from src/test/ui/issue-23544.stderr rename to src/test/ui/issues/issue-23544.stderr diff --git a/src/test/ui/issue-23589.rs b/src/test/ui/issues/issue-23589.rs similarity index 100% rename from src/test/ui/issue-23589.rs rename to src/test/ui/issues/issue-23589.rs diff --git a/src/test/ui/issue-23589.stderr b/src/test/ui/issues/issue-23589.stderr similarity index 100% rename from src/test/ui/issue-23589.stderr rename to src/test/ui/issues/issue-23589.stderr diff --git a/src/test/ui/compile-fail-migration/issue-23595-1.rs b/src/test/ui/issues/issue-23595-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-23595-1.rs rename to src/test/ui/issues/issue-23595-1.rs diff --git a/src/test/ui/compile-fail-migration/issue-23595-1.stderr b/src/test/ui/issues/issue-23595-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-23595-1.stderr rename to src/test/ui/issues/issue-23595-1.stderr diff --git a/src/test/ui/issue-23595-2.rs b/src/test/ui/issues/issue-23595-2.rs similarity index 100% rename from src/test/ui/issue-23595-2.rs rename to src/test/ui/issues/issue-23595-2.rs diff --git a/src/test/ui/issue-23595-2.stderr b/src/test/ui/issues/issue-23595-2.stderr similarity index 100% rename from src/test/ui/issue-23595-2.stderr rename to src/test/ui/issues/issue-23595-2.stderr diff --git a/src/test/ui/issue-23716.rs b/src/test/ui/issues/issue-23716.rs similarity index 100% rename from src/test/ui/issue-23716.rs rename to src/test/ui/issues/issue-23716.rs diff --git a/src/test/ui/issue-23716.stderr b/src/test/ui/issues/issue-23716.stderr similarity index 100% rename from src/test/ui/issue-23716.stderr rename to src/test/ui/issues/issue-23716.stderr diff --git a/src/test/ui/issue-23966.rs b/src/test/ui/issues/issue-23966.rs similarity index 100% rename from src/test/ui/issue-23966.rs rename to src/test/ui/issues/issue-23966.rs diff --git a/src/test/ui/issue-23966.stderr b/src/test/ui/issues/issue-23966.stderr similarity index 100% rename from src/test/ui/issue-23966.stderr rename to src/test/ui/issues/issue-23966.stderr diff --git a/src/test/ui/issue-24013.rs b/src/test/ui/issues/issue-24013.rs similarity index 100% rename from src/test/ui/issue-24013.rs rename to src/test/ui/issues/issue-24013.rs diff --git a/src/test/ui/issue-24013.stderr b/src/test/ui/issues/issue-24013.stderr similarity index 100% rename from src/test/ui/issue-24013.stderr rename to src/test/ui/issues/issue-24013.stderr diff --git a/src/test/ui/issue-24036.rs b/src/test/ui/issues/issue-24036.rs similarity index 100% rename from src/test/ui/issue-24036.rs rename to src/test/ui/issues/issue-24036.rs diff --git a/src/test/ui/issue-24036.stderr b/src/test/ui/issues/issue-24036.stderr similarity index 100% rename from src/test/ui/issue-24036.stderr rename to src/test/ui/issues/issue-24036.stderr diff --git a/src/test/ui/issue-24081.rs b/src/test/ui/issues/issue-24081.rs similarity index 100% rename from src/test/ui/issue-24081.rs rename to src/test/ui/issues/issue-24081.rs diff --git a/src/test/ui/issue-24081.stderr b/src/test/ui/issues/issue-24081.stderr similarity index 100% rename from src/test/ui/issue-24081.stderr rename to src/test/ui/issues/issue-24081.stderr diff --git a/src/test/ui/issue-24204.rs b/src/test/ui/issues/issue-24204.rs similarity index 100% rename from src/test/ui/issue-24204.rs rename to src/test/ui/issues/issue-24204.rs diff --git a/src/test/ui/issue-24204.stderr b/src/test/ui/issues/issue-24204.stderr similarity index 100% rename from src/test/ui/issue-24204.stderr rename to src/test/ui/issues/issue-24204.stderr diff --git a/src/test/ui/issue-24267-flow-exit.nll.stderr b/src/test/ui/issues/issue-24267-flow-exit.nll.stderr similarity index 100% rename from src/test/ui/issue-24267-flow-exit.nll.stderr rename to src/test/ui/issues/issue-24267-flow-exit.nll.stderr diff --git a/src/test/ui/issue-24267-flow-exit.rs b/src/test/ui/issues/issue-24267-flow-exit.rs similarity index 100% rename from src/test/ui/issue-24267-flow-exit.rs rename to src/test/ui/issues/issue-24267-flow-exit.rs diff --git a/src/test/ui/issue-24267-flow-exit.stderr b/src/test/ui/issues/issue-24267-flow-exit.stderr similarity index 100% rename from src/test/ui/issue-24267-flow-exit.stderr rename to src/test/ui/issues/issue-24267-flow-exit.stderr diff --git a/src/test/ui/issue-24322.rs b/src/test/ui/issues/issue-24322.rs similarity index 100% rename from src/test/ui/issue-24322.rs rename to src/test/ui/issues/issue-24322.rs diff --git a/src/test/ui/issue-24322.stderr b/src/test/ui/issues/issue-24322.stderr similarity index 100% rename from src/test/ui/issue-24322.stderr rename to src/test/ui/issues/issue-24322.stderr diff --git a/src/test/ui/issue-24352.rs b/src/test/ui/issues/issue-24352.rs similarity index 100% rename from src/test/ui/issue-24352.rs rename to src/test/ui/issues/issue-24352.rs diff --git a/src/test/ui/issue-24352.stderr b/src/test/ui/issues/issue-24352.stderr similarity index 100% rename from src/test/ui/issue-24352.stderr rename to src/test/ui/issues/issue-24352.stderr diff --git a/src/test/ui/issue-24357.nll.stderr b/src/test/ui/issues/issue-24357.nll.stderr similarity index 100% rename from src/test/ui/issue-24357.nll.stderr rename to src/test/ui/issues/issue-24357.nll.stderr diff --git a/src/test/ui/issue-24357.rs b/src/test/ui/issues/issue-24357.rs similarity index 100% rename from src/test/ui/issue-24357.rs rename to src/test/ui/issues/issue-24357.rs diff --git a/src/test/ui/issue-24357.stderr b/src/test/ui/issues/issue-24357.stderr similarity index 100% rename from src/test/ui/issue-24357.stderr rename to src/test/ui/issues/issue-24357.stderr diff --git a/src/test/ui/issue-24363.rs b/src/test/ui/issues/issue-24363.rs similarity index 100% rename from src/test/ui/issue-24363.rs rename to src/test/ui/issues/issue-24363.rs diff --git a/src/test/ui/issue-24363.stderr b/src/test/ui/issues/issue-24363.stderr similarity index 100% rename from src/test/ui/issue-24363.stderr rename to src/test/ui/issues/issue-24363.stderr diff --git a/src/test/ui/issue-24365.rs b/src/test/ui/issues/issue-24365.rs similarity index 100% rename from src/test/ui/issue-24365.rs rename to src/test/ui/issues/issue-24365.rs diff --git a/src/test/ui/issue-24365.stderr b/src/test/ui/issues/issue-24365.stderr similarity index 100% rename from src/test/ui/issue-24365.stderr rename to src/test/ui/issues/issue-24365.stderr diff --git a/src/test/ui/issue-24424.rs b/src/test/ui/issues/issue-24424.rs similarity index 100% rename from src/test/ui/issue-24424.rs rename to src/test/ui/issues/issue-24424.rs diff --git a/src/test/ui/issue-24424.stderr b/src/test/ui/issues/issue-24424.stderr similarity index 100% rename from src/test/ui/issue-24424.stderr rename to src/test/ui/issues/issue-24424.stderr diff --git a/src/test/ui/issue-24446.rs b/src/test/ui/issues/issue-24446.rs similarity index 100% rename from src/test/ui/issue-24446.rs rename to src/test/ui/issues/issue-24446.rs diff --git a/src/test/ui/issue-24446.stderr b/src/test/ui/issues/issue-24446.stderr similarity index 100% rename from src/test/ui/issue-24446.stderr rename to src/test/ui/issues/issue-24446.stderr diff --git a/src/test/ui/issue-24682.rs b/src/test/ui/issues/issue-24682.rs similarity index 100% rename from src/test/ui/issue-24682.rs rename to src/test/ui/issues/issue-24682.rs diff --git a/src/test/ui/issue-24682.stderr b/src/test/ui/issues/issue-24682.stderr similarity index 100% rename from src/test/ui/issue-24682.stderr rename to src/test/ui/issues/issue-24682.stderr diff --git a/src/test/ui/issue-24819.rs b/src/test/ui/issues/issue-24819.rs similarity index 100% rename from src/test/ui/issue-24819.rs rename to src/test/ui/issues/issue-24819.rs diff --git a/src/test/ui/issue-24819.stderr b/src/test/ui/issues/issue-24819.stderr similarity index 100% rename from src/test/ui/issue-24819.stderr rename to src/test/ui/issues/issue-24819.stderr diff --git a/src/test/ui/issue-24883.rs b/src/test/ui/issues/issue-24883.rs similarity index 100% rename from src/test/ui/issue-24883.rs rename to src/test/ui/issues/issue-24883.rs diff --git a/src/test/ui/issue-24883.stderr b/src/test/ui/issues/issue-24883.stderr similarity index 100% rename from src/test/ui/issue-24883.stderr rename to src/test/ui/issues/issue-24883.stderr diff --git a/src/test/ui/issue-25076.rs b/src/test/ui/issues/issue-25076.rs similarity index 100% rename from src/test/ui/issue-25076.rs rename to src/test/ui/issues/issue-25076.rs diff --git a/src/test/ui/issue-25076.stderr b/src/test/ui/issues/issue-25076.stderr similarity index 100% rename from src/test/ui/issue-25076.stderr rename to src/test/ui/issues/issue-25076.stderr diff --git a/src/test/ui/issue-25368.rs b/src/test/ui/issues/issue-25368.rs similarity index 100% rename from src/test/ui/issue-25368.rs rename to src/test/ui/issues/issue-25368.rs diff --git a/src/test/ui/issue-25368.stderr b/src/test/ui/issues/issue-25368.stderr similarity index 100% rename from src/test/ui/issue-25368.stderr rename to src/test/ui/issues/issue-25368.stderr diff --git a/src/test/ui/issue-25385.rs b/src/test/ui/issues/issue-25385.rs similarity index 100% rename from src/test/ui/issue-25385.rs rename to src/test/ui/issues/issue-25385.rs diff --git a/src/test/ui/issue-25385.stderr b/src/test/ui/issues/issue-25385.stderr similarity index 100% rename from src/test/ui/issue-25385.stderr rename to src/test/ui/issues/issue-25385.stderr diff --git a/src/test/ui/issue-25386.rs b/src/test/ui/issues/issue-25386.rs similarity index 100% rename from src/test/ui/issue-25386.rs rename to src/test/ui/issues/issue-25386.rs diff --git a/src/test/ui/issue-25386.stderr b/src/test/ui/issues/issue-25386.stderr similarity index 100% rename from src/test/ui/issue-25386.stderr rename to src/test/ui/issues/issue-25386.stderr diff --git a/src/test/ui/issue-25396.rs b/src/test/ui/issues/issue-25396.rs similarity index 100% rename from src/test/ui/issue-25396.rs rename to src/test/ui/issues/issue-25396.rs diff --git a/src/test/ui/issue-25396.stderr b/src/test/ui/issues/issue-25396.stderr similarity index 100% rename from src/test/ui/issue-25396.stderr rename to src/test/ui/issues/issue-25396.stderr diff --git a/src/test/ui/issue-25439.rs b/src/test/ui/issues/issue-25439.rs similarity index 100% rename from src/test/ui/issue-25439.rs rename to src/test/ui/issues/issue-25439.rs diff --git a/src/test/ui/issue-25439.stderr b/src/test/ui/issues/issue-25439.stderr similarity index 100% rename from src/test/ui/issue-25439.stderr rename to src/test/ui/issues/issue-25439.stderr diff --git a/src/test/ui/issue-25579.ast.nll.stderr b/src/test/ui/issues/issue-25579.ast.nll.stderr similarity index 100% rename from src/test/ui/issue-25579.ast.nll.stderr rename to src/test/ui/issues/issue-25579.ast.nll.stderr diff --git a/src/test/ui/issue-25579.ast.stderr b/src/test/ui/issues/issue-25579.ast.stderr similarity index 100% rename from src/test/ui/issue-25579.ast.stderr rename to src/test/ui/issues/issue-25579.ast.stderr diff --git a/src/test/ui/issue-25579.mir.stderr b/src/test/ui/issues/issue-25579.mir.stderr similarity index 100% rename from src/test/ui/issue-25579.mir.stderr rename to src/test/ui/issues/issue-25579.mir.stderr diff --git a/src/test/ui/issue-25579.rs b/src/test/ui/issues/issue-25579.rs similarity index 100% rename from src/test/ui/issue-25579.rs rename to src/test/ui/issues/issue-25579.rs diff --git a/src/test/ui/issue-25700.rs b/src/test/ui/issues/issue-25700.rs similarity index 100% rename from src/test/ui/issue-25700.rs rename to src/test/ui/issues/issue-25700.rs diff --git a/src/test/ui/issue-25700.stderr b/src/test/ui/issues/issue-25700.stderr similarity index 100% rename from src/test/ui/issue-25700.stderr rename to src/test/ui/issues/issue-25700.stderr diff --git a/src/test/ui/issue-25793.nll.stderr b/src/test/ui/issues/issue-25793.nll.stderr similarity index 100% rename from src/test/ui/issue-25793.nll.stderr rename to src/test/ui/issues/issue-25793.nll.stderr diff --git a/src/test/ui/issue-25793.rs b/src/test/ui/issues/issue-25793.rs similarity index 100% rename from src/test/ui/issue-25793.rs rename to src/test/ui/issues/issue-25793.rs diff --git a/src/test/ui/issue-25793.stderr b/src/test/ui/issues/issue-25793.stderr similarity index 100% rename from src/test/ui/issue-25793.stderr rename to src/test/ui/issues/issue-25793.stderr diff --git a/src/test/ui/issue-25826.rs b/src/test/ui/issues/issue-25826.rs similarity index 100% rename from src/test/ui/issue-25826.rs rename to src/test/ui/issues/issue-25826.rs diff --git a/src/test/ui/issue-25826.stderr b/src/test/ui/issues/issue-25826.stderr similarity index 100% rename from src/test/ui/issue-25826.stderr rename to src/test/ui/issues/issue-25826.stderr diff --git a/src/test/ui/issue-2590.nll.stderr b/src/test/ui/issues/issue-2590.nll.stderr similarity index 100% rename from src/test/ui/issue-2590.nll.stderr rename to src/test/ui/issues/issue-2590.nll.stderr diff --git a/src/test/ui/issue-2590.rs b/src/test/ui/issues/issue-2590.rs similarity index 100% rename from src/test/ui/issue-2590.rs rename to src/test/ui/issues/issue-2590.rs diff --git a/src/test/ui/issue-2590.stderr b/src/test/ui/issues/issue-2590.stderr similarity index 100% rename from src/test/ui/issue-2590.stderr rename to src/test/ui/issues/issue-2590.stderr diff --git a/src/test/ui/issue-25901.rs b/src/test/ui/issues/issue-25901.rs similarity index 100% rename from src/test/ui/issue-25901.rs rename to src/test/ui/issues/issue-25901.rs diff --git a/src/test/ui/issue-25901.stderr b/src/test/ui/issues/issue-25901.stderr similarity index 100% rename from src/test/ui/issue-25901.stderr rename to src/test/ui/issues/issue-25901.stderr diff --git a/src/test/ui/issue-26056.rs b/src/test/ui/issues/issue-26056.rs similarity index 100% rename from src/test/ui/issue-26056.rs rename to src/test/ui/issues/issue-26056.rs diff --git a/src/test/ui/issue-26056.stderr b/src/test/ui/issues/issue-26056.stderr similarity index 100% rename from src/test/ui/issue-26056.stderr rename to src/test/ui/issues/issue-26056.stderr diff --git a/src/test/ui/issue-26093.rs b/src/test/ui/issues/issue-26093.rs similarity index 100% rename from src/test/ui/issue-26093.rs rename to src/test/ui/issues/issue-26093.rs diff --git a/src/test/ui/issue-26093.stderr b/src/test/ui/issues/issue-26093.stderr similarity index 100% rename from src/test/ui/issue-26093.stderr rename to src/test/ui/issues/issue-26093.stderr diff --git a/src/test/ui/issue-26094.rs b/src/test/ui/issues/issue-26094.rs similarity index 100% rename from src/test/ui/issue-26094.rs rename to src/test/ui/issues/issue-26094.rs diff --git a/src/test/ui/issue-26094.stderr b/src/test/ui/issues/issue-26094.stderr similarity index 100% rename from src/test/ui/issue-26094.stderr rename to src/test/ui/issues/issue-26094.stderr diff --git a/src/test/ui/issue-26158.rs b/src/test/ui/issues/issue-26158.rs similarity index 100% rename from src/test/ui/issue-26158.rs rename to src/test/ui/issues/issue-26158.rs diff --git a/src/test/ui/issue-26158.stderr b/src/test/ui/issues/issue-26158.stderr similarity index 100% rename from src/test/ui/issue-26158.stderr rename to src/test/ui/issues/issue-26158.stderr diff --git a/src/test/ui/issue-26217.nll.stderr b/src/test/ui/issues/issue-26217.nll.stderr similarity index 100% rename from src/test/ui/issue-26217.nll.stderr rename to src/test/ui/issues/issue-26217.nll.stderr diff --git a/src/test/ui/issue-26217.rs b/src/test/ui/issues/issue-26217.rs similarity index 100% rename from src/test/ui/issue-26217.rs rename to src/test/ui/issues/issue-26217.rs diff --git a/src/test/ui/issue-26217.stderr b/src/test/ui/issues/issue-26217.stderr similarity index 100% rename from src/test/ui/issue-26217.stderr rename to src/test/ui/issues/issue-26217.stderr diff --git a/src/test/ui/issue-26237.rs b/src/test/ui/issues/issue-26237.rs similarity index 100% rename from src/test/ui/issue-26237.rs rename to src/test/ui/issues/issue-26237.rs diff --git a/src/test/ui/issue-26237.stderr b/src/test/ui/issues/issue-26237.stderr similarity index 100% rename from src/test/ui/issue-26237.stderr rename to src/test/ui/issues/issue-26237.stderr diff --git a/src/test/ui/issue-26262.rs b/src/test/ui/issues/issue-26262.rs similarity index 100% rename from src/test/ui/issue-26262.rs rename to src/test/ui/issues/issue-26262.rs diff --git a/src/test/ui/issue-26262.stderr b/src/test/ui/issues/issue-26262.stderr similarity index 100% rename from src/test/ui/issue-26262.stderr rename to src/test/ui/issues/issue-26262.stderr diff --git a/src/test/ui/issue-26459.rs b/src/test/ui/issues/issue-26459.rs similarity index 100% rename from src/test/ui/issue-26459.rs rename to src/test/ui/issues/issue-26459.rs diff --git a/src/test/ui/issue-26459.stderr b/src/test/ui/issues/issue-26459.stderr similarity index 100% rename from src/test/ui/issue-26459.stderr rename to src/test/ui/issues/issue-26459.stderr diff --git a/src/test/ui/issue-26472.rs b/src/test/ui/issues/issue-26472.rs similarity index 100% rename from src/test/ui/issue-26472.rs rename to src/test/ui/issues/issue-26472.rs diff --git a/src/test/ui/issue-26472.stderr b/src/test/ui/issues/issue-26472.stderr similarity index 100% rename from src/test/ui/issue-26472.stderr rename to src/test/ui/issues/issue-26472.stderr diff --git a/src/test/ui/compile-fail-migration/issue-26548.rs b/src/test/ui/issues/issue-26548.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-26548.rs rename to src/test/ui/issues/issue-26548.rs diff --git a/src/test/ui/compile-fail-migration/issue-26548.stderr b/src/test/ui/issues/issue-26548.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-26548.stderr rename to src/test/ui/issues/issue-26548.stderr diff --git a/src/test/ui/issue-26614.rs b/src/test/ui/issues/issue-26614.rs similarity index 100% rename from src/test/ui/issue-26614.rs rename to src/test/ui/issues/issue-26614.rs diff --git a/src/test/ui/issue-26614.stderr b/src/test/ui/issues/issue-26614.stderr similarity index 100% rename from src/test/ui/issue-26614.stderr rename to src/test/ui/issues/issue-26614.stderr diff --git a/src/test/ui/issue-26638.rs b/src/test/ui/issues/issue-26638.rs similarity index 100% rename from src/test/ui/issue-26638.rs rename to src/test/ui/issues/issue-26638.rs diff --git a/src/test/ui/issue-26638.stderr b/src/test/ui/issues/issue-26638.stderr similarity index 100% rename from src/test/ui/issue-26638.stderr rename to src/test/ui/issues/issue-26638.stderr diff --git a/src/test/ui/issue-26812.rs b/src/test/ui/issues/issue-26812.rs similarity index 100% rename from src/test/ui/issue-26812.rs rename to src/test/ui/issues/issue-26812.rs diff --git a/src/test/ui/issue-26812.stderr b/src/test/ui/issues/issue-26812.stderr similarity index 100% rename from src/test/ui/issue-26812.stderr rename to src/test/ui/issues/issue-26812.stderr diff --git a/src/test/ui/issue-26886.rs b/src/test/ui/issues/issue-26886.rs similarity index 100% rename from src/test/ui/issue-26886.rs rename to src/test/ui/issues/issue-26886.rs diff --git a/src/test/ui/issue-26886.stderr b/src/test/ui/issues/issue-26886.stderr similarity index 100% rename from src/test/ui/issue-26886.stderr rename to src/test/ui/issues/issue-26886.stderr diff --git a/src/test/ui/issue-26905.rs b/src/test/ui/issues/issue-26905.rs similarity index 100% rename from src/test/ui/issue-26905.rs rename to src/test/ui/issues/issue-26905.rs diff --git a/src/test/ui/issue-26905.stderr b/src/test/ui/issues/issue-26905.stderr similarity index 100% rename from src/test/ui/issue-26905.stderr rename to src/test/ui/issues/issue-26905.stderr diff --git a/src/test/ui/issue-26930.rs b/src/test/ui/issues/issue-26930.rs similarity index 100% rename from src/test/ui/issue-26930.rs rename to src/test/ui/issues/issue-26930.rs diff --git a/src/test/ui/issue-26930.stderr b/src/test/ui/issues/issue-26930.stderr similarity index 100% rename from src/test/ui/issue-26930.stderr rename to src/test/ui/issues/issue-26930.stderr diff --git a/src/test/ui/issue-26948.rs b/src/test/ui/issues/issue-26948.rs similarity index 100% rename from src/test/ui/issue-26948.rs rename to src/test/ui/issues/issue-26948.rs diff --git a/src/test/ui/issue-26948.stderr b/src/test/ui/issues/issue-26948.stderr similarity index 100% rename from src/test/ui/issue-26948.stderr rename to src/test/ui/issues/issue-26948.stderr diff --git a/src/test/ui/issue-27008.rs b/src/test/ui/issues/issue-27008.rs similarity index 100% rename from src/test/ui/issue-27008.rs rename to src/test/ui/issues/issue-27008.rs diff --git a/src/test/ui/issue-27008.stderr b/src/test/ui/issues/issue-27008.stderr similarity index 100% rename from src/test/ui/issue-27008.stderr rename to src/test/ui/issues/issue-27008.stderr diff --git a/src/test/ui/issue-27033.rs b/src/test/ui/issues/issue-27033.rs similarity index 100% rename from src/test/ui/issue-27033.rs rename to src/test/ui/issues/issue-27033.rs diff --git a/src/test/ui/issue-27033.stderr b/src/test/ui/issues/issue-27033.stderr similarity index 100% rename from src/test/ui/issue-27033.stderr rename to src/test/ui/issues/issue-27033.stderr diff --git a/src/test/ui/issue-27042.rs b/src/test/ui/issues/issue-27042.rs similarity index 100% rename from src/test/ui/issue-27042.rs rename to src/test/ui/issues/issue-27042.rs diff --git a/src/test/ui/issue-27042.stderr b/src/test/ui/issues/issue-27042.stderr similarity index 100% rename from src/test/ui/issue-27042.stderr rename to src/test/ui/issues/issue-27042.stderr diff --git a/src/test/ui/issue-27060-2.rs b/src/test/ui/issues/issue-27060-2.rs similarity index 100% rename from src/test/ui/issue-27060-2.rs rename to src/test/ui/issues/issue-27060-2.rs diff --git a/src/test/ui/issue-27060-2.stderr b/src/test/ui/issues/issue-27060-2.stderr similarity index 100% rename from src/test/ui/issue-27060-2.stderr rename to src/test/ui/issues/issue-27060-2.stderr diff --git a/src/test/ui/issue-27060.rs b/src/test/ui/issues/issue-27060.rs similarity index 100% rename from src/test/ui/issue-27060.rs rename to src/test/ui/issues/issue-27060.rs diff --git a/src/test/ui/issue-27060.stderr b/src/test/ui/issues/issue-27060.stderr similarity index 100% rename from src/test/ui/issue-27060.stderr rename to src/test/ui/issues/issue-27060.stderr diff --git a/src/test/ui/issue-27078.rs b/src/test/ui/issues/issue-27078.rs similarity index 100% rename from src/test/ui/issue-27078.rs rename to src/test/ui/issues/issue-27078.rs diff --git a/src/test/ui/issue-27078.stderr b/src/test/ui/issues/issue-27078.stderr similarity index 100% rename from src/test/ui/issue-27078.stderr rename to src/test/ui/issues/issue-27078.stderr diff --git a/src/test/ui/issue-2718-a.rs b/src/test/ui/issues/issue-2718-a.rs similarity index 100% rename from src/test/ui/issue-2718-a.rs rename to src/test/ui/issues/issue-2718-a.rs diff --git a/src/test/ui/issue-2718-a.stderr b/src/test/ui/issues/issue-2718-a.stderr similarity index 100% rename from src/test/ui/issue-2718-a.stderr rename to src/test/ui/issues/issue-2718-a.stderr diff --git a/src/test/ui/issue-27282-move-match-input-into-guard.rs b/src/test/ui/issues/issue-27282-move-match-input-into-guard.rs similarity index 100% rename from src/test/ui/issue-27282-move-match-input-into-guard.rs rename to src/test/ui/issues/issue-27282-move-match-input-into-guard.rs diff --git a/src/test/ui/issue-27282-move-match-input-into-guard.stderr b/src/test/ui/issues/issue-27282-move-match-input-into-guard.stderr similarity index 100% rename from src/test/ui/issue-27282-move-match-input-into-guard.stderr rename to src/test/ui/issues/issue-27282-move-match-input-into-guard.stderr diff --git a/src/test/ui/issue-27282-move-ref-mut-into-guard.rs b/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.rs similarity index 100% rename from src/test/ui/issue-27282-move-ref-mut-into-guard.rs rename to src/test/ui/issues/issue-27282-move-ref-mut-into-guard.rs diff --git a/src/test/ui/issue-27282-move-ref-mut-into-guard.stderr b/src/test/ui/issues/issue-27282-move-ref-mut-into-guard.stderr similarity index 100% rename from src/test/ui/issue-27282-move-ref-mut-into-guard.stderr rename to src/test/ui/issues/issue-27282-move-ref-mut-into-guard.stderr diff --git a/src/test/ui/issue-27282-mutate-before-diverging-arm-1.rs b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.rs similarity index 100% rename from src/test/ui/issue-27282-mutate-before-diverging-arm-1.rs rename to src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.rs diff --git a/src/test/ui/issue-27282-mutate-before-diverging-arm-1.stderr b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.stderr similarity index 100% rename from src/test/ui/issue-27282-mutate-before-diverging-arm-1.stderr rename to src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.stderr diff --git a/src/test/ui/issue-27282-mutate-before-diverging-arm-2.rs b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.rs similarity index 100% rename from src/test/ui/issue-27282-mutate-before-diverging-arm-2.rs rename to src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.rs diff --git a/src/test/ui/issue-27282-mutate-before-diverging-arm-2.stderr b/src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.stderr similarity index 100% rename from src/test/ui/issue-27282-mutate-before-diverging-arm-2.stderr rename to src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.stderr diff --git a/src/test/ui/issue-27282-reborrow-ref-mut-in-guard.rs b/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.rs similarity index 100% rename from src/test/ui/issue-27282-reborrow-ref-mut-in-guard.rs rename to src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.rs diff --git a/src/test/ui/issue-27282-reborrow-ref-mut-in-guard.stderr b/src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.stderr similarity index 100% rename from src/test/ui/issue-27282-reborrow-ref-mut-in-guard.stderr rename to src/test/ui/issues/issue-27282-reborrow-ref-mut-in-guard.stderr diff --git a/src/test/ui/issue-27340.rs b/src/test/ui/issues/issue-27340.rs similarity index 100% rename from src/test/ui/issue-27340.rs rename to src/test/ui/issues/issue-27340.rs diff --git a/src/test/ui/issue-27340.stderr b/src/test/ui/issues/issue-27340.stderr similarity index 100% rename from src/test/ui/issue-27340.stderr rename to src/test/ui/issues/issue-27340.stderr diff --git a/src/test/ui/issue-27433.rs b/src/test/ui/issues/issue-27433.rs similarity index 100% rename from src/test/ui/issue-27433.rs rename to src/test/ui/issues/issue-27433.rs diff --git a/src/test/ui/issue-27433.stderr b/src/test/ui/issues/issue-27433.stderr similarity index 100% rename from src/test/ui/issue-27433.stderr rename to src/test/ui/issues/issue-27433.stderr diff --git a/src/test/ui/issue-27592.nll.stderr b/src/test/ui/issues/issue-27592.nll.stderr similarity index 100% rename from src/test/ui/issue-27592.nll.stderr rename to src/test/ui/issues/issue-27592.nll.stderr diff --git a/src/test/ui/issue-27592.rs b/src/test/ui/issues/issue-27592.rs similarity index 100% rename from src/test/ui/issue-27592.rs rename to src/test/ui/issues/issue-27592.rs diff --git a/src/test/ui/issue-27592.stderr b/src/test/ui/issues/issue-27592.stderr similarity index 100% rename from src/test/ui/issue-27592.stderr rename to src/test/ui/issues/issue-27592.stderr diff --git a/src/test/ui/issue-27815.rs b/src/test/ui/issues/issue-27815.rs similarity index 100% rename from src/test/ui/issue-27815.rs rename to src/test/ui/issues/issue-27815.rs diff --git a/src/test/ui/issue-27815.stderr b/src/test/ui/issues/issue-27815.stderr similarity index 100% rename from src/test/ui/issue-27815.stderr rename to src/test/ui/issues/issue-27815.stderr diff --git a/src/test/ui/issue-27842.rs b/src/test/ui/issues/issue-27842.rs similarity index 100% rename from src/test/ui/issue-27842.rs rename to src/test/ui/issues/issue-27842.rs diff --git a/src/test/ui/issue-27842.stderr b/src/test/ui/issues/issue-27842.stderr similarity index 100% rename from src/test/ui/issue-27842.stderr rename to src/test/ui/issues/issue-27842.stderr diff --git a/src/test/ui/issue-27895.rs b/src/test/ui/issues/issue-27895.rs similarity index 100% rename from src/test/ui/issue-27895.rs rename to src/test/ui/issues/issue-27895.rs diff --git a/src/test/ui/issue-27895.stderr b/src/test/ui/issues/issue-27895.stderr similarity index 100% rename from src/test/ui/issue-27895.stderr rename to src/test/ui/issues/issue-27895.stderr diff --git a/src/test/ui/issue-27942.rs b/src/test/ui/issues/issue-27942.rs similarity index 100% rename from src/test/ui/issue-27942.rs rename to src/test/ui/issues/issue-27942.rs diff --git a/src/test/ui/issue-27942.stderr b/src/test/ui/issues/issue-27942.stderr similarity index 100% rename from src/test/ui/issue-27942.stderr rename to src/test/ui/issues/issue-27942.stderr diff --git a/src/test/ui/compile-fail-migration/issue-28075.rs b/src/test/ui/issues/issue-28075.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-28075.rs rename to src/test/ui/issues/issue-28075.rs diff --git a/src/test/ui/compile-fail-migration/issue-28075.stderr b/src/test/ui/issues/issue-28075.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-28075.stderr rename to src/test/ui/issues/issue-28075.stderr diff --git a/src/test/ui/issue-28098.rs b/src/test/ui/issues/issue-28098.rs similarity index 100% rename from src/test/ui/issue-28098.rs rename to src/test/ui/issues/issue-28098.rs diff --git a/src/test/ui/issue-28098.stderr b/src/test/ui/issues/issue-28098.stderr similarity index 100% rename from src/test/ui/issue-28098.stderr rename to src/test/ui/issues/issue-28098.stderr diff --git a/src/test/ui/issue-28105.rs b/src/test/ui/issues/issue-28105.rs similarity index 100% rename from src/test/ui/issue-28105.rs rename to src/test/ui/issues/issue-28105.rs diff --git a/src/test/ui/issue-28105.stderr b/src/test/ui/issues/issue-28105.stderr similarity index 100% rename from src/test/ui/issue-28105.stderr rename to src/test/ui/issues/issue-28105.stderr diff --git a/src/test/ui/issue-28109.rs b/src/test/ui/issues/issue-28109.rs similarity index 100% rename from src/test/ui/issue-28109.rs rename to src/test/ui/issues/issue-28109.rs diff --git a/src/test/ui/issue-28109.stderr b/src/test/ui/issues/issue-28109.stderr similarity index 100% rename from src/test/ui/issue-28109.stderr rename to src/test/ui/issues/issue-28109.stderr diff --git a/src/test/ui/issue-28113.rs b/src/test/ui/issues/issue-28113.rs similarity index 100% rename from src/test/ui/issue-28113.rs rename to src/test/ui/issues/issue-28113.rs diff --git a/src/test/ui/issue-28113.stderr b/src/test/ui/issues/issue-28113.stderr similarity index 100% rename from src/test/ui/issue-28113.stderr rename to src/test/ui/issues/issue-28113.stderr diff --git a/src/test/ui/issue-2823.rs b/src/test/ui/issues/issue-2823.rs similarity index 100% rename from src/test/ui/issue-2823.rs rename to src/test/ui/issues/issue-2823.rs diff --git a/src/test/ui/issue-2823.stderr b/src/test/ui/issues/issue-2823.stderr similarity index 100% rename from src/test/ui/issue-2823.stderr rename to src/test/ui/issues/issue-2823.stderr diff --git a/src/test/ui/issue-28324.rs b/src/test/ui/issues/issue-28324.rs similarity index 100% rename from src/test/ui/issue-28324.rs rename to src/test/ui/issues/issue-28324.rs diff --git a/src/test/ui/issue-28324.stderr b/src/test/ui/issues/issue-28324.stderr similarity index 100% rename from src/test/ui/issue-28324.stderr rename to src/test/ui/issues/issue-28324.stderr diff --git a/src/test/ui/issue-28344.rs b/src/test/ui/issues/issue-28344.rs similarity index 100% rename from src/test/ui/issue-28344.rs rename to src/test/ui/issues/issue-28344.rs diff --git a/src/test/ui/issue-28344.stderr b/src/test/ui/issues/issue-28344.stderr similarity index 100% rename from src/test/ui/issue-28344.stderr rename to src/test/ui/issues/issue-28344.stderr diff --git a/src/test/ui/compile-fail-migration/issue-28388-1.rs b/src/test/ui/issues/issue-28388-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-28388-1.rs rename to src/test/ui/issues/issue-28388-1.rs diff --git a/src/test/ui/compile-fail-migration/issue-28388-1.stderr b/src/test/ui/issues/issue-28388-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-28388-1.stderr rename to src/test/ui/issues/issue-28388-1.stderr diff --git a/src/test/ui/compile-fail-migration/issue-28388-2.rs b/src/test/ui/issues/issue-28388-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-28388-2.rs rename to src/test/ui/issues/issue-28388-2.rs diff --git a/src/test/ui/compile-fail-migration/issue-28388-2.stderr b/src/test/ui/issues/issue-28388-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-28388-2.stderr rename to src/test/ui/issues/issue-28388-2.stderr diff --git a/src/test/ui/compile-fail-migration/issue-28388-3.rs b/src/test/ui/issues/issue-28388-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-28388-3.rs rename to src/test/ui/issues/issue-28388-3.rs diff --git a/src/test/ui/compile-fail-migration/issue-28388-3.stderr b/src/test/ui/issues/issue-28388-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-28388-3.stderr rename to src/test/ui/issues/issue-28388-3.stderr diff --git a/src/test/ui/issue-28433.rs b/src/test/ui/issues/issue-28433.rs similarity index 100% rename from src/test/ui/issue-28433.rs rename to src/test/ui/issues/issue-28433.rs diff --git a/src/test/ui/issue-28433.stderr b/src/test/ui/issues/issue-28433.stderr similarity index 100% rename from src/test/ui/issue-28433.stderr rename to src/test/ui/issues/issue-28433.stderr diff --git a/src/test/ui/issue-28472.rs b/src/test/ui/issues/issue-28472.rs similarity index 100% rename from src/test/ui/issue-28472.rs rename to src/test/ui/issues/issue-28472.rs diff --git a/src/test/ui/issue-28472.stderr b/src/test/ui/issues/issue-28472.stderr similarity index 100% rename from src/test/ui/issue-28472.stderr rename to src/test/ui/issues/issue-28472.stderr diff --git a/src/test/ui/issue-2848.rs b/src/test/ui/issues/issue-2848.rs similarity index 100% rename from src/test/ui/issue-2848.rs rename to src/test/ui/issues/issue-2848.rs diff --git a/src/test/ui/issue-2848.stderr b/src/test/ui/issues/issue-2848.stderr similarity index 100% rename from src/test/ui/issue-2848.stderr rename to src/test/ui/issues/issue-2848.stderr diff --git a/src/test/ui/issue-2849.rs b/src/test/ui/issues/issue-2849.rs similarity index 100% rename from src/test/ui/issue-2849.rs rename to src/test/ui/issues/issue-2849.rs diff --git a/src/test/ui/issue-2849.stderr b/src/test/ui/issues/issue-2849.stderr similarity index 100% rename from src/test/ui/issue-2849.stderr rename to src/test/ui/issues/issue-2849.stderr diff --git a/src/test/ui/issue-28568.rs b/src/test/ui/issues/issue-28568.rs similarity index 100% rename from src/test/ui/issue-28568.rs rename to src/test/ui/issues/issue-28568.rs diff --git a/src/test/ui/issue-28568.stderr b/src/test/ui/issues/issue-28568.stderr similarity index 100% rename from src/test/ui/issue-28568.stderr rename to src/test/ui/issues/issue-28568.stderr diff --git a/src/test/ui/issue-28576.rs b/src/test/ui/issues/issue-28576.rs similarity index 100% rename from src/test/ui/issue-28576.rs rename to src/test/ui/issues/issue-28576.rs diff --git a/src/test/ui/issue-28576.stderr b/src/test/ui/issues/issue-28576.stderr similarity index 100% rename from src/test/ui/issue-28576.stderr rename to src/test/ui/issues/issue-28576.stderr diff --git a/src/test/ui/issue-28586.rs b/src/test/ui/issues/issue-28586.rs similarity index 100% rename from src/test/ui/issue-28586.rs rename to src/test/ui/issues/issue-28586.rs diff --git a/src/test/ui/issue-28586.stderr b/src/test/ui/issues/issue-28586.stderr similarity index 100% rename from src/test/ui/issue-28586.stderr rename to src/test/ui/issues/issue-28586.stderr diff --git a/src/test/ui/compile-fail-migration/issue-28625.rs b/src/test/ui/issues/issue-28625.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-28625.rs rename to src/test/ui/issues/issue-28625.rs diff --git a/src/test/ui/compile-fail-migration/issue-28625.stderr b/src/test/ui/issues/issue-28625.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-28625.stderr rename to src/test/ui/issues/issue-28625.stderr diff --git a/src/test/ui/issue-28776.rs b/src/test/ui/issues/issue-28776.rs similarity index 100% rename from src/test/ui/issue-28776.rs rename to src/test/ui/issues/issue-28776.rs diff --git a/src/test/ui/issue-28776.stderr b/src/test/ui/issues/issue-28776.stderr similarity index 100% rename from src/test/ui/issue-28776.stderr rename to src/test/ui/issues/issue-28776.stderr diff --git a/src/test/ui/issue-28837.rs b/src/test/ui/issues/issue-28837.rs similarity index 100% rename from src/test/ui/issue-28837.rs rename to src/test/ui/issues/issue-28837.rs diff --git a/src/test/ui/issue-28837.stderr b/src/test/ui/issues/issue-28837.stderr similarity index 100% rename from src/test/ui/issue-28837.stderr rename to src/test/ui/issues/issue-28837.stderr diff --git a/src/test/ui/compile-fail-migration/issue-28848.rs b/src/test/ui/issues/issue-28848.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-28848.rs rename to src/test/ui/issues/issue-28848.rs diff --git a/src/test/ui/compile-fail-migration/issue-28848.stderr b/src/test/ui/issues/issue-28848.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-28848.stderr rename to src/test/ui/issues/issue-28848.stderr diff --git a/src/test/ui/issue-28971.rs b/src/test/ui/issues/issue-28971.rs similarity index 100% rename from src/test/ui/issue-28971.rs rename to src/test/ui/issues/issue-28971.rs diff --git a/src/test/ui/issue-28971.stderr b/src/test/ui/issues/issue-28971.stderr similarity index 100% rename from src/test/ui/issue-28971.stderr rename to src/test/ui/issues/issue-28971.stderr diff --git a/src/test/ui/issue-28992-empty.rs b/src/test/ui/issues/issue-28992-empty.rs similarity index 100% rename from src/test/ui/issue-28992-empty.rs rename to src/test/ui/issues/issue-28992-empty.rs diff --git a/src/test/ui/issue-28992-empty.stderr b/src/test/ui/issues/issue-28992-empty.stderr similarity index 100% rename from src/test/ui/issue-28992-empty.stderr rename to src/test/ui/issues/issue-28992-empty.stderr diff --git a/src/test/ui/issue-29084.rs b/src/test/ui/issues/issue-29084.rs similarity index 100% rename from src/test/ui/issue-29084.rs rename to src/test/ui/issues/issue-29084.rs diff --git a/src/test/ui/issue-29084.stderr b/src/test/ui/issues/issue-29084.stderr similarity index 100% rename from src/test/ui/issue-29084.stderr rename to src/test/ui/issues/issue-29084.stderr diff --git a/src/test/ui/issue-29124.rs b/src/test/ui/issues/issue-29124.rs similarity index 100% rename from src/test/ui/issue-29124.rs rename to src/test/ui/issues/issue-29124.rs diff --git a/src/test/ui/issue-29124.stderr b/src/test/ui/issues/issue-29124.stderr similarity index 100% rename from src/test/ui/issue-29124.stderr rename to src/test/ui/issues/issue-29124.stderr diff --git a/src/test/ui/issue-29147.rs b/src/test/ui/issues/issue-29147.rs similarity index 100% rename from src/test/ui/issue-29147.rs rename to src/test/ui/issues/issue-29147.rs diff --git a/src/test/ui/issue-29147.stderr b/src/test/ui/issues/issue-29147.stderr similarity index 100% rename from src/test/ui/issue-29147.stderr rename to src/test/ui/issues/issue-29147.stderr diff --git a/src/test/ui/issue-29161.rs b/src/test/ui/issues/issue-29161.rs similarity index 100% rename from src/test/ui/issue-29161.rs rename to src/test/ui/issues/issue-29161.rs diff --git a/src/test/ui/issue-29161.stderr b/src/test/ui/issues/issue-29161.stderr similarity index 100% rename from src/test/ui/issue-29161.stderr rename to src/test/ui/issues/issue-29161.stderr diff --git a/src/test/ui/compile-fail-migration/issue-29181.rs b/src/test/ui/issues/issue-29181.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-29181.rs rename to src/test/ui/issues/issue-29181.rs diff --git a/src/test/ui/compile-fail-migration/issue-29181.stderr b/src/test/ui/issues/issue-29181.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-29181.stderr rename to src/test/ui/issues/issue-29181.stderr diff --git a/src/test/ui/issue-29184.rs b/src/test/ui/issues/issue-29184.rs similarity index 100% rename from src/test/ui/issue-29184.rs rename to src/test/ui/issues/issue-29184.rs diff --git a/src/test/ui/issue-29184.stderr b/src/test/ui/issues/issue-29184.stderr similarity index 100% rename from src/test/ui/issue-29184.stderr rename to src/test/ui/issues/issue-29184.stderr diff --git a/src/test/ui/issue-2937.rs b/src/test/ui/issues/issue-2937.rs similarity index 100% rename from src/test/ui/issue-2937.rs rename to src/test/ui/issues/issue-2937.rs diff --git a/src/test/ui/issue-2937.stderr b/src/test/ui/issues/issue-2937.stderr similarity index 100% rename from src/test/ui/issue-2937.stderr rename to src/test/ui/issues/issue-2937.stderr diff --git a/src/test/ui/issue-2951.rs b/src/test/ui/issues/issue-2951.rs similarity index 100% rename from src/test/ui/issue-2951.rs rename to src/test/ui/issues/issue-2951.rs diff --git a/src/test/ui/issue-2951.stderr b/src/test/ui/issues/issue-2951.stderr similarity index 100% rename from src/test/ui/issue-2951.stderr rename to src/test/ui/issues/issue-2951.stderr diff --git a/src/test/ui/issue-29723.rs b/src/test/ui/issues/issue-29723.rs similarity index 100% rename from src/test/ui/issue-29723.rs rename to src/test/ui/issues/issue-29723.rs diff --git a/src/test/ui/issue-29723.stderr b/src/test/ui/issues/issue-29723.stderr similarity index 100% rename from src/test/ui/issue-29723.stderr rename to src/test/ui/issues/issue-29723.stderr diff --git a/src/test/ui/issue-29857.rs b/src/test/ui/issues/issue-29857.rs similarity index 100% rename from src/test/ui/issue-29857.rs rename to src/test/ui/issues/issue-29857.rs diff --git a/src/test/ui/issue-29857.stderr b/src/test/ui/issues/issue-29857.stderr similarity index 100% rename from src/test/ui/issue-29857.stderr rename to src/test/ui/issues/issue-29857.stderr diff --git a/src/test/ui/issue-29861.rs b/src/test/ui/issues/issue-29861.rs similarity index 100% rename from src/test/ui/issue-29861.rs rename to src/test/ui/issues/issue-29861.rs diff --git a/src/test/ui/issue-29861.stderr b/src/test/ui/issues/issue-29861.stderr similarity index 100% rename from src/test/ui/issue-29861.stderr rename to src/test/ui/issues/issue-29861.stderr diff --git a/src/test/ui/issue-2995.rs b/src/test/ui/issues/issue-2995.rs similarity index 100% rename from src/test/ui/issue-2995.rs rename to src/test/ui/issues/issue-2995.rs diff --git a/src/test/ui/issue-2995.stderr b/src/test/ui/issues/issue-2995.stderr similarity index 100% rename from src/test/ui/issue-2995.stderr rename to src/test/ui/issues/issue-2995.stderr diff --git a/src/test/ui/issue-30007.rs b/src/test/ui/issues/issue-30007.rs similarity index 100% rename from src/test/ui/issue-30007.rs rename to src/test/ui/issues/issue-30007.rs diff --git a/src/test/ui/issue-30007.stderr b/src/test/ui/issues/issue-30007.stderr similarity index 100% rename from src/test/ui/issue-30007.stderr rename to src/test/ui/issues/issue-30007.stderr diff --git a/src/test/ui/issue-30079.rs b/src/test/ui/issues/issue-30079.rs similarity index 100% rename from src/test/ui/issue-30079.rs rename to src/test/ui/issues/issue-30079.rs diff --git a/src/test/ui/issue-30079.stderr b/src/test/ui/issues/issue-30079.stderr similarity index 100% rename from src/test/ui/issue-30079.stderr rename to src/test/ui/issues/issue-30079.stderr diff --git a/src/test/ui/issue-3008-1.rs b/src/test/ui/issues/issue-3008-1.rs similarity index 100% rename from src/test/ui/issue-3008-1.rs rename to src/test/ui/issues/issue-3008-1.rs diff --git a/src/test/ui/issue-3008-1.stderr b/src/test/ui/issues/issue-3008-1.stderr similarity index 100% rename from src/test/ui/issue-3008-1.stderr rename to src/test/ui/issues/issue-3008-1.stderr diff --git a/src/test/ui/issue-3008-2.rs b/src/test/ui/issues/issue-3008-2.rs similarity index 100% rename from src/test/ui/issue-3008-2.rs rename to src/test/ui/issues/issue-3008-2.rs diff --git a/src/test/ui/issue-3008-2.stderr b/src/test/ui/issues/issue-3008-2.stderr similarity index 100% rename from src/test/ui/issue-3008-2.stderr rename to src/test/ui/issues/issue-3008-2.stderr diff --git a/src/test/ui/issue-3008-3.rs b/src/test/ui/issues/issue-3008-3.rs similarity index 100% rename from src/test/ui/issue-3008-3.rs rename to src/test/ui/issues/issue-3008-3.rs diff --git a/src/test/ui/issue-3008-3.stderr b/src/test/ui/issues/issue-3008-3.stderr similarity index 100% rename from src/test/ui/issue-3008-3.stderr rename to src/test/ui/issues/issue-3008-3.stderr diff --git a/src/test/ui/compile-fail-migration/issue-30123.rs b/src/test/ui/issues/issue-30123.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-30123.rs rename to src/test/ui/issues/issue-30123.rs diff --git a/src/test/ui/compile-fail-migration/issue-30123.stderr b/src/test/ui/issues/issue-30123.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-30123.stderr rename to src/test/ui/issues/issue-30123.stderr diff --git a/src/test/ui/issue-3021-b.rs b/src/test/ui/issues/issue-3021-b.rs similarity index 100% rename from src/test/ui/issue-3021-b.rs rename to src/test/ui/issues/issue-3021-b.rs diff --git a/src/test/ui/issue-3021-b.stderr b/src/test/ui/issues/issue-3021-b.stderr similarity index 100% rename from src/test/ui/issue-3021-b.stderr rename to src/test/ui/issues/issue-3021-b.stderr diff --git a/src/test/ui/issue-3021-c.rs b/src/test/ui/issues/issue-3021-c.rs similarity index 100% rename from src/test/ui/issue-3021-c.rs rename to src/test/ui/issues/issue-3021-c.rs diff --git a/src/test/ui/issue-3021-c.stderr b/src/test/ui/issues/issue-3021-c.stderr similarity index 100% rename from src/test/ui/issue-3021-c.stderr rename to src/test/ui/issues/issue-3021-c.stderr diff --git a/src/test/ui/issue-3021-d.rs b/src/test/ui/issues/issue-3021-d.rs similarity index 100% rename from src/test/ui/issue-3021-d.rs rename to src/test/ui/issues/issue-3021-d.rs diff --git a/src/test/ui/issue-3021-d.stderr b/src/test/ui/issues/issue-3021-d.stderr similarity index 100% rename from src/test/ui/issue-3021-d.stderr rename to src/test/ui/issues/issue-3021-d.stderr diff --git a/src/test/ui/issue-3021.rs b/src/test/ui/issues/issue-3021.rs similarity index 100% rename from src/test/ui/issue-3021.rs rename to src/test/ui/issues/issue-3021.rs diff --git a/src/test/ui/issue-3021.stderr b/src/test/ui/issues/issue-3021.stderr similarity index 100% rename from src/test/ui/issue-3021.stderr rename to src/test/ui/issues/issue-3021.stderr diff --git a/src/test/ui/issue-30225.rs b/src/test/ui/issues/issue-30225.rs similarity index 100% rename from src/test/ui/issue-30225.rs rename to src/test/ui/issues/issue-30225.rs diff --git a/src/test/ui/issue-30225.stderr b/src/test/ui/issues/issue-30225.stderr similarity index 100% rename from src/test/ui/issue-30225.stderr rename to src/test/ui/issues/issue-30225.stderr diff --git a/src/test/ui/issue-30236.rs b/src/test/ui/issues/issue-30236.rs similarity index 100% rename from src/test/ui/issue-30236.rs rename to src/test/ui/issues/issue-30236.rs diff --git a/src/test/ui/issue-30236.stderr b/src/test/ui/issues/issue-30236.stderr similarity index 100% rename from src/test/ui/issue-30236.stderr rename to src/test/ui/issues/issue-30236.stderr diff --git a/src/test/ui/issue-30240-b.rs b/src/test/ui/issues/issue-30240-b.rs similarity index 100% rename from src/test/ui/issue-30240-b.rs rename to src/test/ui/issues/issue-30240-b.rs diff --git a/src/test/ui/issue-30240-b.stderr b/src/test/ui/issues/issue-30240-b.stderr similarity index 100% rename from src/test/ui/issue-30240-b.stderr rename to src/test/ui/issues/issue-30240-b.stderr diff --git a/src/test/ui/issue-30240.rs b/src/test/ui/issues/issue-30240.rs similarity index 100% rename from src/test/ui/issue-30240.rs rename to src/test/ui/issues/issue-30240.rs diff --git a/src/test/ui/issue-30240.stderr b/src/test/ui/issues/issue-30240.stderr similarity index 100% rename from src/test/ui/issue-30240.stderr rename to src/test/ui/issues/issue-30240.stderr diff --git a/src/test/ui/issue-30255.rs b/src/test/ui/issues/issue-30255.rs similarity index 100% rename from src/test/ui/issue-30255.rs rename to src/test/ui/issues/issue-30255.rs diff --git a/src/test/ui/issue-30255.stderr b/src/test/ui/issues/issue-30255.stderr similarity index 100% rename from src/test/ui/issue-30255.stderr rename to src/test/ui/issues/issue-30255.stderr diff --git a/src/test/ui/issue-30302.rs b/src/test/ui/issues/issue-30302.rs similarity index 100% rename from src/test/ui/issue-30302.rs rename to src/test/ui/issues/issue-30302.rs diff --git a/src/test/ui/issue-30302.stderr b/src/test/ui/issues/issue-30302.stderr similarity index 100% rename from src/test/ui/issue-30302.stderr rename to src/test/ui/issues/issue-30302.stderr diff --git a/src/test/ui/issue-30355.nll.stderr b/src/test/ui/issues/issue-30355.nll.stderr similarity index 100% rename from src/test/ui/issue-30355.nll.stderr rename to src/test/ui/issues/issue-30355.nll.stderr diff --git a/src/test/ui/issue-30355.rs b/src/test/ui/issues/issue-30355.rs similarity index 100% rename from src/test/ui/issue-30355.rs rename to src/test/ui/issues/issue-30355.rs diff --git a/src/test/ui/issue-30355.stderr b/src/test/ui/issues/issue-30355.stderr similarity index 100% rename from src/test/ui/issue-30355.stderr rename to src/test/ui/issues/issue-30355.stderr diff --git a/src/test/ui/issue-3038.rs b/src/test/ui/issues/issue-3038.rs similarity index 100% rename from src/test/ui/issue-3038.rs rename to src/test/ui/issues/issue-3038.rs diff --git a/src/test/ui/issue-3038.stderr b/src/test/ui/issues/issue-3038.stderr similarity index 100% rename from src/test/ui/issue-3038.stderr rename to src/test/ui/issues/issue-3038.stderr diff --git a/src/test/ui/issue-30438-a.nll.stderr b/src/test/ui/issues/issue-30438-a.nll.stderr similarity index 100% rename from src/test/ui/issue-30438-a.nll.stderr rename to src/test/ui/issues/issue-30438-a.nll.stderr diff --git a/src/test/ui/issue-30438-a.rs b/src/test/ui/issues/issue-30438-a.rs similarity index 100% rename from src/test/ui/issue-30438-a.rs rename to src/test/ui/issues/issue-30438-a.rs diff --git a/src/test/ui/issue-30438-a.stderr b/src/test/ui/issues/issue-30438-a.stderr similarity index 100% rename from src/test/ui/issue-30438-a.stderr rename to src/test/ui/issues/issue-30438-a.stderr diff --git a/src/test/ui/issue-30438-b.rs b/src/test/ui/issues/issue-30438-b.rs similarity index 100% rename from src/test/ui/issue-30438-b.rs rename to src/test/ui/issues/issue-30438-b.rs diff --git a/src/test/ui/issue-30438-b.stderr b/src/test/ui/issues/issue-30438-b.stderr similarity index 100% rename from src/test/ui/issue-30438-b.stderr rename to src/test/ui/issues/issue-30438-b.stderr diff --git a/src/test/ui/issue-30438-c.nll.stderr b/src/test/ui/issues/issue-30438-c.nll.stderr similarity index 100% rename from src/test/ui/issue-30438-c.nll.stderr rename to src/test/ui/issues/issue-30438-c.nll.stderr diff --git a/src/test/ui/issue-30438-c.rs b/src/test/ui/issues/issue-30438-c.rs similarity index 100% rename from src/test/ui/issue-30438-c.rs rename to src/test/ui/issues/issue-30438-c.rs diff --git a/src/test/ui/issue-30438-c.stderr b/src/test/ui/issues/issue-30438-c.stderr similarity index 100% rename from src/test/ui/issue-30438-c.stderr rename to src/test/ui/issues/issue-30438-c.stderr diff --git a/src/test/ui/issue-3044.rs b/src/test/ui/issues/issue-3044.rs similarity index 100% rename from src/test/ui/issue-3044.rs rename to src/test/ui/issues/issue-3044.rs diff --git a/src/test/ui/issue-3044.stderr b/src/test/ui/issues/issue-3044.stderr similarity index 100% rename from src/test/ui/issue-3044.stderr rename to src/test/ui/issues/issue-3044.stderr diff --git a/src/test/ui/compile-fail-migration/issue-30535.rs b/src/test/ui/issues/issue-30535.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-30535.rs rename to src/test/ui/issues/issue-30535.rs diff --git a/src/test/ui/compile-fail-migration/issue-30535.stderr b/src/test/ui/issues/issue-30535.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-30535.stderr rename to src/test/ui/issues/issue-30535.stderr diff --git a/src/test/ui/issue-30560.rs b/src/test/ui/issues/issue-30560.rs similarity index 100% rename from src/test/ui/issue-30560.rs rename to src/test/ui/issues/issue-30560.rs diff --git a/src/test/ui/issue-30560.stderr b/src/test/ui/issues/issue-30560.stderr similarity index 100% rename from src/test/ui/issue-30560.stderr rename to src/test/ui/issues/issue-30560.stderr diff --git a/src/test/ui/issue-30589.rs b/src/test/ui/issues/issue-30589.rs similarity index 100% rename from src/test/ui/issue-30589.rs rename to src/test/ui/issues/issue-30589.rs diff --git a/src/test/ui/issue-30589.stderr b/src/test/ui/issues/issue-30589.stderr similarity index 100% rename from src/test/ui/issue-30589.stderr rename to src/test/ui/issues/issue-30589.stderr diff --git a/src/test/ui/issue-30730.rs b/src/test/ui/issues/issue-30730.rs similarity index 100% rename from src/test/ui/issue-30730.rs rename to src/test/ui/issues/issue-30730.rs diff --git a/src/test/ui/issue-30730.stderr b/src/test/ui/issues/issue-30730.stderr similarity index 100% rename from src/test/ui/issue-30730.stderr rename to src/test/ui/issues/issue-30730.stderr diff --git a/src/test/ui/issue-3080.rs b/src/test/ui/issues/issue-3080.rs similarity index 100% rename from src/test/ui/issue-3080.rs rename to src/test/ui/issues/issue-3080.rs diff --git a/src/test/ui/issue-3080.stderr b/src/test/ui/issues/issue-3080.stderr similarity index 100% rename from src/test/ui/issue-3080.stderr rename to src/test/ui/issues/issue-3080.stderr diff --git a/src/test/ui/issue-3096-1.rs b/src/test/ui/issues/issue-3096-1.rs similarity index 100% rename from src/test/ui/issue-3096-1.rs rename to src/test/ui/issues/issue-3096-1.rs diff --git a/src/test/ui/issue-3096-1.stderr b/src/test/ui/issues/issue-3096-1.stderr similarity index 100% rename from src/test/ui/issue-3096-1.stderr rename to src/test/ui/issues/issue-3096-1.stderr diff --git a/src/test/ui/issue-3096-2.rs b/src/test/ui/issues/issue-3096-2.rs similarity index 100% rename from src/test/ui/issue-3096-2.rs rename to src/test/ui/issues/issue-3096-2.rs diff --git a/src/test/ui/issue-3096-2.stderr b/src/test/ui/issues/issue-3096-2.stderr similarity index 100% rename from src/test/ui/issue-3096-2.stderr rename to src/test/ui/issues/issue-3096-2.stderr diff --git a/src/test/ui/issue-3099-a.rs b/src/test/ui/issues/issue-3099-a.rs similarity index 100% rename from src/test/ui/issue-3099-a.rs rename to src/test/ui/issues/issue-3099-a.rs diff --git a/src/test/ui/issue-3099-a.stderr b/src/test/ui/issues/issue-3099-a.stderr similarity index 100% rename from src/test/ui/issue-3099-a.stderr rename to src/test/ui/issues/issue-3099-a.stderr diff --git a/src/test/ui/issue-3099-b.rs b/src/test/ui/issues/issue-3099-b.rs similarity index 100% rename from src/test/ui/issue-3099-b.rs rename to src/test/ui/issues/issue-3099-b.rs diff --git a/src/test/ui/issue-3099-b.stderr b/src/test/ui/issues/issue-3099-b.stderr similarity index 100% rename from src/test/ui/issue-3099-b.stderr rename to src/test/ui/issues/issue-3099-b.stderr diff --git a/src/test/ui/issue-3099.rs b/src/test/ui/issues/issue-3099.rs similarity index 100% rename from src/test/ui/issue-3099.rs rename to src/test/ui/issues/issue-3099.rs diff --git a/src/test/ui/issue-3099.stderr b/src/test/ui/issues/issue-3099.stderr similarity index 100% rename from src/test/ui/issue-3099.stderr rename to src/test/ui/issues/issue-3099.stderr diff --git a/src/test/ui/issue-31011.rs b/src/test/ui/issues/issue-31011.rs similarity index 100% rename from src/test/ui/issue-31011.rs rename to src/test/ui/issues/issue-31011.rs diff --git a/src/test/ui/issue-31011.stderr b/src/test/ui/issues/issue-31011.stderr similarity index 100% rename from src/test/ui/issue-31011.stderr rename to src/test/ui/issues/issue-31011.stderr diff --git a/src/test/ui/issue-31109.rs b/src/test/ui/issues/issue-31109.rs similarity index 100% rename from src/test/ui/issue-31109.rs rename to src/test/ui/issues/issue-31109.rs diff --git a/src/test/ui/issue-31109.stderr b/src/test/ui/issues/issue-31109.stderr similarity index 100% rename from src/test/ui/issue-31109.stderr rename to src/test/ui/issues/issue-31109.stderr diff --git a/src/test/ui/issue-31173.rs b/src/test/ui/issues/issue-31173.rs similarity index 100% rename from src/test/ui/issue-31173.rs rename to src/test/ui/issues/issue-31173.rs diff --git a/src/test/ui/issue-31173.stderr b/src/test/ui/issues/issue-31173.stderr similarity index 100% rename from src/test/ui/issue-31173.stderr rename to src/test/ui/issues/issue-31173.stderr diff --git a/src/test/ui/issue-31212.rs b/src/test/ui/issues/issue-31212.rs similarity index 100% rename from src/test/ui/issue-31212.rs rename to src/test/ui/issues/issue-31212.rs diff --git a/src/test/ui/issue-31212.stderr b/src/test/ui/issues/issue-31212.stderr similarity index 100% rename from src/test/ui/issue-31212.stderr rename to src/test/ui/issues/issue-31212.stderr diff --git a/src/test/ui/issue-31221.rs b/src/test/ui/issues/issue-31221.rs similarity index 100% rename from src/test/ui/issue-31221.rs rename to src/test/ui/issues/issue-31221.rs diff --git a/src/test/ui/issue-31221.stderr b/src/test/ui/issues/issue-31221.stderr similarity index 100% rename from src/test/ui/issue-31221.stderr rename to src/test/ui/issues/issue-31221.stderr diff --git a/src/test/ui/issue-31495.rs b/src/test/ui/issues/issue-31495.rs similarity index 100% rename from src/test/ui/issue-31495.rs rename to src/test/ui/issues/issue-31495.rs diff --git a/src/test/ui/issue-31511.rs b/src/test/ui/issues/issue-31511.rs similarity index 100% rename from src/test/ui/issue-31511.rs rename to src/test/ui/issues/issue-31511.rs diff --git a/src/test/ui/issue-31511.stderr b/src/test/ui/issues/issue-31511.stderr similarity index 100% rename from src/test/ui/issue-31511.stderr rename to src/test/ui/issues/issue-31511.stderr diff --git a/src/test/ui/issue-3154.nll.stderr b/src/test/ui/issues/issue-3154.nll.stderr similarity index 100% rename from src/test/ui/issue-3154.nll.stderr rename to src/test/ui/issues/issue-3154.nll.stderr diff --git a/src/test/ui/issue-3154.rs b/src/test/ui/issues/issue-3154.rs similarity index 100% rename from src/test/ui/issue-3154.rs rename to src/test/ui/issues/issue-3154.rs diff --git a/src/test/ui/issue-3154.stderr b/src/test/ui/issues/issue-3154.stderr similarity index 100% rename from src/test/ui/issue-3154.stderr rename to src/test/ui/issues/issue-3154.stderr diff --git a/src/test/ui/issue-31561.rs b/src/test/ui/issues/issue-31561.rs similarity index 100% rename from src/test/ui/issue-31561.rs rename to src/test/ui/issues/issue-31561.rs diff --git a/src/test/ui/issue-31561.stderr b/src/test/ui/issues/issue-31561.stderr similarity index 100% rename from src/test/ui/issue-31561.stderr rename to src/test/ui/issues/issue-31561.stderr diff --git a/src/test/ui/issue-31769.rs b/src/test/ui/issues/issue-31769.rs similarity index 100% rename from src/test/ui/issue-31769.rs rename to src/test/ui/issues/issue-31769.rs diff --git a/src/test/ui/issue-31769.stderr b/src/test/ui/issues/issue-31769.stderr similarity index 100% rename from src/test/ui/issue-31769.stderr rename to src/test/ui/issues/issue-31769.stderr diff --git a/src/test/ui/issue-31804.rs b/src/test/ui/issues/issue-31804.rs similarity index 100% rename from src/test/ui/issue-31804.rs rename to src/test/ui/issues/issue-31804.rs diff --git a/src/test/ui/issue-31804.stderr b/src/test/ui/issues/issue-31804.stderr similarity index 100% rename from src/test/ui/issue-31804.stderr rename to src/test/ui/issues/issue-31804.stderr diff --git a/src/test/ui/issue-31845.rs b/src/test/ui/issues/issue-31845.rs similarity index 100% rename from src/test/ui/issue-31845.rs rename to src/test/ui/issues/issue-31845.rs diff --git a/src/test/ui/issue-31845.stderr b/src/test/ui/issues/issue-31845.stderr similarity index 100% rename from src/test/ui/issue-31845.stderr rename to src/test/ui/issues/issue-31845.stderr diff --git a/src/test/ui/issue-31910.rs b/src/test/ui/issues/issue-31910.rs similarity index 100% rename from src/test/ui/issue-31910.rs rename to src/test/ui/issues/issue-31910.rs diff --git a/src/test/ui/issue-31910.stderr b/src/test/ui/issues/issue-31910.stderr similarity index 100% rename from src/test/ui/issue-31910.stderr rename to src/test/ui/issues/issue-31910.stderr diff --git a/src/test/ui/issue-31924-non-snake-ffi.rs b/src/test/ui/issues/issue-31924-non-snake-ffi.rs similarity index 100% rename from src/test/ui/issue-31924-non-snake-ffi.rs rename to src/test/ui/issues/issue-31924-non-snake-ffi.rs diff --git a/src/test/ui/issue-31924-non-snake-ffi.stderr b/src/test/ui/issues/issue-31924-non-snake-ffi.stderr similarity index 100% rename from src/test/ui/issue-31924-non-snake-ffi.stderr rename to src/test/ui/issues/issue-31924-non-snake-ffi.stderr diff --git a/src/test/ui/issue-32004.rs b/src/test/ui/issues/issue-32004.rs similarity index 100% rename from src/test/ui/issue-32004.rs rename to src/test/ui/issues/issue-32004.rs diff --git a/src/test/ui/issue-32004.stderr b/src/test/ui/issues/issue-32004.stderr similarity index 100% rename from src/test/ui/issue-32004.stderr rename to src/test/ui/issues/issue-32004.stderr diff --git a/src/test/ui/issue-32086.rs b/src/test/ui/issues/issue-32086.rs similarity index 100% rename from src/test/ui/issue-32086.rs rename to src/test/ui/issues/issue-32086.rs diff --git a/src/test/ui/issue-32086.stderr b/src/test/ui/issues/issue-32086.stderr similarity index 100% rename from src/test/ui/issue-32086.stderr rename to src/test/ui/issues/issue-32086.stderr diff --git a/src/test/ui/issue-32119.rs b/src/test/ui/issues/issue-32119.rs similarity index 100% rename from src/test/ui/issue-32119.rs rename to src/test/ui/issues/issue-32119.rs diff --git a/src/test/ui/issue-32119.stderr b/src/test/ui/issues/issue-32119.stderr similarity index 100% rename from src/test/ui/issue-32119.stderr rename to src/test/ui/issues/issue-32119.stderr diff --git a/src/test/ui/issue-3214.rs b/src/test/ui/issues/issue-3214.rs similarity index 100% rename from src/test/ui/issue-3214.rs rename to src/test/ui/issues/issue-3214.rs diff --git a/src/test/ui/issue-3214.stderr b/src/test/ui/issues/issue-3214.stderr similarity index 100% rename from src/test/ui/issue-3214.stderr rename to src/test/ui/issues/issue-3214.stderr diff --git a/src/test/ui/issue-32201.rs b/src/test/ui/issues/issue-32201.rs similarity index 100% rename from src/test/ui/issue-32201.rs rename to src/test/ui/issues/issue-32201.rs diff --git a/src/test/ui/issue-32201.stderr b/src/test/ui/issues/issue-32201.stderr similarity index 100% rename from src/test/ui/issue-32201.stderr rename to src/test/ui/issues/issue-32201.stderr diff --git a/src/test/ui/issue-32222.rs b/src/test/ui/issues/issue-32222.rs similarity index 100% rename from src/test/ui/issue-32222.rs rename to src/test/ui/issues/issue-32222.rs diff --git a/src/test/ui/issue-32222.stderr b/src/test/ui/issues/issue-32222.stderr similarity index 100% rename from src/test/ui/issue-32222.stderr rename to src/test/ui/issues/issue-32222.stderr diff --git a/src/test/ui/issue-32323.rs b/src/test/ui/issues/issue-32323.rs similarity index 100% rename from src/test/ui/issue-32323.rs rename to src/test/ui/issues/issue-32323.rs diff --git a/src/test/ui/issue-32323.stderr b/src/test/ui/issues/issue-32323.stderr similarity index 100% rename from src/test/ui/issue-32323.stderr rename to src/test/ui/issues/issue-32323.stderr diff --git a/src/test/ui/issue-32326.rs b/src/test/ui/issues/issue-32326.rs similarity index 100% rename from src/test/ui/issue-32326.rs rename to src/test/ui/issues/issue-32326.rs diff --git a/src/test/ui/issue-32326.stderr b/src/test/ui/issues/issue-32326.stderr similarity index 100% rename from src/test/ui/issue-32326.stderr rename to src/test/ui/issues/issue-32326.stderr diff --git a/src/test/ui/issue-32354-suggest-import-rename.fixed b/src/test/ui/issues/issue-32354-suggest-import-rename.fixed similarity index 100% rename from src/test/ui/issue-32354-suggest-import-rename.fixed rename to src/test/ui/issues/issue-32354-suggest-import-rename.fixed diff --git a/src/test/ui/issue-32354-suggest-import-rename.rs b/src/test/ui/issues/issue-32354-suggest-import-rename.rs similarity index 100% rename from src/test/ui/issue-32354-suggest-import-rename.rs rename to src/test/ui/issues/issue-32354-suggest-import-rename.rs diff --git a/src/test/ui/issue-32354-suggest-import-rename.stderr b/src/test/ui/issues/issue-32354-suggest-import-rename.stderr similarity index 100% rename from src/test/ui/issue-32354-suggest-import-rename.stderr rename to src/test/ui/issues/issue-32354-suggest-import-rename.stderr diff --git a/src/test/ui/compile-fail-migration/issue-32377.rs b/src/test/ui/issues/issue-32377.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-32377.rs rename to src/test/ui/issues/issue-32377.rs diff --git a/src/test/ui/compile-fail-migration/issue-32377.stderr b/src/test/ui/issues/issue-32377.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-32377.stderr rename to src/test/ui/issues/issue-32377.stderr diff --git a/src/test/ui/issue-32655.rs b/src/test/ui/issues/issue-32655.rs similarity index 100% rename from src/test/ui/issue-32655.rs rename to src/test/ui/issues/issue-32655.rs diff --git a/src/test/ui/issue-32655.stderr b/src/test/ui/issues/issue-32655.stderr similarity index 100% rename from src/test/ui/issue-32655.stderr rename to src/test/ui/issues/issue-32655.stderr diff --git a/src/test/ui/issue-32709.rs b/src/test/ui/issues/issue-32709.rs similarity index 100% rename from src/test/ui/issue-32709.rs rename to src/test/ui/issues/issue-32709.rs diff --git a/src/test/ui/issue-32709.stderr b/src/test/ui/issues/issue-32709.stderr similarity index 100% rename from src/test/ui/issue-32709.stderr rename to src/test/ui/issues/issue-32709.stderr diff --git a/src/test/ui/issue-32782.rs b/src/test/ui/issues/issue-32782.rs similarity index 100% rename from src/test/ui/issue-32782.rs rename to src/test/ui/issues/issue-32782.rs diff --git a/src/test/ui/issue-32782.stderr b/src/test/ui/issues/issue-32782.stderr similarity index 100% rename from src/test/ui/issue-32782.stderr rename to src/test/ui/issues/issue-32782.stderr diff --git a/src/test/ui/issue-32797.rs b/src/test/ui/issues/issue-32797.rs similarity index 100% rename from src/test/ui/issue-32797.rs rename to src/test/ui/issues/issue-32797.rs diff --git a/src/test/ui/issue-32797.stderr b/src/test/ui/issues/issue-32797.stderr similarity index 100% rename from src/test/ui/issue-32797.stderr rename to src/test/ui/issues/issue-32797.stderr diff --git a/src/test/ui/issue-32829.rs b/src/test/ui/issues/issue-32829.rs similarity index 100% rename from src/test/ui/issue-32829.rs rename to src/test/ui/issues/issue-32829.rs diff --git a/src/test/ui/issue-32829.stderr b/src/test/ui/issues/issue-32829.stderr similarity index 100% rename from src/test/ui/issue-32829.stderr rename to src/test/ui/issues/issue-32829.stderr diff --git a/src/test/ui/issue-32833.rs b/src/test/ui/issues/issue-32833.rs similarity index 100% rename from src/test/ui/issue-32833.rs rename to src/test/ui/issues/issue-32833.rs diff --git a/src/test/ui/issue-32833.stderr b/src/test/ui/issues/issue-32833.stderr similarity index 100% rename from src/test/ui/issue-32833.stderr rename to src/test/ui/issues/issue-32833.stderr diff --git a/src/test/ui/issue-32922.rs b/src/test/ui/issues/issue-32922.rs similarity index 100% rename from src/test/ui/issue-32922.rs rename to src/test/ui/issues/issue-32922.rs diff --git a/src/test/ui/issue-32922.stderr b/src/test/ui/issues/issue-32922.stderr similarity index 100% rename from src/test/ui/issue-32922.stderr rename to src/test/ui/issues/issue-32922.stderr diff --git a/src/test/ui/issue-32950.rs b/src/test/ui/issues/issue-32950.rs similarity index 100% rename from src/test/ui/issue-32950.rs rename to src/test/ui/issues/issue-32950.rs diff --git a/src/test/ui/issue-32950.stderr b/src/test/ui/issues/issue-32950.stderr similarity index 100% rename from src/test/ui/issue-32950.stderr rename to src/test/ui/issues/issue-32950.stderr diff --git a/src/test/ui/issue-32963.rs b/src/test/ui/issues/issue-32963.rs similarity index 100% rename from src/test/ui/issue-32963.rs rename to src/test/ui/issues/issue-32963.rs diff --git a/src/test/ui/issue-32963.stderr b/src/test/ui/issues/issue-32963.stderr similarity index 100% rename from src/test/ui/issue-32963.stderr rename to src/test/ui/issues/issue-32963.stderr diff --git a/src/test/ui/issue-32995-2.rs b/src/test/ui/issues/issue-32995-2.rs similarity index 100% rename from src/test/ui/issue-32995-2.rs rename to src/test/ui/issues/issue-32995-2.rs diff --git a/src/test/ui/issue-32995-2.stderr b/src/test/ui/issues/issue-32995-2.stderr similarity index 100% rename from src/test/ui/issue-32995-2.stderr rename to src/test/ui/issues/issue-32995-2.stderr diff --git a/src/test/ui/issue-32995.rs b/src/test/ui/issues/issue-32995.rs similarity index 100% rename from src/test/ui/issue-32995.rs rename to src/test/ui/issues/issue-32995.rs diff --git a/src/test/ui/issue-32995.stderr b/src/test/ui/issues/issue-32995.stderr similarity index 100% rename from src/test/ui/issue-32995.stderr rename to src/test/ui/issues/issue-32995.stderr diff --git a/src/test/ui/issue-33241.rs b/src/test/ui/issues/issue-33241.rs similarity index 100% rename from src/test/ui/issue-33241.rs rename to src/test/ui/issues/issue-33241.rs diff --git a/src/test/ui/issue-33241.stderr b/src/test/ui/issues/issue-33241.stderr similarity index 100% rename from src/test/ui/issue-33241.stderr rename to src/test/ui/issues/issue-33241.stderr diff --git a/src/test/ui/issue-33293.rs b/src/test/ui/issues/issue-33293.rs similarity index 100% rename from src/test/ui/issue-33293.rs rename to src/test/ui/issues/issue-33293.rs diff --git a/src/test/ui/issue-33293.stderr b/src/test/ui/issues/issue-33293.stderr similarity index 100% rename from src/test/ui/issue-33293.stderr rename to src/test/ui/issues/issue-33293.stderr diff --git a/src/test/ui/issue-3344.rs b/src/test/ui/issues/issue-3344.rs similarity index 100% rename from src/test/ui/issue-3344.rs rename to src/test/ui/issues/issue-3344.rs diff --git a/src/test/ui/issue-3344.stderr b/src/test/ui/issues/issue-3344.stderr similarity index 100% rename from src/test/ui/issue-3344.stderr rename to src/test/ui/issues/issue-3344.stderr diff --git a/src/test/ui/issue-33464.rs b/src/test/ui/issues/issue-33464.rs similarity index 100% rename from src/test/ui/issue-33464.rs rename to src/test/ui/issues/issue-33464.rs diff --git a/src/test/ui/issue-33464.stderr b/src/test/ui/issues/issue-33464.stderr similarity index 100% rename from src/test/ui/issue-33464.stderr rename to src/test/ui/issues/issue-33464.stderr diff --git a/src/test/ui/issue-33504.rs b/src/test/ui/issues/issue-33504.rs similarity index 100% rename from src/test/ui/issue-33504.rs rename to src/test/ui/issues/issue-33504.rs diff --git a/src/test/ui/issue-33504.stderr b/src/test/ui/issues/issue-33504.stderr similarity index 100% rename from src/test/ui/issue-33504.stderr rename to src/test/ui/issues/issue-33504.stderr diff --git a/src/test/ui/issue-33525.rs b/src/test/ui/issues/issue-33525.rs similarity index 100% rename from src/test/ui/issue-33525.rs rename to src/test/ui/issues/issue-33525.rs diff --git a/src/test/ui/issue-33525.stderr b/src/test/ui/issues/issue-33525.stderr similarity index 100% rename from src/test/ui/issue-33525.stderr rename to src/test/ui/issues/issue-33525.stderr diff --git a/src/test/ui/issue-33571.rs b/src/test/ui/issues/issue-33571.rs similarity index 100% rename from src/test/ui/issue-33571.rs rename to src/test/ui/issues/issue-33571.rs diff --git a/src/test/ui/issue-33571.stderr b/src/test/ui/issues/issue-33571.stderr similarity index 100% rename from src/test/ui/issue-33571.stderr rename to src/test/ui/issues/issue-33571.stderr diff --git a/src/test/ui/issue-33819.nll.stderr b/src/test/ui/issues/issue-33819.nll.stderr similarity index 100% rename from src/test/ui/issue-33819.nll.stderr rename to src/test/ui/issues/issue-33819.nll.stderr diff --git a/src/test/ui/issue-33819.rs b/src/test/ui/issues/issue-33819.rs similarity index 100% rename from src/test/ui/issue-33819.rs rename to src/test/ui/issues/issue-33819.rs diff --git a/src/test/ui/issue-33819.stderr b/src/test/ui/issues/issue-33819.stderr similarity index 100% rename from src/test/ui/issue-33819.stderr rename to src/test/ui/issues/issue-33819.stderr diff --git a/src/test/ui/issue-33941.rs b/src/test/ui/issues/issue-33941.rs similarity index 100% rename from src/test/ui/issue-33941.rs rename to src/test/ui/issues/issue-33941.rs diff --git a/src/test/ui/issue-33941.stderr b/src/test/ui/issues/issue-33941.stderr similarity index 100% rename from src/test/ui/issue-33941.stderr rename to src/test/ui/issues/issue-33941.stderr diff --git a/src/test/ui/issue-34028.rs b/src/test/ui/issues/issue-34028.rs similarity index 100% rename from src/test/ui/issue-34028.rs rename to src/test/ui/issues/issue-34028.rs diff --git a/src/test/ui/issue-34028.stderr b/src/test/ui/issues/issue-34028.stderr similarity index 100% rename from src/test/ui/issue-34028.stderr rename to src/test/ui/issues/issue-34028.stderr diff --git a/src/test/ui/issue-34047.rs b/src/test/ui/issues/issue-34047.rs similarity index 100% rename from src/test/ui/issue-34047.rs rename to src/test/ui/issues/issue-34047.rs diff --git a/src/test/ui/issue-34047.stderr b/src/test/ui/issues/issue-34047.stderr similarity index 100% rename from src/test/ui/issue-34047.stderr rename to src/test/ui/issues/issue-34047.stderr diff --git a/src/test/ui/issue-34171.rs b/src/test/ui/issues/issue-34171.rs similarity index 100% rename from src/test/ui/issue-34171.rs rename to src/test/ui/issues/issue-34171.rs diff --git a/src/test/ui/issue-34171.stderr b/src/test/ui/issues/issue-34171.stderr similarity index 100% rename from src/test/ui/issue-34171.stderr rename to src/test/ui/issues/issue-34171.stderr diff --git a/src/test/ui/issue-34209.rs b/src/test/ui/issues/issue-34209.rs similarity index 100% rename from src/test/ui/issue-34209.rs rename to src/test/ui/issues/issue-34209.rs diff --git a/src/test/ui/issue-34209.stderr b/src/test/ui/issues/issue-34209.stderr similarity index 100% rename from src/test/ui/issue-34209.stderr rename to src/test/ui/issues/issue-34209.stderr diff --git a/src/test/ui/issue-34222-1.rs b/src/test/ui/issues/issue-34222-1.rs similarity index 100% rename from src/test/ui/issue-34222-1.rs rename to src/test/ui/issues/issue-34222-1.rs diff --git a/src/test/ui/issue-34222-1.stderr b/src/test/ui/issues/issue-34222-1.stderr similarity index 100% rename from src/test/ui/issue-34222-1.stderr rename to src/test/ui/issues/issue-34222-1.stderr diff --git a/src/test/ui/issue-34334.rs b/src/test/ui/issues/issue-34334.rs similarity index 100% rename from src/test/ui/issue-34334.rs rename to src/test/ui/issues/issue-34334.rs diff --git a/src/test/ui/issue-34334.stderr b/src/test/ui/issues/issue-34334.stderr similarity index 100% rename from src/test/ui/issue-34334.stderr rename to src/test/ui/issues/issue-34334.stderr diff --git a/src/test/ui/issue-34349.rs b/src/test/ui/issues/issue-34349.rs similarity index 100% rename from src/test/ui/issue-34349.rs rename to src/test/ui/issues/issue-34349.rs diff --git a/src/test/ui/issue-34349.stderr b/src/test/ui/issues/issue-34349.stderr similarity index 100% rename from src/test/ui/issue-34349.stderr rename to src/test/ui/issues/issue-34349.stderr diff --git a/src/test/ui/issue-34373.rs b/src/test/ui/issues/issue-34373.rs similarity index 100% rename from src/test/ui/issue-34373.rs rename to src/test/ui/issues/issue-34373.rs diff --git a/src/test/ui/issue-34373.stderr b/src/test/ui/issues/issue-34373.stderr similarity index 100% rename from src/test/ui/issue-34373.stderr rename to src/test/ui/issues/issue-34373.stderr diff --git a/src/test/ui/issue-34418.rs b/src/test/ui/issues/issue-34418.rs similarity index 100% rename from src/test/ui/issue-34418.rs rename to src/test/ui/issues/issue-34418.rs diff --git a/src/test/ui/issue-34418.stderr b/src/test/ui/issues/issue-34418.stderr similarity index 100% rename from src/test/ui/issue-34418.stderr rename to src/test/ui/issues/issue-34418.stderr diff --git a/src/test/ui/issue-3477.rs b/src/test/ui/issues/issue-3477.rs similarity index 100% rename from src/test/ui/issue-3477.rs rename to src/test/ui/issues/issue-3477.rs diff --git a/src/test/ui/issue-3477.stderr b/src/test/ui/issues/issue-3477.stderr similarity index 100% rename from src/test/ui/issue-3477.stderr rename to src/test/ui/issues/issue-3477.stderr diff --git a/src/test/ui/issue-34839.rs b/src/test/ui/issues/issue-34839.rs similarity index 100% rename from src/test/ui/issue-34839.rs rename to src/test/ui/issues/issue-34839.rs diff --git a/src/test/ui/issue-34839.stderr b/src/test/ui/issues/issue-34839.stderr similarity index 100% rename from src/test/ui/issue-34839.stderr rename to src/test/ui/issues/issue-34839.stderr diff --git a/src/test/ui/issue-35075.rs b/src/test/ui/issues/issue-35075.rs similarity index 100% rename from src/test/ui/issue-35075.rs rename to src/test/ui/issues/issue-35075.rs diff --git a/src/test/ui/issue-35075.stderr b/src/test/ui/issues/issue-35075.stderr similarity index 100% rename from src/test/ui/issue-35075.stderr rename to src/test/ui/issues/issue-35075.stderr diff --git a/src/test/ui/issue-35139.rs b/src/test/ui/issues/issue-35139.rs similarity index 100% rename from src/test/ui/issue-35139.rs rename to src/test/ui/issues/issue-35139.rs diff --git a/src/test/ui/issue-35139.stderr b/src/test/ui/issues/issue-35139.stderr similarity index 100% rename from src/test/ui/issue-35139.stderr rename to src/test/ui/issues/issue-35139.stderr diff --git a/src/test/ui/issue-3521-2.rs b/src/test/ui/issues/issue-3521-2.rs similarity index 100% rename from src/test/ui/issue-3521-2.rs rename to src/test/ui/issues/issue-3521-2.rs diff --git a/src/test/ui/issue-3521-2.stderr b/src/test/ui/issues/issue-3521-2.stderr similarity index 100% rename from src/test/ui/issue-3521-2.stderr rename to src/test/ui/issues/issue-3521-2.stderr diff --git a/src/test/ui/issue-3521.rs b/src/test/ui/issues/issue-3521.rs similarity index 100% rename from src/test/ui/issue-3521.rs rename to src/test/ui/issues/issue-3521.rs diff --git a/src/test/ui/issue-3521.stderr b/src/test/ui/issues/issue-3521.stderr similarity index 100% rename from src/test/ui/issue-3521.stderr rename to src/test/ui/issues/issue-3521.stderr diff --git a/src/test/ui/issue-35241.rs b/src/test/ui/issues/issue-35241.rs similarity index 100% rename from src/test/ui/issue-35241.rs rename to src/test/ui/issues/issue-35241.rs diff --git a/src/test/ui/issue-35241.stderr b/src/test/ui/issues/issue-35241.stderr similarity index 100% rename from src/test/ui/issue-35241.stderr rename to src/test/ui/issues/issue-35241.stderr diff --git a/src/test/ui/issue-35450.rs b/src/test/ui/issues/issue-35450.rs similarity index 100% rename from src/test/ui/issue-35450.rs rename to src/test/ui/issues/issue-35450.rs diff --git a/src/test/ui/issue-35450.stderr b/src/test/ui/issues/issue-35450.stderr similarity index 100% rename from src/test/ui/issue-35450.stderr rename to src/test/ui/issues/issue-35450.stderr diff --git a/src/test/ui/issue-35570.rs b/src/test/ui/issues/issue-35570.rs similarity index 100% rename from src/test/ui/issue-35570.rs rename to src/test/ui/issues/issue-35570.rs diff --git a/src/test/ui/issue-35570.stderr b/src/test/ui/issues/issue-35570.stderr similarity index 100% rename from src/test/ui/issue-35570.stderr rename to src/test/ui/issues/issue-35570.stderr diff --git a/src/test/ui/issue-35668.rs b/src/test/ui/issues/issue-35668.rs similarity index 100% rename from src/test/ui/issue-35668.rs rename to src/test/ui/issues/issue-35668.rs diff --git a/src/test/ui/issue-35668.stderr b/src/test/ui/issues/issue-35668.stderr similarity index 100% rename from src/test/ui/issue-35668.stderr rename to src/test/ui/issues/issue-35668.stderr diff --git a/src/test/ui/issue-35675.rs b/src/test/ui/issues/issue-35675.rs similarity index 100% rename from src/test/ui/issue-35675.rs rename to src/test/ui/issues/issue-35675.rs diff --git a/src/test/ui/issue-35675.stderr b/src/test/ui/issues/issue-35675.stderr similarity index 100% rename from src/test/ui/issue-35675.stderr rename to src/test/ui/issues/issue-35675.stderr diff --git a/src/test/ui/issue-35869.rs b/src/test/ui/issues/issue-35869.rs similarity index 100% rename from src/test/ui/issue-35869.rs rename to src/test/ui/issues/issue-35869.rs diff --git a/src/test/ui/issue-35869.stderr b/src/test/ui/issues/issue-35869.stderr similarity index 100% rename from src/test/ui/issue-35869.stderr rename to src/test/ui/issues/issue-35869.stderr diff --git a/src/test/ui/issue-35976.rs b/src/test/ui/issues/issue-35976.rs similarity index 100% rename from src/test/ui/issue-35976.rs rename to src/test/ui/issues/issue-35976.rs diff --git a/src/test/ui/issue-35976.stderr b/src/test/ui/issues/issue-35976.stderr similarity index 100% rename from src/test/ui/issue-35976.stderr rename to src/test/ui/issues/issue-35976.stderr diff --git a/src/test/ui/issue-35988.rs b/src/test/ui/issues/issue-35988.rs similarity index 100% rename from src/test/ui/issue-35988.rs rename to src/test/ui/issues/issue-35988.rs diff --git a/src/test/ui/issue-35988.stderr b/src/test/ui/issues/issue-35988.stderr similarity index 100% rename from src/test/ui/issue-35988.stderr rename to src/test/ui/issues/issue-35988.stderr diff --git a/src/test/ui/issue-3601.rs b/src/test/ui/issues/issue-3601.rs similarity index 100% rename from src/test/ui/issue-3601.rs rename to src/test/ui/issues/issue-3601.rs diff --git a/src/test/ui/issue-3601.stderr b/src/test/ui/issues/issue-3601.stderr similarity index 100% rename from src/test/ui/issue-3601.stderr rename to src/test/ui/issues/issue-3601.stderr diff --git a/src/test/ui/issue-36082.ast.nll.stderr b/src/test/ui/issues/issue-36082.ast.nll.stderr similarity index 100% rename from src/test/ui/issue-36082.ast.nll.stderr rename to src/test/ui/issues/issue-36082.ast.nll.stderr diff --git a/src/test/ui/issue-36082.ast.stderr b/src/test/ui/issues/issue-36082.ast.stderr similarity index 100% rename from src/test/ui/issue-36082.ast.stderr rename to src/test/ui/issues/issue-36082.ast.stderr diff --git a/src/test/ui/issue-36082.mir.stderr b/src/test/ui/issues/issue-36082.mir.stderr similarity index 100% rename from src/test/ui/issue-36082.mir.stderr rename to src/test/ui/issues/issue-36082.mir.stderr diff --git a/src/test/ui/issue-36082.rs b/src/test/ui/issues/issue-36082.rs similarity index 100% rename from src/test/ui/issue-36082.rs rename to src/test/ui/issues/issue-36082.rs diff --git a/src/test/ui/issue-36116.rs b/src/test/ui/issues/issue-36116.rs similarity index 100% rename from src/test/ui/issue-36116.rs rename to src/test/ui/issues/issue-36116.rs diff --git a/src/test/ui/issue-36116.stderr b/src/test/ui/issues/issue-36116.stderr similarity index 100% rename from src/test/ui/issue-36116.stderr rename to src/test/ui/issues/issue-36116.stderr diff --git a/src/test/ui/issue-36163.rs b/src/test/ui/issues/issue-36163.rs similarity index 100% rename from src/test/ui/issue-36163.rs rename to src/test/ui/issues/issue-36163.rs diff --git a/src/test/ui/issue-36163.stderr b/src/test/ui/issues/issue-36163.stderr similarity index 100% rename from src/test/ui/issue-36163.stderr rename to src/test/ui/issues/issue-36163.stderr diff --git a/src/test/ui/issue-36299.rs b/src/test/ui/issues/issue-36299.rs similarity index 100% rename from src/test/ui/issue-36299.rs rename to src/test/ui/issues/issue-36299.rs diff --git a/src/test/ui/issue-36299.stderr b/src/test/ui/issues/issue-36299.stderr similarity index 100% rename from src/test/ui/issue-36299.stderr rename to src/test/ui/issues/issue-36299.stderr diff --git a/src/test/ui/issue-36379.rs b/src/test/ui/issues/issue-36379.rs similarity index 100% rename from src/test/ui/issue-36379.rs rename to src/test/ui/issues/issue-36379.rs diff --git a/src/test/ui/issue-36379.stderr b/src/test/ui/issues/issue-36379.stderr similarity index 100% rename from src/test/ui/issue-36379.stderr rename to src/test/ui/issues/issue-36379.stderr diff --git a/src/test/ui/issue-36400.nll.stderr b/src/test/ui/issues/issue-36400.nll.stderr similarity index 100% rename from src/test/ui/issue-36400.nll.stderr rename to src/test/ui/issues/issue-36400.nll.stderr diff --git a/src/test/ui/issue-36400.rs b/src/test/ui/issues/issue-36400.rs similarity index 100% rename from src/test/ui/issue-36400.rs rename to src/test/ui/issues/issue-36400.rs diff --git a/src/test/ui/issue-36400.stderr b/src/test/ui/issues/issue-36400.stderr similarity index 100% rename from src/test/ui/issue-36400.stderr rename to src/test/ui/issues/issue-36400.stderr diff --git a/src/test/ui/issue-36617.rs b/src/test/ui/issues/issue-36617.rs similarity index 100% rename from src/test/ui/issue-36617.rs rename to src/test/ui/issues/issue-36617.rs diff --git a/src/test/ui/issue-36617.stderr b/src/test/ui/issues/issue-36617.stderr similarity index 100% rename from src/test/ui/issue-36617.stderr rename to src/test/ui/issues/issue-36617.stderr diff --git a/src/test/ui/issue-36638.rs b/src/test/ui/issues/issue-36638.rs similarity index 100% rename from src/test/ui/issue-36638.rs rename to src/test/ui/issues/issue-36638.rs diff --git a/src/test/ui/issue-36638.stderr b/src/test/ui/issues/issue-36638.stderr similarity index 100% rename from src/test/ui/issue-36638.stderr rename to src/test/ui/issues/issue-36638.stderr diff --git a/src/test/ui/issue-3668-2.rs b/src/test/ui/issues/issue-3668-2.rs similarity index 100% rename from src/test/ui/issue-3668-2.rs rename to src/test/ui/issues/issue-3668-2.rs diff --git a/src/test/ui/issue-3668-2.stderr b/src/test/ui/issues/issue-3668-2.stderr similarity index 100% rename from src/test/ui/issue-3668-2.stderr rename to src/test/ui/issues/issue-3668-2.stderr diff --git a/src/test/ui/issue-3668.rs b/src/test/ui/issues/issue-3668.rs similarity index 100% rename from src/test/ui/issue-3668.rs rename to src/test/ui/issues/issue-3668.rs diff --git a/src/test/ui/issue-3668.stderr b/src/test/ui/issues/issue-3668.stderr similarity index 100% rename from src/test/ui/issue-3668.stderr rename to src/test/ui/issues/issue-3668.stderr diff --git a/src/test/ui/issue-36708.rs b/src/test/ui/issues/issue-36708.rs similarity index 100% rename from src/test/ui/issue-36708.rs rename to src/test/ui/issues/issue-36708.rs diff --git a/src/test/ui/issue-36708.stderr b/src/test/ui/issues/issue-36708.stderr similarity index 100% rename from src/test/ui/issue-36708.stderr rename to src/test/ui/issues/issue-36708.stderr diff --git a/src/test/ui/issue-3680.rs b/src/test/ui/issues/issue-3680.rs similarity index 100% rename from src/test/ui/issue-3680.rs rename to src/test/ui/issues/issue-3680.rs diff --git a/src/test/ui/issue-3680.stderr b/src/test/ui/issues/issue-3680.stderr similarity index 100% rename from src/test/ui/issue-3680.stderr rename to src/test/ui/issues/issue-3680.stderr diff --git a/src/test/ui/issue-36839.rs b/src/test/ui/issues/issue-36839.rs similarity index 100% rename from src/test/ui/issue-36839.rs rename to src/test/ui/issues/issue-36839.rs diff --git a/src/test/ui/issue-36839.stderr b/src/test/ui/issues/issue-36839.stderr similarity index 100% rename from src/test/ui/issue-36839.stderr rename to src/test/ui/issues/issue-36839.stderr diff --git a/src/test/ui/compile-fail-migration/issue-36881.rs b/src/test/ui/issues/issue-36881.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-36881.rs rename to src/test/ui/issues/issue-36881.rs diff --git a/src/test/ui/compile-fail-migration/issue-36881.stderr b/src/test/ui/issues/issue-36881.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-36881.stderr rename to src/test/ui/issues/issue-36881.stderr diff --git a/src/test/ui/issue-3702-2.rs b/src/test/ui/issues/issue-3702-2.rs similarity index 100% rename from src/test/ui/issue-3702-2.rs rename to src/test/ui/issues/issue-3702-2.rs diff --git a/src/test/ui/issue-3702-2.stderr b/src/test/ui/issues/issue-3702-2.stderr similarity index 100% rename from src/test/ui/issue-3702-2.stderr rename to src/test/ui/issues/issue-3702-2.stderr diff --git a/src/test/ui/issue-37026.rs b/src/test/ui/issues/issue-37026.rs similarity index 100% rename from src/test/ui/issue-37026.rs rename to src/test/ui/issues/issue-37026.rs diff --git a/src/test/ui/issue-37026.stderr b/src/test/ui/issues/issue-37026.stderr similarity index 100% rename from src/test/ui/issue-37026.stderr rename to src/test/ui/issues/issue-37026.stderr diff --git a/src/test/ui/issue-37051.rs b/src/test/ui/issues/issue-37051.rs similarity index 100% rename from src/test/ui/issue-37051.rs rename to src/test/ui/issues/issue-37051.rs diff --git a/src/test/ui/issue-37051.stderr b/src/test/ui/issues/issue-37051.stderr similarity index 100% rename from src/test/ui/issue-37051.stderr rename to src/test/ui/issues/issue-37051.stderr diff --git a/src/test/ui/issue-3707.rs b/src/test/ui/issues/issue-3707.rs similarity index 100% rename from src/test/ui/issue-3707.rs rename to src/test/ui/issues/issue-3707.rs diff --git a/src/test/ui/issue-3707.stderr b/src/test/ui/issues/issue-3707.stderr similarity index 100% rename from src/test/ui/issue-3707.stderr rename to src/test/ui/issues/issue-3707.stderr diff --git a/src/test/ui/compile-fail-migration/issue-37131.rs b/src/test/ui/issues/issue-37131.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-37131.rs rename to src/test/ui/issues/issue-37131.rs diff --git a/src/test/ui/compile-fail-migration/issue-37131.stderr b/src/test/ui/issues/issue-37131.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-37131.stderr rename to src/test/ui/issues/issue-37131.stderr diff --git a/src/test/ui/issue-37311-type-length-limit/issue-37311.rs b/src/test/ui/issues/issue-37311-type-length-limit/issue-37311.rs similarity index 100% rename from src/test/ui/issue-37311-type-length-limit/issue-37311.rs rename to src/test/ui/issues/issue-37311-type-length-limit/issue-37311.rs diff --git a/src/test/ui/issue-37311-type-length-limit/issue-37311.stderr b/src/test/ui/issues/issue-37311-type-length-limit/issue-37311.stderr similarity index 100% rename from src/test/ui/issue-37311-type-length-limit/issue-37311.stderr rename to src/test/ui/issues/issue-37311-type-length-limit/issue-37311.stderr diff --git a/src/test/ui/issue-37323.rs b/src/test/ui/issues/issue-37323.rs similarity index 100% rename from src/test/ui/issue-37323.rs rename to src/test/ui/issues/issue-37323.rs diff --git a/src/test/ui/issue-37323.stderr b/src/test/ui/issues/issue-37323.stderr similarity index 100% rename from src/test/ui/issue-37323.stderr rename to src/test/ui/issues/issue-37323.stderr diff --git a/src/test/ui/issue-37366.rs b/src/test/ui/issues/issue-37366.rs similarity index 100% rename from src/test/ui/issue-37366.rs rename to src/test/ui/issues/issue-37366.rs diff --git a/src/test/ui/issue-37366.stderr b/src/test/ui/issues/issue-37366.stderr similarity index 100% rename from src/test/ui/issue-37366.stderr rename to src/test/ui/issues/issue-37366.stderr diff --git a/src/test/ui/issue-37510.rs b/src/test/ui/issues/issue-37510.rs similarity index 100% rename from src/test/ui/issue-37510.rs rename to src/test/ui/issues/issue-37510.rs diff --git a/src/test/ui/issue-37510.stderr b/src/test/ui/issues/issue-37510.stderr similarity index 100% rename from src/test/ui/issue-37510.stderr rename to src/test/ui/issues/issue-37510.stderr diff --git a/src/test/ui/issue-37515.rs b/src/test/ui/issues/issue-37515.rs similarity index 100% rename from src/test/ui/issue-37515.rs rename to src/test/ui/issues/issue-37515.rs diff --git a/src/test/ui/issue-37515.stderr b/src/test/ui/issues/issue-37515.stderr similarity index 100% rename from src/test/ui/issue-37515.stderr rename to src/test/ui/issues/issue-37515.stderr diff --git a/src/test/ui/issue-37534.rs b/src/test/ui/issues/issue-37534.rs similarity index 100% rename from src/test/ui/issue-37534.rs rename to src/test/ui/issues/issue-37534.rs diff --git a/src/test/ui/issue-37534.stderr b/src/test/ui/issues/issue-37534.stderr similarity index 100% rename from src/test/ui/issue-37534.stderr rename to src/test/ui/issues/issue-37534.stderr diff --git a/src/test/ui/issue-37550.rs b/src/test/ui/issues/issue-37550.rs similarity index 100% rename from src/test/ui/issue-37550.rs rename to src/test/ui/issues/issue-37550.rs diff --git a/src/test/ui/issue-37550.stderr b/src/test/ui/issues/issue-37550.stderr similarity index 100% rename from src/test/ui/issue-37550.stderr rename to src/test/ui/issues/issue-37550.stderr diff --git a/src/test/ui/issue-37576.rs b/src/test/ui/issues/issue-37576.rs similarity index 100% rename from src/test/ui/issue-37576.rs rename to src/test/ui/issues/issue-37576.rs diff --git a/src/test/ui/issue-37576.stderr b/src/test/ui/issues/issue-37576.stderr similarity index 100% rename from src/test/ui/issue-37576.stderr rename to src/test/ui/issues/issue-37576.stderr diff --git a/src/test/ui/issue-3763.rs b/src/test/ui/issues/issue-3763.rs similarity index 100% rename from src/test/ui/issue-3763.rs rename to src/test/ui/issues/issue-3763.rs diff --git a/src/test/ui/issue-3763.stderr b/src/test/ui/issues/issue-3763.stderr similarity index 100% rename from src/test/ui/issue-3763.stderr rename to src/test/ui/issues/issue-3763.stderr diff --git a/src/test/ui/issue-37665.rs b/src/test/ui/issues/issue-37665.rs similarity index 100% rename from src/test/ui/issue-37665.rs rename to src/test/ui/issues/issue-37665.rs diff --git a/src/test/ui/issue-37665.stderr b/src/test/ui/issues/issue-37665.stderr similarity index 100% rename from src/test/ui/issue-37665.stderr rename to src/test/ui/issues/issue-37665.stderr diff --git a/src/test/ui/issue-3779.rs b/src/test/ui/issues/issue-3779.rs similarity index 100% rename from src/test/ui/issue-3779.rs rename to src/test/ui/issues/issue-3779.rs diff --git a/src/test/ui/issue-3779.stderr b/src/test/ui/issues/issue-3779.stderr similarity index 100% rename from src/test/ui/issue-3779.stderr rename to src/test/ui/issues/issue-3779.stderr diff --git a/src/test/ui/issue-37884.rs b/src/test/ui/issues/issue-37884.rs similarity index 100% rename from src/test/ui/issue-37884.rs rename to src/test/ui/issues/issue-37884.rs diff --git a/src/test/ui/issue-37884.stderr b/src/test/ui/issues/issue-37884.stderr similarity index 100% rename from src/test/ui/issue-37884.stderr rename to src/test/ui/issues/issue-37884.stderr diff --git a/src/test/ui/issue-37887.rs b/src/test/ui/issues/issue-37887.rs similarity index 100% rename from src/test/ui/issue-37887.rs rename to src/test/ui/issues/issue-37887.rs diff --git a/src/test/ui/issue-37887.stderr b/src/test/ui/issues/issue-37887.stderr similarity index 100% rename from src/test/ui/issue-37887.stderr rename to src/test/ui/issues/issue-37887.stderr diff --git a/src/test/ui/issue-38160.rs b/src/test/ui/issues/issue-38160.rs similarity index 100% rename from src/test/ui/issue-38160.rs rename to src/test/ui/issues/issue-38160.rs diff --git a/src/test/ui/issue-38160.stderr b/src/test/ui/issues/issue-38160.stderr similarity index 100% rename from src/test/ui/issue-38160.stderr rename to src/test/ui/issues/issue-38160.stderr diff --git a/src/test/ui/issue-3820.rs b/src/test/ui/issues/issue-3820.rs similarity index 100% rename from src/test/ui/issue-3820.rs rename to src/test/ui/issues/issue-3820.rs diff --git a/src/test/ui/issue-3820.stderr b/src/test/ui/issues/issue-3820.stderr similarity index 100% rename from src/test/ui/issue-3820.stderr rename to src/test/ui/issues/issue-3820.stderr diff --git a/src/test/ui/issue-38293.rs b/src/test/ui/issues/issue-38293.rs similarity index 100% rename from src/test/ui/issue-38293.rs rename to src/test/ui/issues/issue-38293.rs diff --git a/src/test/ui/issue-38293.stderr b/src/test/ui/issues/issue-38293.stderr similarity index 100% rename from src/test/ui/issue-38293.stderr rename to src/test/ui/issues/issue-38293.stderr diff --git a/src/test/ui/issue-38381.rs b/src/test/ui/issues/issue-38381.rs similarity index 100% rename from src/test/ui/issue-38381.rs rename to src/test/ui/issues/issue-38381.rs diff --git a/src/test/ui/issue-38381.stderr b/src/test/ui/issues/issue-38381.stderr similarity index 100% rename from src/test/ui/issue-38381.stderr rename to src/test/ui/issues/issue-38381.stderr diff --git a/src/test/ui/issue-38404.rs b/src/test/ui/issues/issue-38404.rs similarity index 100% rename from src/test/ui/issue-38404.rs rename to src/test/ui/issues/issue-38404.rs diff --git a/src/test/ui/issue-38404.stderr b/src/test/ui/issues/issue-38404.stderr similarity index 100% rename from src/test/ui/issue-38404.stderr rename to src/test/ui/issues/issue-38404.stderr diff --git a/src/test/ui/issue-38412.rs b/src/test/ui/issues/issue-38412.rs similarity index 100% rename from src/test/ui/issue-38412.rs rename to src/test/ui/issues/issue-38412.rs diff --git a/src/test/ui/issue-38412.stderr b/src/test/ui/issues/issue-38412.stderr similarity index 100% rename from src/test/ui/issue-38412.stderr rename to src/test/ui/issues/issue-38412.stderr diff --git a/src/test/ui/issue-38458.rs b/src/test/ui/issues/issue-38458.rs similarity index 100% rename from src/test/ui/issue-38458.rs rename to src/test/ui/issues/issue-38458.rs diff --git a/src/test/ui/issue-38458.stderr b/src/test/ui/issues/issue-38458.stderr similarity index 100% rename from src/test/ui/issue-38458.stderr rename to src/test/ui/issues/issue-38458.stderr diff --git a/src/test/ui/issue-38604.rs b/src/test/ui/issues/issue-38604.rs similarity index 100% rename from src/test/ui/issue-38604.rs rename to src/test/ui/issues/issue-38604.rs diff --git a/src/test/ui/issue-38604.stderr b/src/test/ui/issues/issue-38604.stderr similarity index 100% rename from src/test/ui/issue-38604.stderr rename to src/test/ui/issues/issue-38604.stderr diff --git a/src/test/ui/issue-38715.rs b/src/test/ui/issues/issue-38715.rs similarity index 100% rename from src/test/ui/issue-38715.rs rename to src/test/ui/issues/issue-38715.rs diff --git a/src/test/ui/issue-38715.stderr b/src/test/ui/issues/issue-38715.stderr similarity index 100% rename from src/test/ui/issue-38715.stderr rename to src/test/ui/issues/issue-38715.stderr diff --git a/src/test/ui/compile-fail-migration/isssue-38821.rs b/src/test/ui/issues/issue-38821.rs similarity index 100% rename from src/test/ui/compile-fail-migration/isssue-38821.rs rename to src/test/ui/issues/issue-38821.rs diff --git a/src/test/ui/compile-fail-migration/isssue-38821.stderr b/src/test/ui/issues/issue-38821.stderr similarity index 94% rename from src/test/ui/compile-fail-migration/isssue-38821.stderr rename to src/test/ui/issues/issue-38821.stderr index a9e12e40d5d..f23f0ae99e9 100644 --- a/src/test/ui/compile-fail-migration/isssue-38821.stderr +++ b/src/test/ui/issues/issue-38821.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `::SqlType: NotNull` is not satisfied - --> $DIR/isssue-38821.rs:33:17 + --> $DIR/issue-38821.rs:33:17 | LL | #[derive(Debug, Copy, Clone)] | ^^^^ the trait `NotNull` is not implemented for `::SqlType` diff --git a/src/test/ui/issue-38857.rs b/src/test/ui/issues/issue-38857.rs similarity index 100% rename from src/test/ui/issue-38857.rs rename to src/test/ui/issues/issue-38857.rs diff --git a/src/test/ui/issue-38857.stderr b/src/test/ui/issues/issue-38857.stderr similarity index 100% rename from src/test/ui/issue-38857.stderr rename to src/test/ui/issues/issue-38857.stderr diff --git a/src/test/ui/issue-38868.rs b/src/test/ui/issues/issue-38868.rs similarity index 100% rename from src/test/ui/issue-38868.rs rename to src/test/ui/issues/issue-38868.rs diff --git a/src/test/ui/issue-38868.stderr b/src/test/ui/issues/issue-38868.stderr similarity index 100% rename from src/test/ui/issue-38868.stderr rename to src/test/ui/issues/issue-38868.stderr diff --git a/src/test/ui/issue-38875/auxiliary/issue_38875_b.rs b/src/test/ui/issues/issue-38875/auxiliary/issue_38875_b.rs similarity index 100% rename from src/test/ui/issue-38875/auxiliary/issue_38875_b.rs rename to src/test/ui/issues/issue-38875/auxiliary/issue_38875_b.rs diff --git a/src/test/ui/issue-38875/issue_38875.rs b/src/test/ui/issues/issue-38875/issue_38875.rs similarity index 100% rename from src/test/ui/issue-38875/issue_38875.rs rename to src/test/ui/issues/issue-38875/issue_38875.rs diff --git a/src/test/ui/issue-38919.rs b/src/test/ui/issues/issue-38919.rs similarity index 100% rename from src/test/ui/issue-38919.rs rename to src/test/ui/issues/issue-38919.rs diff --git a/src/test/ui/issue-38919.stderr b/src/test/ui/issues/issue-38919.stderr similarity index 100% rename from src/test/ui/issue-38919.stderr rename to src/test/ui/issues/issue-38919.stderr diff --git a/src/test/ui/issue-38954.rs b/src/test/ui/issues/issue-38954.rs similarity index 100% rename from src/test/ui/issue-38954.rs rename to src/test/ui/issues/issue-38954.rs diff --git a/src/test/ui/issue-38954.stderr b/src/test/ui/issues/issue-38954.stderr similarity index 100% rename from src/test/ui/issue-38954.stderr rename to src/test/ui/issues/issue-38954.stderr diff --git a/src/test/ui/issue-39211.rs b/src/test/ui/issues/issue-39211.rs similarity index 100% rename from src/test/ui/issue-39211.rs rename to src/test/ui/issues/issue-39211.rs diff --git a/src/test/ui/issue-39211.stderr b/src/test/ui/issues/issue-39211.stderr similarity index 100% rename from src/test/ui/issue-39211.stderr rename to src/test/ui/issues/issue-39211.stderr diff --git a/src/test/ui/issue-39362.rs b/src/test/ui/issues/issue-39362.rs similarity index 100% rename from src/test/ui/issue-39362.rs rename to src/test/ui/issues/issue-39362.rs diff --git a/src/test/ui/issue-39362.stderr b/src/test/ui/issues/issue-39362.stderr similarity index 100% rename from src/test/ui/issue-39362.stderr rename to src/test/ui/issues/issue-39362.stderr diff --git a/src/test/ui/issue-39388.rs b/src/test/ui/issues/issue-39388.rs similarity index 100% rename from src/test/ui/issue-39388.rs rename to src/test/ui/issues/issue-39388.rs diff --git a/src/test/ui/issue-39388.stderr b/src/test/ui/issues/issue-39388.stderr similarity index 100% rename from src/test/ui/issue-39388.stderr rename to src/test/ui/issues/issue-39388.stderr diff --git a/src/test/ui/issue-39404.rs b/src/test/ui/issues/issue-39404.rs similarity index 100% rename from src/test/ui/issue-39404.rs rename to src/test/ui/issues/issue-39404.rs diff --git a/src/test/ui/issue-39404.stderr b/src/test/ui/issues/issue-39404.stderr similarity index 100% rename from src/test/ui/issue-39404.stderr rename to src/test/ui/issues/issue-39404.stderr diff --git a/src/test/ui/issue-39559-2.rs b/src/test/ui/issues/issue-39559-2.rs similarity index 100% rename from src/test/ui/issue-39559-2.rs rename to src/test/ui/issues/issue-39559-2.rs diff --git a/src/test/ui/issue-39559-2.stderr b/src/test/ui/issues/issue-39559-2.stderr similarity index 100% rename from src/test/ui/issue-39559-2.stderr rename to src/test/ui/issues/issue-39559-2.stderr diff --git a/src/test/ui/issue-39559.rs b/src/test/ui/issues/issue-39559.rs similarity index 100% rename from src/test/ui/issue-39559.rs rename to src/test/ui/issues/issue-39559.rs diff --git a/src/test/ui/issue-39559.stderr b/src/test/ui/issues/issue-39559.stderr similarity index 100% rename from src/test/ui/issue-39559.stderr rename to src/test/ui/issues/issue-39559.stderr diff --git a/src/test/ui/issue-39616.rs b/src/test/ui/issues/issue-39616.rs similarity index 100% rename from src/test/ui/issue-39616.rs rename to src/test/ui/issues/issue-39616.rs diff --git a/src/test/ui/issue-39616.stderr b/src/test/ui/issues/issue-39616.stderr similarity index 100% rename from src/test/ui/issue-39616.stderr rename to src/test/ui/issues/issue-39616.stderr diff --git a/src/test/ui/issue-39687.rs b/src/test/ui/issues/issue-39687.rs similarity index 100% rename from src/test/ui/issue-39687.rs rename to src/test/ui/issues/issue-39687.rs diff --git a/src/test/ui/issue-39687.stderr b/src/test/ui/issues/issue-39687.stderr similarity index 100% rename from src/test/ui/issue-39687.stderr rename to src/test/ui/issues/issue-39687.stderr diff --git a/src/test/ui/issue-3973.rs b/src/test/ui/issues/issue-3973.rs similarity index 100% rename from src/test/ui/issue-3973.rs rename to src/test/ui/issues/issue-3973.rs diff --git a/src/test/ui/issue-3973.stderr b/src/test/ui/issues/issue-3973.stderr similarity index 100% rename from src/test/ui/issue-3973.stderr rename to src/test/ui/issues/issue-3973.stderr diff --git a/src/test/ui/issue-39848.rs b/src/test/ui/issues/issue-39848.rs similarity index 100% rename from src/test/ui/issue-39848.rs rename to src/test/ui/issues/issue-39848.rs diff --git a/src/test/ui/issue-39848.stderr b/src/test/ui/issues/issue-39848.stderr similarity index 100% rename from src/test/ui/issue-39848.stderr rename to src/test/ui/issues/issue-39848.stderr diff --git a/src/test/ui/issue-3993.rs b/src/test/ui/issues/issue-3993.rs similarity index 100% rename from src/test/ui/issue-3993.rs rename to src/test/ui/issues/issue-3993.rs diff --git a/src/test/ui/issue-3993.stderr b/src/test/ui/issues/issue-3993.stderr similarity index 100% rename from src/test/ui/issue-3993.stderr rename to src/test/ui/issues/issue-3993.stderr diff --git a/src/test/ui/issue-39970.rs b/src/test/ui/issues/issue-39970.rs similarity index 100% rename from src/test/ui/issue-39970.rs rename to src/test/ui/issues/issue-39970.rs diff --git a/src/test/ui/issue-39970.stderr b/src/test/ui/issues/issue-39970.stderr similarity index 100% rename from src/test/ui/issue-39970.stderr rename to src/test/ui/issues/issue-39970.stderr diff --git a/src/test/ui/issue-39974.rs b/src/test/ui/issues/issue-39974.rs similarity index 100% rename from src/test/ui/issue-39974.rs rename to src/test/ui/issues/issue-39974.rs diff --git a/src/test/ui/issue-39974.stderr b/src/test/ui/issues/issue-39974.stderr similarity index 100% rename from src/test/ui/issue-39974.stderr rename to src/test/ui/issues/issue-39974.stderr diff --git a/src/test/ui/issue-40000.rs b/src/test/ui/issues/issue-40000.rs similarity index 100% rename from src/test/ui/issue-40000.rs rename to src/test/ui/issues/issue-40000.rs diff --git a/src/test/ui/issue-40000.stderr b/src/test/ui/issues/issue-40000.stderr similarity index 100% rename from src/test/ui/issue-40000.stderr rename to src/test/ui/issues/issue-40000.stderr diff --git a/src/test/ui/issue-40288-2.nll.stderr b/src/test/ui/issues/issue-40288-2.nll.stderr similarity index 100% rename from src/test/ui/issue-40288-2.nll.stderr rename to src/test/ui/issues/issue-40288-2.nll.stderr diff --git a/src/test/ui/issue-40288-2.rs b/src/test/ui/issues/issue-40288-2.rs similarity index 100% rename from src/test/ui/issue-40288-2.rs rename to src/test/ui/issues/issue-40288-2.rs diff --git a/src/test/ui/issue-40288-2.stderr b/src/test/ui/issues/issue-40288-2.stderr similarity index 100% rename from src/test/ui/issue-40288-2.stderr rename to src/test/ui/issues/issue-40288-2.stderr diff --git a/src/test/ui/issue-40288.nll.stderr b/src/test/ui/issues/issue-40288.nll.stderr similarity index 100% rename from src/test/ui/issue-40288.nll.stderr rename to src/test/ui/issues/issue-40288.nll.stderr diff --git a/src/test/ui/issue-40288.rs b/src/test/ui/issues/issue-40288.rs similarity index 100% rename from src/test/ui/issue-40288.rs rename to src/test/ui/issues/issue-40288.rs diff --git a/src/test/ui/issue-40288.stderr b/src/test/ui/issues/issue-40288.stderr similarity index 100% rename from src/test/ui/issue-40288.stderr rename to src/test/ui/issues/issue-40288.stderr diff --git a/src/test/ui/issue-40350.rs b/src/test/ui/issues/issue-40350.rs similarity index 100% rename from src/test/ui/issue-40350.rs rename to src/test/ui/issues/issue-40350.rs diff --git a/src/test/ui/issue-40350.stderr b/src/test/ui/issues/issue-40350.stderr similarity index 100% rename from src/test/ui/issue-40350.stderr rename to src/test/ui/issues/issue-40350.stderr diff --git a/src/test/ui/issue-40402-ref-hints/issue-40402-1.nll.stderr b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.nll.stderr similarity index 100% rename from src/test/ui/issue-40402-ref-hints/issue-40402-1.nll.stderr rename to src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.nll.stderr diff --git a/src/test/ui/issue-40402-ref-hints/issue-40402-1.rs b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.rs similarity index 100% rename from src/test/ui/issue-40402-ref-hints/issue-40402-1.rs rename to src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.rs diff --git a/src/test/ui/issue-40402-ref-hints/issue-40402-1.stderr b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.stderr similarity index 100% rename from src/test/ui/issue-40402-ref-hints/issue-40402-1.stderr rename to src/test/ui/issues/issue-40402-ref-hints/issue-40402-1.stderr diff --git a/src/test/ui/issue-40402-ref-hints/issue-40402-2.nll.stderr b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.nll.stderr similarity index 100% rename from src/test/ui/issue-40402-ref-hints/issue-40402-2.nll.stderr rename to src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.nll.stderr diff --git a/src/test/ui/issue-40402-ref-hints/issue-40402-2.rs b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.rs similarity index 100% rename from src/test/ui/issue-40402-ref-hints/issue-40402-2.rs rename to src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.rs diff --git a/src/test/ui/issue-40402-ref-hints/issue-40402-2.stderr b/src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.stderr similarity index 100% rename from src/test/ui/issue-40402-ref-hints/issue-40402-2.stderr rename to src/test/ui/issues/issue-40402-ref-hints/issue-40402-2.stderr diff --git a/src/test/ui/issue-40510-1.nll.stderr b/src/test/ui/issues/issue-40510-1.nll.stderr similarity index 100% rename from src/test/ui/issue-40510-1.nll.stderr rename to src/test/ui/issues/issue-40510-1.nll.stderr diff --git a/src/test/ui/issue-40510-1.rs b/src/test/ui/issues/issue-40510-1.rs similarity index 100% rename from src/test/ui/issue-40510-1.rs rename to src/test/ui/issues/issue-40510-1.rs diff --git a/src/test/ui/issue-40510-1.stderr b/src/test/ui/issues/issue-40510-1.stderr similarity index 100% rename from src/test/ui/issue-40510-1.stderr rename to src/test/ui/issues/issue-40510-1.stderr diff --git a/src/test/ui/issue-40510-2.rs b/src/test/ui/issues/issue-40510-2.rs similarity index 100% rename from src/test/ui/issue-40510-2.rs rename to src/test/ui/issues/issue-40510-2.rs diff --git a/src/test/ui/issue-40510-2.stderr b/src/test/ui/issues/issue-40510-2.stderr similarity index 100% rename from src/test/ui/issue-40510-2.stderr rename to src/test/ui/issues/issue-40510-2.stderr diff --git a/src/test/ui/issue-40510-3.nll.stderr b/src/test/ui/issues/issue-40510-3.nll.stderr similarity index 100% rename from src/test/ui/issue-40510-3.nll.stderr rename to src/test/ui/issues/issue-40510-3.nll.stderr diff --git a/src/test/ui/issue-40510-3.rs b/src/test/ui/issues/issue-40510-3.rs similarity index 100% rename from src/test/ui/issue-40510-3.rs rename to src/test/ui/issues/issue-40510-3.rs diff --git a/src/test/ui/issue-40510-3.stderr b/src/test/ui/issues/issue-40510-3.stderr similarity index 100% rename from src/test/ui/issue-40510-3.stderr rename to src/test/ui/issues/issue-40510-3.stderr diff --git a/src/test/ui/issue-40510-4.rs b/src/test/ui/issues/issue-40510-4.rs similarity index 100% rename from src/test/ui/issue-40510-4.rs rename to src/test/ui/issues/issue-40510-4.rs diff --git a/src/test/ui/issue-40510-4.stderr b/src/test/ui/issues/issue-40510-4.stderr similarity index 100% rename from src/test/ui/issue-40510-4.stderr rename to src/test/ui/issues/issue-40510-4.stderr diff --git a/src/test/ui/issue-40610.rs b/src/test/ui/issues/issue-40610.rs similarity index 100% rename from src/test/ui/issue-40610.rs rename to src/test/ui/issues/issue-40610.rs diff --git a/src/test/ui/issue-40610.stderr b/src/test/ui/issues/issue-40610.stderr similarity index 100% rename from src/test/ui/issue-40610.stderr rename to src/test/ui/issues/issue-40610.stderr diff --git a/src/test/ui/issue-40749.rs b/src/test/ui/issues/issue-40749.rs similarity index 100% rename from src/test/ui/issue-40749.rs rename to src/test/ui/issues/issue-40749.rs diff --git a/src/test/ui/issue-40749.stderr b/src/test/ui/issues/issue-40749.stderr similarity index 100% rename from src/test/ui/issue-40749.stderr rename to src/test/ui/issues/issue-40749.stderr diff --git a/src/test/ui/issue-40782.rs b/src/test/ui/issues/issue-40782.rs similarity index 100% rename from src/test/ui/issue-40782.rs rename to src/test/ui/issues/issue-40782.rs diff --git a/src/test/ui/issue-40782.stderr b/src/test/ui/issues/issue-40782.stderr similarity index 100% rename from src/test/ui/issue-40782.stderr rename to src/test/ui/issues/issue-40782.stderr diff --git a/src/test/ui/issue-40845.rs b/src/test/ui/issues/issue-40845.rs similarity index 100% rename from src/test/ui/issue-40845.rs rename to src/test/ui/issues/issue-40845.rs diff --git a/src/test/ui/issue-40845.stderr b/src/test/ui/issues/issue-40845.stderr similarity index 100% rename from src/test/ui/issue-40845.stderr rename to src/test/ui/issues/issue-40845.stderr diff --git a/src/test/ui/issue-40861.rs b/src/test/ui/issues/issue-40861.rs similarity index 100% rename from src/test/ui/issue-40861.rs rename to src/test/ui/issues/issue-40861.rs diff --git a/src/test/ui/issue-40861.stderr b/src/test/ui/issues/issue-40861.stderr similarity index 100% rename from src/test/ui/issue-40861.stderr rename to src/test/ui/issues/issue-40861.stderr diff --git a/src/test/ui/issue-41139.nll.stderr b/src/test/ui/issues/issue-41139.nll.stderr similarity index 100% rename from src/test/ui/issue-41139.nll.stderr rename to src/test/ui/issues/issue-41139.nll.stderr diff --git a/src/test/ui/issue-41139.rs b/src/test/ui/issues/issue-41139.rs similarity index 100% rename from src/test/ui/issue-41139.rs rename to src/test/ui/issues/issue-41139.rs diff --git a/src/test/ui/issue-41139.stderr b/src/test/ui/issues/issue-41139.stderr similarity index 100% rename from src/test/ui/issue-41139.stderr rename to src/test/ui/issues/issue-41139.stderr diff --git a/src/test/ui/issue-41229-ref-str.rs b/src/test/ui/issues/issue-41229-ref-str.rs similarity index 100% rename from src/test/ui/issue-41229-ref-str.rs rename to src/test/ui/issues/issue-41229-ref-str.rs diff --git a/src/test/ui/issue-41229-ref-str.stderr b/src/test/ui/issues/issue-41229-ref-str.stderr similarity index 100% rename from src/test/ui/issue-41229-ref-str.stderr rename to src/test/ui/issues/issue-41229-ref-str.stderr diff --git a/src/test/ui/issue-41255.rs b/src/test/ui/issues/issue-41255.rs similarity index 100% rename from src/test/ui/issue-41255.rs rename to src/test/ui/issues/issue-41255.rs diff --git a/src/test/ui/issue-41255.stderr b/src/test/ui/issues/issue-41255.stderr similarity index 100% rename from src/test/ui/issue-41255.stderr rename to src/test/ui/issues/issue-41255.stderr diff --git a/src/test/ui/issue-41394.rs b/src/test/ui/issues/issue-41394.rs similarity index 100% rename from src/test/ui/issue-41394.rs rename to src/test/ui/issues/issue-41394.rs diff --git a/src/test/ui/issue-41394.stderr b/src/test/ui/issues/issue-41394.stderr similarity index 100% rename from src/test/ui/issue-41394.stderr rename to src/test/ui/issues/issue-41394.stderr diff --git a/src/test/ui/compile-fail-migration/issue-41549.rs b/src/test/ui/issues/issue-41549.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-41549.rs rename to src/test/ui/issues/issue-41549.rs diff --git a/src/test/ui/compile-fail-migration/issue-41549.stderr b/src/test/ui/issues/issue-41549.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-41549.stderr rename to src/test/ui/issues/issue-41549.stderr diff --git a/src/test/ui/issue-41652/auxiliary/issue_41652_b.rs b/src/test/ui/issues/issue-41652/auxiliary/issue_41652_b.rs similarity index 100% rename from src/test/ui/issue-41652/auxiliary/issue_41652_b.rs rename to src/test/ui/issues/issue-41652/auxiliary/issue_41652_b.rs diff --git a/src/test/ui/issue-41652/issue_41652.rs b/src/test/ui/issues/issue-41652/issue_41652.rs similarity index 100% rename from src/test/ui/issue-41652/issue_41652.rs rename to src/test/ui/issues/issue-41652/issue_41652.rs diff --git a/src/test/ui/issue-41652/issue_41652.stderr b/src/test/ui/issues/issue-41652/issue_41652.stderr similarity index 100% rename from src/test/ui/issue-41652/issue_41652.stderr rename to src/test/ui/issues/issue-41652/issue_41652.stderr diff --git a/src/test/ui/issue-41726.nll.stderr b/src/test/ui/issues/issue-41726.nll.stderr similarity index 100% rename from src/test/ui/issue-41726.nll.stderr rename to src/test/ui/issues/issue-41726.nll.stderr diff --git a/src/test/ui/issue-41726.rs b/src/test/ui/issues/issue-41726.rs similarity index 100% rename from src/test/ui/issue-41726.rs rename to src/test/ui/issues/issue-41726.rs diff --git a/src/test/ui/issue-41726.stderr b/src/test/ui/issues/issue-41726.stderr similarity index 100% rename from src/test/ui/issue-41726.stderr rename to src/test/ui/issues/issue-41726.stderr diff --git a/src/test/ui/issue-41742.rs b/src/test/ui/issues/issue-41742.rs similarity index 100% rename from src/test/ui/issue-41742.rs rename to src/test/ui/issues/issue-41742.rs diff --git a/src/test/ui/issue-41742.stderr b/src/test/ui/issues/issue-41742.stderr similarity index 100% rename from src/test/ui/issue-41742.stderr rename to src/test/ui/issues/issue-41742.stderr diff --git a/src/test/ui/issue-41776.rs b/src/test/ui/issues/issue-41776.rs similarity index 100% rename from src/test/ui/issue-41776.rs rename to src/test/ui/issues/issue-41776.rs diff --git a/src/test/ui/issue-41776.stderr b/src/test/ui/issues/issue-41776.stderr similarity index 100% rename from src/test/ui/issue-41776.stderr rename to src/test/ui/issues/issue-41776.stderr diff --git a/src/test/ui/issue-41880.rs b/src/test/ui/issues/issue-41880.rs similarity index 100% rename from src/test/ui/issue-41880.rs rename to src/test/ui/issues/issue-41880.rs diff --git a/src/test/ui/issue-41880.stderr b/src/test/ui/issues/issue-41880.stderr similarity index 100% rename from src/test/ui/issue-41880.stderr rename to src/test/ui/issues/issue-41880.stderr diff --git a/src/test/ui/issue-41974.rs b/src/test/ui/issues/issue-41974.rs similarity index 100% rename from src/test/ui/issue-41974.rs rename to src/test/ui/issues/issue-41974.rs diff --git a/src/test/ui/issue-41974.stderr b/src/test/ui/issues/issue-41974.stderr similarity index 100% rename from src/test/ui/issue-41974.stderr rename to src/test/ui/issues/issue-41974.stderr diff --git a/src/test/ui/issue-41998.rs b/src/test/ui/issues/issue-41998.rs similarity index 100% rename from src/test/ui/issue-41998.rs rename to src/test/ui/issues/issue-41998.rs diff --git a/src/test/ui/issue-41998.stderr b/src/test/ui/issues/issue-41998.stderr similarity index 100% rename from src/test/ui/issue-41998.stderr rename to src/test/ui/issues/issue-41998.stderr diff --git a/src/test/ui/issue-4201.rs b/src/test/ui/issues/issue-4201.rs similarity index 100% rename from src/test/ui/issue-4201.rs rename to src/test/ui/issues/issue-4201.rs diff --git a/src/test/ui/issue-4201.stderr b/src/test/ui/issues/issue-4201.stderr similarity index 100% rename from src/test/ui/issue-4201.stderr rename to src/test/ui/issues/issue-4201.stderr diff --git a/src/test/ui/issue-42060.rs b/src/test/ui/issues/issue-42060.rs similarity index 100% rename from src/test/ui/issue-42060.rs rename to src/test/ui/issues/issue-42060.rs diff --git a/src/test/ui/issue-42060.stderr b/src/test/ui/issues/issue-42060.stderr similarity index 100% rename from src/test/ui/issue-42060.stderr rename to src/test/ui/issues/issue-42060.stderr diff --git a/src/test/ui/issue-42106.nll.stderr b/src/test/ui/issues/issue-42106.nll.stderr similarity index 100% rename from src/test/ui/issue-42106.nll.stderr rename to src/test/ui/issues/issue-42106.nll.stderr diff --git a/src/test/ui/issue-42106.rs b/src/test/ui/issues/issue-42106.rs similarity index 100% rename from src/test/ui/issue-42106.rs rename to src/test/ui/issues/issue-42106.rs diff --git a/src/test/ui/issue-42106.stderr b/src/test/ui/issues/issue-42106.stderr similarity index 100% rename from src/test/ui/issue-42106.stderr rename to src/test/ui/issues/issue-42106.stderr diff --git a/src/test/ui/issue-42312.rs b/src/test/ui/issues/issue-42312.rs similarity index 100% rename from src/test/ui/issue-42312.rs rename to src/test/ui/issues/issue-42312.rs diff --git a/src/test/ui/issue-42312.stderr b/src/test/ui/issues/issue-42312.stderr similarity index 100% rename from src/test/ui/issue-42312.stderr rename to src/test/ui/issues/issue-42312.stderr diff --git a/src/test/ui/issue-42344.nll.stderr b/src/test/ui/issues/issue-42344.nll.stderr similarity index 100% rename from src/test/ui/issue-42344.nll.stderr rename to src/test/ui/issues/issue-42344.nll.stderr diff --git a/src/test/ui/issue-42344.rs b/src/test/ui/issues/issue-42344.rs similarity index 100% rename from src/test/ui/issue-42344.rs rename to src/test/ui/issues/issue-42344.rs diff --git a/src/test/ui/issue-42344.stderr b/src/test/ui/issues/issue-42344.stderr similarity index 100% rename from src/test/ui/issue-42344.stderr rename to src/test/ui/issues/issue-42344.stderr diff --git a/src/test/ui/issue-4265.rs b/src/test/ui/issues/issue-4265.rs similarity index 100% rename from src/test/ui/issue-4265.rs rename to src/test/ui/issues/issue-4265.rs diff --git a/src/test/ui/issue-4265.stderr b/src/test/ui/issues/issue-4265.stderr similarity index 100% rename from src/test/ui/issue-4265.stderr rename to src/test/ui/issues/issue-4265.stderr diff --git a/src/test/ui/issue-42755.rs b/src/test/ui/issues/issue-42755.rs similarity index 100% rename from src/test/ui/issue-42755.rs rename to src/test/ui/issues/issue-42755.rs diff --git a/src/test/ui/issue-42755.stderr b/src/test/ui/issues/issue-42755.stderr similarity index 100% rename from src/test/ui/issue-42755.stderr rename to src/test/ui/issues/issue-42755.stderr diff --git a/src/test/ui/issue-42796.nll.stderr b/src/test/ui/issues/issue-42796.nll.stderr similarity index 100% rename from src/test/ui/issue-42796.nll.stderr rename to src/test/ui/issues/issue-42796.nll.stderr diff --git a/src/test/ui/issue-42796.rs b/src/test/ui/issues/issue-42796.rs similarity index 100% rename from src/test/ui/issue-42796.rs rename to src/test/ui/issues/issue-42796.rs diff --git a/src/test/ui/issue-42796.stderr b/src/test/ui/issues/issue-42796.stderr similarity index 100% rename from src/test/ui/issue-42796.stderr rename to src/test/ui/issues/issue-42796.stderr diff --git a/src/test/ui/issue-42880.rs b/src/test/ui/issues/issue-42880.rs similarity index 100% rename from src/test/ui/issue-42880.rs rename to src/test/ui/issues/issue-42880.rs diff --git a/src/test/ui/issue-42880.stderr b/src/test/ui/issues/issue-42880.stderr similarity index 100% rename from src/test/ui/issue-42880.stderr rename to src/test/ui/issues/issue-42880.stderr diff --git a/src/test/ui/issue-42954.fixed b/src/test/ui/issues/issue-42954.fixed similarity index 100% rename from src/test/ui/issue-42954.fixed rename to src/test/ui/issues/issue-42954.fixed diff --git a/src/test/ui/issue-42954.rs b/src/test/ui/issues/issue-42954.rs similarity index 100% rename from src/test/ui/issue-42954.rs rename to src/test/ui/issues/issue-42954.rs diff --git a/src/test/ui/issue-42954.stderr b/src/test/ui/issues/issue-42954.stderr similarity index 100% rename from src/test/ui/issue-42954.stderr rename to src/test/ui/issues/issue-42954.stderr diff --git a/src/test/ui/issue-43023.rs b/src/test/ui/issues/issue-43023.rs similarity index 100% rename from src/test/ui/issue-43023.rs rename to src/test/ui/issues/issue-43023.rs diff --git a/src/test/ui/issue-43023.stderr b/src/test/ui/issues/issue-43023.stderr similarity index 100% rename from src/test/ui/issue-43023.stderr rename to src/test/ui/issues/issue-43023.stderr diff --git a/src/test/ui/issue-43105.rs b/src/test/ui/issues/issue-43105.rs similarity index 100% rename from src/test/ui/issue-43105.rs rename to src/test/ui/issues/issue-43105.rs diff --git a/src/test/ui/issue-43105.stderr b/src/test/ui/issues/issue-43105.stderr similarity index 100% rename from src/test/ui/issue-43105.stderr rename to src/test/ui/issues/issue-43105.stderr diff --git a/src/test/ui/issue-43162.rs b/src/test/ui/issues/issue-43162.rs similarity index 100% rename from src/test/ui/issue-43162.rs rename to src/test/ui/issues/issue-43162.rs diff --git a/src/test/ui/issue-43162.stderr b/src/test/ui/issues/issue-43162.stderr similarity index 100% rename from src/test/ui/issue-43162.stderr rename to src/test/ui/issues/issue-43162.stderr diff --git a/src/test/ui/issue-43189.rs b/src/test/ui/issues/issue-43189.rs similarity index 100% rename from src/test/ui/issue-43189.rs rename to src/test/ui/issues/issue-43189.rs diff --git a/src/test/ui/issue-43189.stderr b/src/test/ui/issues/issue-43189.stderr similarity index 100% rename from src/test/ui/issue-43189.stderr rename to src/test/ui/issues/issue-43189.stderr diff --git a/src/test/ui/issue-43196.rs b/src/test/ui/issues/issue-43196.rs similarity index 100% rename from src/test/ui/issue-43196.rs rename to src/test/ui/issues/issue-43196.rs diff --git a/src/test/ui/issue-43196.stderr b/src/test/ui/issues/issue-43196.stderr similarity index 100% rename from src/test/ui/issue-43196.stderr rename to src/test/ui/issues/issue-43196.stderr diff --git a/src/test/ui/issue-4321.rs b/src/test/ui/issues/issue-4321.rs similarity index 100% rename from src/test/ui/issue-4321.rs rename to src/test/ui/issues/issue-4321.rs diff --git a/src/test/ui/issue-4321.stderr b/src/test/ui/issues/issue-4321.stderr similarity index 100% rename from src/test/ui/issue-4321.stderr rename to src/test/ui/issues/issue-4321.stderr diff --git a/src/test/ui/issue-43250.rs b/src/test/ui/issues/issue-43250.rs similarity index 100% rename from src/test/ui/issue-43250.rs rename to src/test/ui/issues/issue-43250.rs diff --git a/src/test/ui/issue-43250.stderr b/src/test/ui/issues/issue-43250.stderr similarity index 100% rename from src/test/ui/issue-43250.stderr rename to src/test/ui/issues/issue-43250.stderr diff --git a/src/test/ui/issue-4335.nll.stderr b/src/test/ui/issues/issue-4335.nll.stderr similarity index 100% rename from src/test/ui/issue-4335.nll.stderr rename to src/test/ui/issues/issue-4335.nll.stderr diff --git a/src/test/ui/issue-4335.rs b/src/test/ui/issues/issue-4335.rs similarity index 100% rename from src/test/ui/issue-4335.rs rename to src/test/ui/issues/issue-4335.rs diff --git a/src/test/ui/issue-4335.stderr b/src/test/ui/issues/issue-4335.stderr similarity index 100% rename from src/test/ui/issue-4335.stderr rename to src/test/ui/issues/issue-4335.stderr diff --git a/src/test/ui/issue-43355.rs b/src/test/ui/issues/issue-43355.rs similarity index 100% rename from src/test/ui/issue-43355.rs rename to src/test/ui/issues/issue-43355.rs diff --git a/src/test/ui/issue-43355.stderr b/src/test/ui/issues/issue-43355.stderr similarity index 100% rename from src/test/ui/issue-43355.stderr rename to src/test/ui/issues/issue-43355.stderr diff --git a/src/test/ui/issue-43420-no-over-suggest.rs b/src/test/ui/issues/issue-43420-no-over-suggest.rs similarity index 100% rename from src/test/ui/issue-43420-no-over-suggest.rs rename to src/test/ui/issues/issue-43420-no-over-suggest.rs diff --git a/src/test/ui/issue-43420-no-over-suggest.stderr b/src/test/ui/issues/issue-43420-no-over-suggest.stderr similarity index 100% rename from src/test/ui/issue-43420-no-over-suggest.stderr rename to src/test/ui/issues/issue-43420-no-over-suggest.stderr diff --git a/src/test/ui/issue-43424.rs b/src/test/ui/issues/issue-43424.rs similarity index 100% rename from src/test/ui/issue-43424.rs rename to src/test/ui/issues/issue-43424.rs diff --git a/src/test/ui/issue-43424.stderr b/src/test/ui/issues/issue-43424.stderr similarity index 100% rename from src/test/ui/issue-43424.stderr rename to src/test/ui/issues/issue-43424.stderr diff --git a/src/test/ui/issue-43431.rs b/src/test/ui/issues/issue-43431.rs similarity index 100% rename from src/test/ui/issue-43431.rs rename to src/test/ui/issues/issue-43431.rs diff --git a/src/test/ui/issue-43431.stderr b/src/test/ui/issues/issue-43431.stderr similarity index 100% rename from src/test/ui/issue-43431.stderr rename to src/test/ui/issues/issue-43431.stderr diff --git a/src/test/ui/issue-4366-2.rs b/src/test/ui/issues/issue-4366-2.rs similarity index 100% rename from src/test/ui/issue-4366-2.rs rename to src/test/ui/issues/issue-4366-2.rs diff --git a/src/test/ui/issue-4366-2.stderr b/src/test/ui/issues/issue-4366-2.stderr similarity index 100% rename from src/test/ui/issue-4366-2.stderr rename to src/test/ui/issues/issue-4366-2.stderr diff --git a/src/test/ui/issue-4366.rs b/src/test/ui/issues/issue-4366.rs similarity index 100% rename from src/test/ui/issue-4366.rs rename to src/test/ui/issues/issue-4366.rs diff --git a/src/test/ui/issue-4366.stderr b/src/test/ui/issues/issue-4366.stderr similarity index 100% rename from src/test/ui/issue-4366.stderr rename to src/test/ui/issues/issue-4366.stderr diff --git a/src/test/ui/compile-fail-migration/issue-43733-2.rs b/src/test/ui/issues/issue-43733-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-43733-2.rs rename to src/test/ui/issues/issue-43733-2.rs diff --git a/src/test/ui/compile-fail-migration/issue-43733-2.stderr b/src/test/ui/issues/issue-43733-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-43733-2.stderr rename to src/test/ui/issues/issue-43733-2.stderr diff --git a/src/test/ui/issue-43733.rs b/src/test/ui/issues/issue-43733.rs similarity index 100% rename from src/test/ui/issue-43733.rs rename to src/test/ui/issues/issue-43733.rs diff --git a/src/test/ui/issue-43733.stderr b/src/test/ui/issues/issue-43733.stderr similarity index 100% rename from src/test/ui/issue-43733.stderr rename to src/test/ui/issues/issue-43733.stderr diff --git a/src/test/ui/issue-43784-associated-type.rs b/src/test/ui/issues/issue-43784-associated-type.rs similarity index 100% rename from src/test/ui/issue-43784-associated-type.rs rename to src/test/ui/issues/issue-43784-associated-type.rs diff --git a/src/test/ui/issue-43784-associated-type.stderr b/src/test/ui/issues/issue-43784-associated-type.stderr similarity index 100% rename from src/test/ui/issue-43784-associated-type.stderr rename to src/test/ui/issues/issue-43784-associated-type.stderr diff --git a/src/test/ui/issue-43784-supertrait.rs b/src/test/ui/issues/issue-43784-supertrait.rs similarity index 100% rename from src/test/ui/issue-43784-supertrait.rs rename to src/test/ui/issues/issue-43784-supertrait.rs diff --git a/src/test/ui/issue-43784-supertrait.stderr b/src/test/ui/issues/issue-43784-supertrait.stderr similarity index 100% rename from src/test/ui/issue-43784-supertrait.stderr rename to src/test/ui/issues/issue-43784-supertrait.stderr diff --git a/src/test/ui/issue-43806.rs b/src/test/ui/issues/issue-43806.rs similarity index 100% rename from src/test/ui/issue-43806.rs rename to src/test/ui/issues/issue-43806.rs diff --git a/src/test/ui/issue-43925.rs b/src/test/ui/issues/issue-43925.rs similarity index 100% rename from src/test/ui/issue-43925.rs rename to src/test/ui/issues/issue-43925.rs diff --git a/src/test/ui/issue-43925.stderr b/src/test/ui/issues/issue-43925.stderr similarity index 100% rename from src/test/ui/issue-43925.stderr rename to src/test/ui/issues/issue-43925.stderr diff --git a/src/test/ui/issue-43926.rs b/src/test/ui/issues/issue-43926.rs similarity index 100% rename from src/test/ui/issue-43926.rs rename to src/test/ui/issues/issue-43926.rs diff --git a/src/test/ui/issue-43926.stderr b/src/test/ui/issues/issue-43926.stderr similarity index 100% rename from src/test/ui/issue-43926.stderr rename to src/test/ui/issues/issue-43926.stderr diff --git a/src/test/ui/issue-43988.rs b/src/test/ui/issues/issue-43988.rs similarity index 100% rename from src/test/ui/issue-43988.rs rename to src/test/ui/issues/issue-43988.rs diff --git a/src/test/ui/issue-43988.stderr b/src/test/ui/issues/issue-43988.stderr similarity index 100% rename from src/test/ui/issue-43988.stderr rename to src/test/ui/issues/issue-43988.stderr diff --git a/src/test/ui/issue-44021.rs b/src/test/ui/issues/issue-44021.rs similarity index 100% rename from src/test/ui/issue-44021.rs rename to src/test/ui/issues/issue-44021.rs diff --git a/src/test/ui/issue-44021.stderr b/src/test/ui/issues/issue-44021.stderr similarity index 100% rename from src/test/ui/issue-44021.stderr rename to src/test/ui/issues/issue-44021.stderr diff --git a/src/test/ui/issue-44023.rs b/src/test/ui/issues/issue-44023.rs similarity index 100% rename from src/test/ui/issue-44023.rs rename to src/test/ui/issues/issue-44023.rs diff --git a/src/test/ui/issue-44023.stderr b/src/test/ui/issues/issue-44023.stderr similarity index 100% rename from src/test/ui/issue-44023.stderr rename to src/test/ui/issues/issue-44023.stderr diff --git a/src/test/ui/issue-44078.rs b/src/test/ui/issues/issue-44078.rs similarity index 100% rename from src/test/ui/issue-44078.rs rename to src/test/ui/issues/issue-44078.rs diff --git a/src/test/ui/issue-44078.stderr b/src/test/ui/issues/issue-44078.stderr similarity index 100% rename from src/test/ui/issue-44078.stderr rename to src/test/ui/issues/issue-44078.stderr diff --git a/src/test/ui/issue-44239.rs b/src/test/ui/issues/issue-44239.rs similarity index 100% rename from src/test/ui/issue-44239.rs rename to src/test/ui/issues/issue-44239.rs diff --git a/src/test/ui/issue-44239.stderr b/src/test/ui/issues/issue-44239.stderr similarity index 100% rename from src/test/ui/issue-44239.stderr rename to src/test/ui/issues/issue-44239.stderr diff --git a/src/test/ui/issue-44373.rs b/src/test/ui/issues/issue-44373.rs similarity index 100% rename from src/test/ui/issue-44373.rs rename to src/test/ui/issues/issue-44373.rs diff --git a/src/test/ui/issue-44373.stderr b/src/test/ui/issues/issue-44373.stderr similarity index 100% rename from src/test/ui/issue-44373.stderr rename to src/test/ui/issues/issue-44373.stderr diff --git a/src/test/ui/issue-44406.rs b/src/test/ui/issues/issue-44406.rs similarity index 100% rename from src/test/ui/issue-44406.rs rename to src/test/ui/issues/issue-44406.rs diff --git a/src/test/ui/issue-44406.stderr b/src/test/ui/issues/issue-44406.stderr similarity index 100% rename from src/test/ui/issue-44406.stderr rename to src/test/ui/issues/issue-44406.stderr diff --git a/src/test/ui/issue-44415.rs b/src/test/ui/issues/issue-44415.rs similarity index 100% rename from src/test/ui/issue-44415.rs rename to src/test/ui/issues/issue-44415.rs diff --git a/src/test/ui/issue-44415.stderr b/src/test/ui/issues/issue-44415.stderr similarity index 100% rename from src/test/ui/issue-44415.stderr rename to src/test/ui/issues/issue-44415.stderr diff --git a/src/test/ui/issue-45087-unreachable-unsafe.rs b/src/test/ui/issues/issue-45087-unreachable-unsafe.rs similarity index 100% rename from src/test/ui/issue-45087-unreachable-unsafe.rs rename to src/test/ui/issues/issue-45087-unreachable-unsafe.rs diff --git a/src/test/ui/issue-45087-unreachable-unsafe.stderr b/src/test/ui/issues/issue-45087-unreachable-unsafe.stderr similarity index 100% rename from src/test/ui/issue-45087-unreachable-unsafe.stderr rename to src/test/ui/issues/issue-45087-unreachable-unsafe.stderr diff --git a/src/test/ui/issue-45107-unnecessary-unsafe-in-closure.rs b/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.rs similarity index 100% rename from src/test/ui/issue-45107-unnecessary-unsafe-in-closure.rs rename to src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.rs diff --git a/src/test/ui/issue-45107-unnecessary-unsafe-in-closure.stderr b/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.stderr similarity index 100% rename from src/test/ui/issue-45107-unnecessary-unsafe-in-closure.stderr rename to src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.stderr diff --git a/src/test/ui/issue-45157.rs b/src/test/ui/issues/issue-45157.rs similarity index 100% rename from src/test/ui/issue-45157.rs rename to src/test/ui/issues/issue-45157.rs diff --git a/src/test/ui/issue-45157.stderr b/src/test/ui/issues/issue-45157.stderr similarity index 100% rename from src/test/ui/issue-45157.stderr rename to src/test/ui/issues/issue-45157.stderr diff --git a/src/test/ui/issue-4517.rs b/src/test/ui/issues/issue-4517.rs similarity index 100% rename from src/test/ui/issue-4517.rs rename to src/test/ui/issues/issue-4517.rs diff --git a/src/test/ui/issue-4517.stderr b/src/test/ui/issues/issue-4517.stderr similarity index 100% rename from src/test/ui/issue-4517.stderr rename to src/test/ui/issues/issue-4517.stderr diff --git a/src/test/ui/issue-45199.ast.nll.stderr b/src/test/ui/issues/issue-45199.ast.nll.stderr similarity index 100% rename from src/test/ui/issue-45199.ast.nll.stderr rename to src/test/ui/issues/issue-45199.ast.nll.stderr diff --git a/src/test/ui/issue-45199.ast.stderr b/src/test/ui/issues/issue-45199.ast.stderr similarity index 100% rename from src/test/ui/issue-45199.ast.stderr rename to src/test/ui/issues/issue-45199.ast.stderr diff --git a/src/test/ui/issue-45199.mir.stderr b/src/test/ui/issues/issue-45199.mir.stderr similarity index 100% rename from src/test/ui/issue-45199.mir.stderr rename to src/test/ui/issues/issue-45199.mir.stderr diff --git a/src/test/ui/issue-45199.rs b/src/test/ui/issues/issue-45199.rs similarity index 100% rename from src/test/ui/issue-45199.rs rename to src/test/ui/issues/issue-45199.rs diff --git a/src/test/ui/issue-45296.rs b/src/test/ui/issues/issue-45296.rs similarity index 100% rename from src/test/ui/issue-45296.rs rename to src/test/ui/issues/issue-45296.rs diff --git a/src/test/ui/issue-45296.stderr b/src/test/ui/issues/issue-45296.stderr similarity index 100% rename from src/test/ui/issue-45296.stderr rename to src/test/ui/issues/issue-45296.stderr diff --git a/src/test/ui/issue-45562.fixed b/src/test/ui/issues/issue-45562.fixed similarity index 100% rename from src/test/ui/issue-45562.fixed rename to src/test/ui/issues/issue-45562.fixed diff --git a/src/test/ui/issue-45562.rs b/src/test/ui/issues/issue-45562.rs similarity index 100% rename from src/test/ui/issue-45562.rs rename to src/test/ui/issues/issue-45562.rs diff --git a/src/test/ui/issue-45562.stderr b/src/test/ui/issues/issue-45562.stderr similarity index 100% rename from src/test/ui/issue-45562.stderr rename to src/test/ui/issues/issue-45562.stderr diff --git a/src/test/ui/issue-45696-long-live-borrows-in-boxes.rs b/src/test/ui/issues/issue-45696-long-live-borrows-in-boxes.rs similarity index 100% rename from src/test/ui/issue-45696-long-live-borrows-in-boxes.rs rename to src/test/ui/issues/issue-45696-long-live-borrows-in-boxes.rs diff --git a/src/test/ui/issue-45696-no-variant-box-recur.rs b/src/test/ui/issues/issue-45696-no-variant-box-recur.rs similarity index 100% rename from src/test/ui/issue-45696-no-variant-box-recur.rs rename to src/test/ui/issues/issue-45696-no-variant-box-recur.rs diff --git a/src/test/ui/issue-45696-scribble-on-boxed-borrow.ast.stderr b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.ast.stderr similarity index 100% rename from src/test/ui/issue-45696-scribble-on-boxed-borrow.ast.stderr rename to src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.ast.stderr diff --git a/src/test/ui/issue-45696-scribble-on-boxed-borrow.migrate.stderr b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.migrate.stderr similarity index 100% rename from src/test/ui/issue-45696-scribble-on-boxed-borrow.migrate.stderr rename to src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.migrate.stderr diff --git a/src/test/ui/issue-45696-scribble-on-boxed-borrow.nll.stderr b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.nll.stderr similarity index 100% rename from src/test/ui/issue-45696-scribble-on-boxed-borrow.nll.stderr rename to src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.nll.stderr diff --git a/src/test/ui/issue-45696-scribble-on-boxed-borrow.rs b/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.rs similarity index 100% rename from src/test/ui/issue-45696-scribble-on-boxed-borrow.rs rename to src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.rs diff --git a/src/test/ui/issue-45697-1.rs b/src/test/ui/issues/issue-45697-1.rs similarity index 100% rename from src/test/ui/issue-45697-1.rs rename to src/test/ui/issues/issue-45697-1.rs diff --git a/src/test/ui/issue-45697-1.stderr b/src/test/ui/issues/issue-45697-1.stderr similarity index 100% rename from src/test/ui/issue-45697-1.stderr rename to src/test/ui/issues/issue-45697-1.stderr diff --git a/src/test/ui/issue-45697.rs b/src/test/ui/issues/issue-45697.rs similarity index 100% rename from src/test/ui/issue-45697.rs rename to src/test/ui/issues/issue-45697.rs diff --git a/src/test/ui/issue-45697.stderr b/src/test/ui/issues/issue-45697.stderr similarity index 100% rename from src/test/ui/issue-45697.stderr rename to src/test/ui/issues/issue-45697.stderr diff --git a/src/test/ui/issue-45729-unsafe-in-generator.rs b/src/test/ui/issues/issue-45729-unsafe-in-generator.rs similarity index 100% rename from src/test/ui/issue-45729-unsafe-in-generator.rs rename to src/test/ui/issues/issue-45729-unsafe-in-generator.rs diff --git a/src/test/ui/issue-45729-unsafe-in-generator.stderr b/src/test/ui/issues/issue-45729-unsafe-in-generator.stderr similarity index 100% rename from src/test/ui/issue-45729-unsafe-in-generator.stderr rename to src/test/ui/issues/issue-45729-unsafe-in-generator.stderr diff --git a/src/test/ui/issue-45730.rs b/src/test/ui/issues/issue-45730.rs similarity index 100% rename from src/test/ui/issue-45730.rs rename to src/test/ui/issues/issue-45730.rs diff --git a/src/test/ui/issue-45730.stderr b/src/test/ui/issues/issue-45730.stderr similarity index 100% rename from src/test/ui/issue-45730.stderr rename to src/test/ui/issues/issue-45730.stderr diff --git a/src/test/ui/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed b/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed similarity index 100% rename from src/test/ui/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed rename to src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed diff --git a/src/test/ui/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs b/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs similarity index 100% rename from src/test/ui/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs rename to src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs diff --git a/src/test/ui/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr b/src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr similarity index 100% rename from src/test/ui/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr rename to src/test/ui/issues/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr diff --git a/src/test/ui/issue-45801.rs b/src/test/ui/issues/issue-45801.rs similarity index 100% rename from src/test/ui/issue-45801.rs rename to src/test/ui/issues/issue-45801.rs diff --git a/src/test/ui/issue-45801.stderr b/src/test/ui/issues/issue-45801.stderr similarity index 100% rename from src/test/ui/issue-45801.stderr rename to src/test/ui/issues/issue-45801.stderr diff --git a/src/test/ui/issue-45965.rs b/src/test/ui/issues/issue-45965.rs similarity index 100% rename from src/test/ui/issue-45965.rs rename to src/test/ui/issues/issue-45965.rs diff --git a/src/test/ui/issue-45965.stderr b/src/test/ui/issues/issue-45965.stderr similarity index 100% rename from src/test/ui/issue-45965.stderr rename to src/test/ui/issues/issue-45965.stderr diff --git a/src/test/ui/issue-46023.ast.nll.stderr b/src/test/ui/issues/issue-46023.ast.nll.stderr similarity index 100% rename from src/test/ui/issue-46023.ast.nll.stderr rename to src/test/ui/issues/issue-46023.ast.nll.stderr diff --git a/src/test/ui/issue-46023.ast.stderr b/src/test/ui/issues/issue-46023.ast.stderr similarity index 100% rename from src/test/ui/issue-46023.ast.stderr rename to src/test/ui/issues/issue-46023.ast.stderr diff --git a/src/test/ui/issue-46023.mir.stderr b/src/test/ui/issues/issue-46023.mir.stderr similarity index 100% rename from src/test/ui/issue-46023.mir.stderr rename to src/test/ui/issues/issue-46023.mir.stderr diff --git a/src/test/ui/issue-46023.rs b/src/test/ui/issues/issue-46023.rs similarity index 100% rename from src/test/ui/issue-46023.rs rename to src/test/ui/issues/issue-46023.rs diff --git a/src/test/ui/issue-46036.rs b/src/test/ui/issues/issue-46036.rs similarity index 100% rename from src/test/ui/issue-46036.rs rename to src/test/ui/issues/issue-46036.rs diff --git a/src/test/ui/issue-46036.stderr b/src/test/ui/issues/issue-46036.stderr similarity index 100% rename from src/test/ui/issue-46036.stderr rename to src/test/ui/issues/issue-46036.stderr diff --git a/src/test/ui/issue-46112.rs b/src/test/ui/issues/issue-46112.rs similarity index 100% rename from src/test/ui/issue-46112.rs rename to src/test/ui/issues/issue-46112.rs diff --git a/src/test/ui/issue-46112.stderr b/src/test/ui/issues/issue-46112.stderr similarity index 100% rename from src/test/ui/issue-46112.stderr rename to src/test/ui/issues/issue-46112.stderr diff --git a/src/test/ui/issue-46186.rs b/src/test/ui/issues/issue-46186.rs similarity index 100% rename from src/test/ui/issue-46186.rs rename to src/test/ui/issues/issue-46186.rs diff --git a/src/test/ui/issue-46186.stderr b/src/test/ui/issues/issue-46186.stderr similarity index 100% rename from src/test/ui/issue-46186.stderr rename to src/test/ui/issues/issue-46186.stderr diff --git a/src/test/ui/compile-fail-migration/issue-46209-private-enum-variant-reexport.rs b/src/test/ui/issues/issue-46209-private-enum-variant-reexport.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-46209-private-enum-variant-reexport.rs rename to src/test/ui/issues/issue-46209-private-enum-variant-reexport.rs diff --git a/src/test/ui/compile-fail-migration/issue-46209-private-enum-variant-reexport.stderr b/src/test/ui/issues/issue-46209-private-enum-variant-reexport.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-46209-private-enum-variant-reexport.stderr rename to src/test/ui/issues/issue-46209-private-enum-variant-reexport.stderr diff --git a/src/test/ui/issue-46302.rs b/src/test/ui/issues/issue-46302.rs similarity index 100% rename from src/test/ui/issue-46302.rs rename to src/test/ui/issues/issue-46302.rs diff --git a/src/test/ui/issue-46302.stderr b/src/test/ui/issues/issue-46302.stderr similarity index 100% rename from src/test/ui/issue-46302.stderr rename to src/test/ui/issues/issue-46302.stderr diff --git a/src/test/ui/issue-46311.rs b/src/test/ui/issues/issue-46311.rs similarity index 100% rename from src/test/ui/issue-46311.rs rename to src/test/ui/issues/issue-46311.rs diff --git a/src/test/ui/issue-46311.stderr b/src/test/ui/issues/issue-46311.stderr similarity index 100% rename from src/test/ui/issue-46311.stderr rename to src/test/ui/issues/issue-46311.stderr diff --git a/src/test/ui/issue-46332.rs b/src/test/ui/issues/issue-46332.rs similarity index 100% rename from src/test/ui/issue-46332.rs rename to src/test/ui/issues/issue-46332.rs diff --git a/src/test/ui/issue-46332.stderr b/src/test/ui/issues/issue-46332.stderr similarity index 100% rename from src/test/ui/issue-46332.stderr rename to src/test/ui/issues/issue-46332.stderr diff --git a/src/test/ui/issue-46438.rs b/src/test/ui/issues/issue-46438.rs similarity index 100% rename from src/test/ui/issue-46438.rs rename to src/test/ui/issues/issue-46438.rs diff --git a/src/test/ui/issue-46438.stderr b/src/test/ui/issues/issue-46438.stderr similarity index 100% rename from src/test/ui/issue-46438.stderr rename to src/test/ui/issues/issue-46438.stderr diff --git a/src/test/ui/issue-46471-1.rs b/src/test/ui/issues/issue-46471-1.rs similarity index 100% rename from src/test/ui/issue-46471-1.rs rename to src/test/ui/issues/issue-46471-1.rs diff --git a/src/test/ui/issue-46471-1.stderr b/src/test/ui/issues/issue-46471-1.stderr similarity index 100% rename from src/test/ui/issue-46471-1.stderr rename to src/test/ui/issues/issue-46471-1.stderr diff --git a/src/test/ui/issue-46471.rs b/src/test/ui/issues/issue-46471.rs similarity index 100% rename from src/test/ui/issue-46471.rs rename to src/test/ui/issues/issue-46471.rs diff --git a/src/test/ui/issue-46471.stderr b/src/test/ui/issues/issue-46471.stderr similarity index 100% rename from src/test/ui/issue-46471.stderr rename to src/test/ui/issues/issue-46471.stderr diff --git a/src/test/ui/issue-46472.rs b/src/test/ui/issues/issue-46472.rs similarity index 100% rename from src/test/ui/issue-46472.rs rename to src/test/ui/issues/issue-46472.rs diff --git a/src/test/ui/issue-46472.stderr b/src/test/ui/issues/issue-46472.stderr similarity index 100% rename from src/test/ui/issue-46472.stderr rename to src/test/ui/issues/issue-46472.stderr diff --git a/src/test/ui/issue-46576.rs b/src/test/ui/issues/issue-46576.rs similarity index 100% rename from src/test/ui/issue-46576.rs rename to src/test/ui/issues/issue-46576.rs diff --git a/src/test/ui/issue-46576.stderr b/src/test/ui/issues/issue-46576.stderr similarity index 100% rename from src/test/ui/issue-46576.stderr rename to src/test/ui/issues/issue-46576.stderr diff --git a/src/test/ui/issue-46604.ast.nll.stderr b/src/test/ui/issues/issue-46604.ast.nll.stderr similarity index 100% rename from src/test/ui/issue-46604.ast.nll.stderr rename to src/test/ui/issues/issue-46604.ast.nll.stderr diff --git a/src/test/ui/issue-46604.ast.stderr b/src/test/ui/issues/issue-46604.ast.stderr similarity index 100% rename from src/test/ui/issue-46604.ast.stderr rename to src/test/ui/issues/issue-46604.ast.stderr diff --git a/src/test/ui/issue-46604.mir.stderr b/src/test/ui/issues/issue-46604.mir.stderr similarity index 100% rename from src/test/ui/issue-46604.mir.stderr rename to src/test/ui/issues/issue-46604.mir.stderr diff --git a/src/test/ui/issue-46604.rs b/src/test/ui/issues/issue-46604.rs similarity index 100% rename from src/test/ui/issue-46604.rs rename to src/test/ui/issues/issue-46604.rs diff --git a/src/test/ui/issue-46756-consider-borrowing-cast-or-binexpr.fixed b/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.fixed similarity index 100% rename from src/test/ui/issue-46756-consider-borrowing-cast-or-binexpr.fixed rename to src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.fixed diff --git a/src/test/ui/issue-46756-consider-borrowing-cast-or-binexpr.rs b/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.rs similarity index 100% rename from src/test/ui/issue-46756-consider-borrowing-cast-or-binexpr.rs rename to src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.rs diff --git a/src/test/ui/issue-46756-consider-borrowing-cast-or-binexpr.stderr b/src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.stderr similarity index 100% rename from src/test/ui/issue-46756-consider-borrowing-cast-or-binexpr.stderr rename to src/test/ui/issues/issue-46756-consider-borrowing-cast-or-binexpr.stderr diff --git a/src/test/ui/issue-46771.rs b/src/test/ui/issues/issue-46771.rs similarity index 100% rename from src/test/ui/issue-46771.rs rename to src/test/ui/issues/issue-46771.rs diff --git a/src/test/ui/issue-46771.stderr b/src/test/ui/issues/issue-46771.stderr similarity index 100% rename from src/test/ui/issue-46771.stderr rename to src/test/ui/issues/issue-46771.stderr diff --git a/src/test/ui/issue-46843.rs b/src/test/ui/issues/issue-46843.rs similarity index 100% rename from src/test/ui/issue-46843.rs rename to src/test/ui/issues/issue-46843.rs diff --git a/src/test/ui/issue-46843.stderr b/src/test/ui/issues/issue-46843.stderr similarity index 100% rename from src/test/ui/issue-46843.stderr rename to src/test/ui/issues/issue-46843.stderr diff --git a/src/test/ui/issue-46983.rs b/src/test/ui/issues/issue-46983.rs similarity index 100% rename from src/test/ui/issue-46983.rs rename to src/test/ui/issues/issue-46983.rs diff --git a/src/test/ui/issue-46983.stderr b/src/test/ui/issues/issue-46983.stderr similarity index 100% rename from src/test/ui/issue-46983.stderr rename to src/test/ui/issues/issue-46983.stderr diff --git a/src/test/ui/issue-47073-zero-padded-tuple-struct-indices.rs b/src/test/ui/issues/issue-47073-zero-padded-tuple-struct-indices.rs similarity index 100% rename from src/test/ui/issue-47073-zero-padded-tuple-struct-indices.rs rename to src/test/ui/issues/issue-47073-zero-padded-tuple-struct-indices.rs diff --git a/src/test/ui/issue-47073-zero-padded-tuple-struct-indices.stderr b/src/test/ui/issues/issue-47073-zero-padded-tuple-struct-indices.stderr similarity index 100% rename from src/test/ui/issue-47073-zero-padded-tuple-struct-indices.stderr rename to src/test/ui/issues/issue-47073-zero-padded-tuple-struct-indices.stderr diff --git a/src/test/ui/issue-47094.rs b/src/test/ui/issues/issue-47094.rs similarity index 100% rename from src/test/ui/issue-47094.rs rename to src/test/ui/issues/issue-47094.rs diff --git a/src/test/ui/issue-47094.stderr b/src/test/ui/issues/issue-47094.stderr similarity index 100% rename from src/test/ui/issue-47094.stderr rename to src/test/ui/issues/issue-47094.stderr diff --git a/src/test/ui/issue-47184.rs b/src/test/ui/issues/issue-47184.rs similarity index 100% rename from src/test/ui/issue-47184.rs rename to src/test/ui/issues/issue-47184.rs diff --git a/src/test/ui/issue-47184.stderr b/src/test/ui/issues/issue-47184.stderr similarity index 100% rename from src/test/ui/issue-47184.stderr rename to src/test/ui/issues/issue-47184.stderr diff --git a/src/test/ui/issue-47309.rs b/src/test/ui/issues/issue-47309.rs similarity index 100% rename from src/test/ui/issue-47309.rs rename to src/test/ui/issues/issue-47309.rs diff --git a/src/test/ui/issue-4736.rs b/src/test/ui/issues/issue-4736.rs similarity index 100% rename from src/test/ui/issue-4736.rs rename to src/test/ui/issues/issue-4736.rs diff --git a/src/test/ui/issue-4736.stderr b/src/test/ui/issues/issue-4736.stderr similarity index 100% rename from src/test/ui/issue-4736.stderr rename to src/test/ui/issues/issue-4736.stderr diff --git a/src/test/ui/issue-47377.rs b/src/test/ui/issues/issue-47377.rs similarity index 100% rename from src/test/ui/issue-47377.rs rename to src/test/ui/issues/issue-47377.rs diff --git a/src/test/ui/issue-47377.stderr b/src/test/ui/issues/issue-47377.stderr similarity index 100% rename from src/test/ui/issue-47377.stderr rename to src/test/ui/issues/issue-47377.stderr diff --git a/src/test/ui/issue-47380.rs b/src/test/ui/issues/issue-47380.rs similarity index 100% rename from src/test/ui/issue-47380.rs rename to src/test/ui/issues/issue-47380.rs diff --git a/src/test/ui/issue-47380.stderr b/src/test/ui/issues/issue-47380.stderr similarity index 100% rename from src/test/ui/issue-47380.stderr rename to src/test/ui/issues/issue-47380.stderr diff --git a/src/test/ui/issue-47412.rs b/src/test/ui/issues/issue-47412.rs similarity index 100% rename from src/test/ui/issue-47412.rs rename to src/test/ui/issues/issue-47412.rs diff --git a/src/test/ui/issue-47412.stderr b/src/test/ui/issues/issue-47412.stderr similarity index 100% rename from src/test/ui/issue-47412.stderr rename to src/test/ui/issues/issue-47412.stderr diff --git a/src/test/ui/issue-47511.rs b/src/test/ui/issues/issue-47511.rs similarity index 100% rename from src/test/ui/issue-47511.rs rename to src/test/ui/issues/issue-47511.rs diff --git a/src/test/ui/issue-47511.stderr b/src/test/ui/issues/issue-47511.stderr similarity index 100% rename from src/test/ui/issue-47511.stderr rename to src/test/ui/issues/issue-47511.stderr diff --git a/src/test/ui/issue-47623.rs b/src/test/ui/issues/issue-47623.rs similarity index 100% rename from src/test/ui/issue-47623.rs rename to src/test/ui/issues/issue-47623.rs diff --git a/src/test/ui/issue-47623.stderr b/src/test/ui/issues/issue-47623.stderr similarity index 100% rename from src/test/ui/issue-47623.stderr rename to src/test/ui/issues/issue-47623.stderr diff --git a/src/test/ui/issue-47646.rs b/src/test/ui/issues/issue-47646.rs similarity index 100% rename from src/test/ui/issue-47646.rs rename to src/test/ui/issues/issue-47646.rs diff --git a/src/test/ui/issue-47646.stderr b/src/test/ui/issues/issue-47646.stderr similarity index 100% rename from src/test/ui/issue-47646.stderr rename to src/test/ui/issues/issue-47646.stderr diff --git a/src/test/ui/issue-47706-trait.rs b/src/test/ui/issues/issue-47706-trait.rs similarity index 100% rename from src/test/ui/issue-47706-trait.rs rename to src/test/ui/issues/issue-47706-trait.rs diff --git a/src/test/ui/issue-47706-trait.stderr b/src/test/ui/issues/issue-47706-trait.stderr similarity index 100% rename from src/test/ui/issue-47706-trait.stderr rename to src/test/ui/issues/issue-47706-trait.stderr diff --git a/src/test/ui/issue-47706.rs b/src/test/ui/issues/issue-47706.rs similarity index 100% rename from src/test/ui/issue-47706.rs rename to src/test/ui/issues/issue-47706.rs diff --git a/src/test/ui/issue-47706.stderr b/src/test/ui/issues/issue-47706.stderr similarity index 100% rename from src/test/ui/issue-47706.stderr rename to src/test/ui/issues/issue-47706.stderr diff --git a/src/test/ui/issue-47715.rs b/src/test/ui/issues/issue-47715.rs similarity index 100% rename from src/test/ui/issue-47715.rs rename to src/test/ui/issues/issue-47715.rs diff --git a/src/test/ui/issue-47715.stderr b/src/test/ui/issues/issue-47715.stderr similarity index 100% rename from src/test/ui/issue-47715.stderr rename to src/test/ui/issues/issue-47715.stderr diff --git a/src/test/ui/issue-48131.rs b/src/test/ui/issues/issue-48131.rs similarity index 100% rename from src/test/ui/issue-48131.rs rename to src/test/ui/issues/issue-48131.rs diff --git a/src/test/ui/issue-48131.stderr b/src/test/ui/issues/issue-48131.stderr similarity index 100% rename from src/test/ui/issue-48131.stderr rename to src/test/ui/issues/issue-48131.stderr diff --git a/src/test/ui/issue-48132.rs b/src/test/ui/issues/issue-48132.rs similarity index 100% rename from src/test/ui/issue-48132.rs rename to src/test/ui/issues/issue-48132.rs diff --git a/src/test/ui/issue-48179.rs b/src/test/ui/issues/issue-48179.rs similarity index 100% rename from src/test/ui/issue-48179.rs rename to src/test/ui/issues/issue-48179.rs diff --git a/src/test/ui/issue-48276.rs b/src/test/ui/issues/issue-48276.rs similarity index 100% rename from src/test/ui/issue-48276.rs rename to src/test/ui/issues/issue-48276.rs diff --git a/src/test/ui/issue-48276.stderr b/src/test/ui/issues/issue-48276.stderr similarity index 100% rename from src/test/ui/issue-48276.stderr rename to src/test/ui/issues/issue-48276.stderr diff --git a/src/test/ui/issue-48364.rs b/src/test/ui/issues/issue-48364.rs similarity index 100% rename from src/test/ui/issue-48364.rs rename to src/test/ui/issues/issue-48364.rs diff --git a/src/test/ui/issue-48364.stderr b/src/test/ui/issues/issue-48364.stderr similarity index 100% rename from src/test/ui/issue-48364.stderr rename to src/test/ui/issues/issue-48364.stderr diff --git a/src/test/ui/issue-48636.fixed b/src/test/ui/issues/issue-48636.fixed similarity index 100% rename from src/test/ui/issue-48636.fixed rename to src/test/ui/issues/issue-48636.fixed diff --git a/src/test/ui/issue-48636.rs b/src/test/ui/issues/issue-48636.rs similarity index 100% rename from src/test/ui/issue-48636.rs rename to src/test/ui/issues/issue-48636.rs diff --git a/src/test/ui/issue-48636.stderr b/src/test/ui/issues/issue-48636.stderr similarity index 100% rename from src/test/ui/issue-48636.stderr rename to src/test/ui/issues/issue-48636.stderr diff --git a/src/test/ui/issue-48728.rs b/src/test/ui/issues/issue-48728.rs similarity index 100% rename from src/test/ui/issue-48728.rs rename to src/test/ui/issues/issue-48728.rs diff --git a/src/test/ui/issue-48728.stderr b/src/test/ui/issues/issue-48728.stderr similarity index 100% rename from src/test/ui/issue-48728.stderr rename to src/test/ui/issues/issue-48728.stderr diff --git a/src/test/ui/issue-48803.rs b/src/test/ui/issues/issue-48803.rs similarity index 100% rename from src/test/ui/issue-48803.rs rename to src/test/ui/issues/issue-48803.rs diff --git a/src/test/ui/issue-48803.stderr b/src/test/ui/issues/issue-48803.stderr similarity index 100% rename from src/test/ui/issue-48803.stderr rename to src/test/ui/issues/issue-48803.stderr diff --git a/src/test/ui/issue-48838.rs b/src/test/ui/issues/issue-48838.rs similarity index 100% rename from src/test/ui/issue-48838.rs rename to src/test/ui/issues/issue-48838.rs diff --git a/src/test/ui/issue-48838.stderr b/src/test/ui/issues/issue-48838.stderr similarity index 100% rename from src/test/ui/issue-48838.stderr rename to src/test/ui/issues/issue-48838.stderr diff --git a/src/test/ui/issue-49040.rs b/src/test/ui/issues/issue-49040.rs similarity index 100% rename from src/test/ui/issue-49040.rs rename to src/test/ui/issues/issue-49040.rs diff --git a/src/test/ui/issue-49040.stderr b/src/test/ui/issues/issue-49040.stderr similarity index 100% rename from src/test/ui/issue-49040.stderr rename to src/test/ui/issues/issue-49040.stderr diff --git a/src/test/ui/issue-49074.rs b/src/test/ui/issues/issue-49074.rs similarity index 100% rename from src/test/ui/issue-49074.rs rename to src/test/ui/issues/issue-49074.rs diff --git a/src/test/ui/issue-49074.stderr b/src/test/ui/issues/issue-49074.stderr similarity index 100% rename from src/test/ui/issue-49074.stderr rename to src/test/ui/issues/issue-49074.stderr diff --git a/src/test/ui/issue-49257.rs b/src/test/ui/issues/issue-49257.rs similarity index 100% rename from src/test/ui/issue-49257.rs rename to src/test/ui/issues/issue-49257.rs diff --git a/src/test/ui/issue-49257.stderr b/src/test/ui/issues/issue-49257.stderr similarity index 100% rename from src/test/ui/issue-49257.stderr rename to src/test/ui/issues/issue-49257.stderr diff --git a/src/test/ui/issue-4935.rs b/src/test/ui/issues/issue-4935.rs similarity index 100% rename from src/test/ui/issue-4935.rs rename to src/test/ui/issues/issue-4935.rs diff --git a/src/test/ui/issue-4935.stderr b/src/test/ui/issues/issue-4935.stderr similarity index 100% rename from src/test/ui/issue-4935.stderr rename to src/test/ui/issues/issue-4935.stderr diff --git a/src/test/ui/issue-49579.rs b/src/test/ui/issues/issue-49579.rs similarity index 100% rename from src/test/ui/issue-49579.rs rename to src/test/ui/issues/issue-49579.rs diff --git a/src/test/ui/issue-4968.rs b/src/test/ui/issues/issue-4968.rs similarity index 100% rename from src/test/ui/issue-4968.rs rename to src/test/ui/issues/issue-4968.rs diff --git a/src/test/ui/issue-4968.stderr b/src/test/ui/issues/issue-4968.stderr similarity index 100% rename from src/test/ui/issue-4968.stderr rename to src/test/ui/issues/issue-4968.stderr diff --git a/src/test/ui/issue-4972.rs b/src/test/ui/issues/issue-4972.rs similarity index 100% rename from src/test/ui/issue-4972.rs rename to src/test/ui/issues/issue-4972.rs diff --git a/src/test/ui/issue-4972.stderr b/src/test/ui/issues/issue-4972.stderr similarity index 100% rename from src/test/ui/issue-4972.stderr rename to src/test/ui/issues/issue-4972.stderr diff --git a/src/test/ui/issue-49824.nll.stderr b/src/test/ui/issues/issue-49824.nll.stderr similarity index 100% rename from src/test/ui/issue-49824.nll.stderr rename to src/test/ui/issues/issue-49824.nll.stderr diff --git a/src/test/ui/issue-49824.rs b/src/test/ui/issues/issue-49824.rs similarity index 100% rename from src/test/ui/issue-49824.rs rename to src/test/ui/issues/issue-49824.rs diff --git a/src/test/ui/issue-49824.stderr b/src/test/ui/issues/issue-49824.stderr similarity index 100% rename from src/test/ui/issue-49824.stderr rename to src/test/ui/issues/issue-49824.stderr diff --git a/src/test/ui/issue-49851/compiler-builtins-error.rs b/src/test/ui/issues/issue-49851/compiler-builtins-error.rs similarity index 100% rename from src/test/ui/issue-49851/compiler-builtins-error.rs rename to src/test/ui/issues/issue-49851/compiler-builtins-error.rs diff --git a/src/test/ui/issue-49851/compiler-builtins-error.stderr b/src/test/ui/issues/issue-49851/compiler-builtins-error.stderr similarity index 100% rename from src/test/ui/issue-49851/compiler-builtins-error.stderr rename to src/test/ui/issues/issue-49851/compiler-builtins-error.stderr diff --git a/src/test/ui/issue-49934.rs b/src/test/ui/issues/issue-49934.rs similarity index 100% rename from src/test/ui/issue-49934.rs rename to src/test/ui/issues/issue-49934.rs diff --git a/src/test/ui/issue-49934.stderr b/src/test/ui/issues/issue-49934.stderr similarity index 100% rename from src/test/ui/issue-49934.stderr rename to src/test/ui/issues/issue-49934.stderr diff --git a/src/test/ui/issue-50187.rs b/src/test/ui/issues/issue-50187.rs similarity index 100% rename from src/test/ui/issue-50187.rs rename to src/test/ui/issues/issue-50187.rs diff --git a/src/test/ui/compile-fail-migration/issue-50264-inner-deref-trait/option_deref.rs b/src/test/ui/issues/issue-50264-inner-deref-trait/option_deref.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-50264-inner-deref-trait/option_deref.rs rename to src/test/ui/issues/issue-50264-inner-deref-trait/option_deref.rs diff --git a/src/test/ui/compile-fail-migration/issue-50264-inner-deref-trait/option_deref.stderr b/src/test/ui/issues/issue-50264-inner-deref-trait/option_deref.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-50264-inner-deref-trait/option_deref.stderr rename to src/test/ui/issues/issue-50264-inner-deref-trait/option_deref.stderr diff --git a/src/test/ui/compile-fail-migration/issue-50264-inner-deref-trait/result_deref.rs b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-50264-inner-deref-trait/result_deref.rs rename to src/test/ui/issues/issue-50264-inner-deref-trait/result_deref.rs diff --git a/src/test/ui/compile-fail-migration/issue-50264-inner-deref-trait/result_deref.stderr b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-50264-inner-deref-trait/result_deref.stderr rename to src/test/ui/issues/issue-50264-inner-deref-trait/result_deref.stderr diff --git a/src/test/ui/compile-fail-migration/issue-50264-inner-deref-trait/result_deref_err.rs b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_err.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-50264-inner-deref-trait/result_deref_err.rs rename to src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_err.rs diff --git a/src/test/ui/compile-fail-migration/issue-50264-inner-deref-trait/result_deref_err.stderr b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_err.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-50264-inner-deref-trait/result_deref_err.stderr rename to src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_err.stderr diff --git a/src/test/ui/compile-fail-migration/issue-50264-inner-deref-trait/result_deref_ok.rs b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_ok.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-50264-inner-deref-trait/result_deref_ok.rs rename to src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_ok.rs diff --git a/src/test/ui/compile-fail-migration/issue-50264-inner-deref-trait/result_deref_ok.stderr b/src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_ok.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-50264-inner-deref-trait/result_deref_ok.stderr rename to src/test/ui/issues/issue-50264-inner-deref-trait/result_deref_ok.stderr diff --git a/src/test/ui/issue-50403.rs b/src/test/ui/issues/issue-50403.rs similarity index 100% rename from src/test/ui/issue-50403.rs rename to src/test/ui/issues/issue-50403.rs diff --git a/src/test/ui/issue-50403.stderr b/src/test/ui/issues/issue-50403.stderr similarity index 100% rename from src/test/ui/issue-50403.stderr rename to src/test/ui/issues/issue-50403.stderr diff --git a/src/test/ui/issue-50471.rs b/src/test/ui/issues/issue-50471.rs similarity index 100% rename from src/test/ui/issue-50471.rs rename to src/test/ui/issues/issue-50471.rs diff --git a/src/test/ui/issue-50480.rs b/src/test/ui/issues/issue-50480.rs similarity index 100% rename from src/test/ui/issue-50480.rs rename to src/test/ui/issues/issue-50480.rs diff --git a/src/test/ui/issue-50480.stderr b/src/test/ui/issues/issue-50480.stderr similarity index 100% rename from src/test/ui/issue-50480.stderr rename to src/test/ui/issues/issue-50480.stderr diff --git a/src/test/ui/issue-50576.rs b/src/test/ui/issues/issue-50576.rs similarity index 100% rename from src/test/ui/issue-50576.rs rename to src/test/ui/issues/issue-50576.rs diff --git a/src/test/ui/issue-50576.stderr b/src/test/ui/issues/issue-50576.stderr similarity index 100% rename from src/test/ui/issue-50576.stderr rename to src/test/ui/issues/issue-50576.stderr diff --git a/src/test/ui/issue-50577.rs b/src/test/ui/issues/issue-50577.rs similarity index 100% rename from src/test/ui/issue-50577.rs rename to src/test/ui/issues/issue-50577.rs diff --git a/src/test/ui/issue-50577.stderr b/src/test/ui/issues/issue-50577.stderr similarity index 100% rename from src/test/ui/issue-50577.stderr rename to src/test/ui/issues/issue-50577.stderr diff --git a/src/test/ui/issue-50581.rs b/src/test/ui/issues/issue-50581.rs similarity index 100% rename from src/test/ui/issue-50581.rs rename to src/test/ui/issues/issue-50581.rs diff --git a/src/test/ui/issue-50581.stderr b/src/test/ui/issues/issue-50581.stderr similarity index 100% rename from src/test/ui/issue-50581.stderr rename to src/test/ui/issues/issue-50581.stderr diff --git a/src/test/ui/issue-50585.rs b/src/test/ui/issues/issue-50585.rs similarity index 100% rename from src/test/ui/issue-50585.rs rename to src/test/ui/issues/issue-50585.rs diff --git a/src/test/ui/issue-50585.stderr b/src/test/ui/issues/issue-50585.stderr similarity index 100% rename from src/test/ui/issue-50585.stderr rename to src/test/ui/issues/issue-50585.stderr diff --git a/src/test/ui/issue-50599.rs b/src/test/ui/issues/issue-50599.rs similarity index 100% rename from src/test/ui/issue-50599.rs rename to src/test/ui/issues/issue-50599.rs diff --git a/src/test/ui/issue-50599.stderr b/src/test/ui/issues/issue-50599.stderr similarity index 100% rename from src/test/ui/issue-50599.stderr rename to src/test/ui/issues/issue-50599.stderr diff --git a/src/test/ui/issue-50600.rs b/src/test/ui/issues/issue-50600.rs similarity index 100% rename from src/test/ui/issue-50600.rs rename to src/test/ui/issues/issue-50600.rs diff --git a/src/test/ui/issue-50600.stderr b/src/test/ui/issues/issue-50600.stderr similarity index 100% rename from src/test/ui/issue-50600.stderr rename to src/test/ui/issues/issue-50600.stderr diff --git a/src/test/ui/issue-50618.rs b/src/test/ui/issues/issue-50618.rs similarity index 100% rename from src/test/ui/issue-50618.rs rename to src/test/ui/issues/issue-50618.rs diff --git a/src/test/ui/issue-50618.stderr b/src/test/ui/issues/issue-50618.stderr similarity index 100% rename from src/test/ui/issue-50618.stderr rename to src/test/ui/issues/issue-50618.stderr diff --git a/src/test/ui/issue-5062.rs b/src/test/ui/issues/issue-5062.rs similarity index 100% rename from src/test/ui/issue-5062.rs rename to src/test/ui/issues/issue-5062.rs diff --git a/src/test/ui/issue-5062.stderr b/src/test/ui/issues/issue-5062.stderr similarity index 100% rename from src/test/ui/issue-5062.stderr rename to src/test/ui/issues/issue-5062.stderr diff --git a/src/test/ui/issue-5067.rs b/src/test/ui/issues/issue-5067.rs similarity index 100% rename from src/test/ui/issue-5067.rs rename to src/test/ui/issues/issue-5067.rs diff --git a/src/test/ui/issue-5067.stderr b/src/test/ui/issues/issue-5067.stderr similarity index 100% rename from src/test/ui/issue-5067.stderr rename to src/test/ui/issues/issue-5067.stderr diff --git a/src/test/ui/issue-50688.rs b/src/test/ui/issues/issue-50688.rs similarity index 100% rename from src/test/ui/issue-50688.rs rename to src/test/ui/issues/issue-50688.rs diff --git a/src/test/ui/issue-50688.stderr b/src/test/ui/issues/issue-50688.stderr similarity index 100% rename from src/test/ui/issue-50688.stderr rename to src/test/ui/issues/issue-50688.stderr diff --git a/src/test/ui/issue-50714-1.rs b/src/test/ui/issues/issue-50714-1.rs similarity index 100% rename from src/test/ui/issue-50714-1.rs rename to src/test/ui/issues/issue-50714-1.rs diff --git a/src/test/ui/issue-50714-1.stderr b/src/test/ui/issues/issue-50714-1.stderr similarity index 100% rename from src/test/ui/issue-50714-1.stderr rename to src/test/ui/issues/issue-50714-1.stderr diff --git a/src/test/ui/issue-50714.rs b/src/test/ui/issues/issue-50714.rs similarity index 100% rename from src/test/ui/issue-50714.rs rename to src/test/ui/issues/issue-50714.rs diff --git a/src/test/ui/issue-50714.stderr b/src/test/ui/issues/issue-50714.stderr similarity index 100% rename from src/test/ui/issue-50714.stderr rename to src/test/ui/issues/issue-50714.stderr diff --git a/src/test/ui/issue-50761.rs b/src/test/ui/issues/issue-50761.rs similarity index 100% rename from src/test/ui/issue-50761.rs rename to src/test/ui/issues/issue-50761.rs diff --git a/src/test/ui/issue-50781.rs b/src/test/ui/issues/issue-50781.rs similarity index 100% rename from src/test/ui/issue-50781.rs rename to src/test/ui/issues/issue-50781.rs diff --git a/src/test/ui/issue-50781.stderr b/src/test/ui/issues/issue-50781.stderr similarity index 100% rename from src/test/ui/issue-50781.stderr rename to src/test/ui/issues/issue-50781.stderr diff --git a/src/test/ui/issue-50802.rs b/src/test/ui/issues/issue-50802.rs similarity index 100% rename from src/test/ui/issue-50802.rs rename to src/test/ui/issues/issue-50802.rs diff --git a/src/test/ui/issue-50802.stderr b/src/test/ui/issues/issue-50802.stderr similarity index 100% rename from src/test/ui/issue-50802.stderr rename to src/test/ui/issues/issue-50802.stderr diff --git a/src/test/ui/issue-50825-1.rs b/src/test/ui/issues/issue-50825-1.rs similarity index 100% rename from src/test/ui/issue-50825-1.rs rename to src/test/ui/issues/issue-50825-1.rs diff --git a/src/test/ui/issue-50825.rs b/src/test/ui/issues/issue-50825.rs similarity index 100% rename from src/test/ui/issue-50825.rs rename to src/test/ui/issues/issue-50825.rs diff --git a/src/test/ui/issue-5099.rs b/src/test/ui/issues/issue-5099.rs similarity index 100% rename from src/test/ui/issue-5099.rs rename to src/test/ui/issues/issue-5099.rs diff --git a/src/test/ui/issue-5099.stderr b/src/test/ui/issues/issue-5099.stderr similarity index 100% rename from src/test/ui/issue-5099.stderr rename to src/test/ui/issues/issue-5099.stderr diff --git a/src/test/ui/issue-50993.rs b/src/test/ui/issues/issue-50993.rs similarity index 100% rename from src/test/ui/issue-50993.rs rename to src/test/ui/issues/issue-50993.rs diff --git a/src/test/ui/issue-50993.stderr b/src/test/ui/issues/issue-50993.stderr similarity index 100% rename from src/test/ui/issue-50993.stderr rename to src/test/ui/issues/issue-50993.stderr diff --git a/src/test/ui/issue-5100.rs b/src/test/ui/issues/issue-5100.rs similarity index 100% rename from src/test/ui/issue-5100.rs rename to src/test/ui/issues/issue-5100.rs diff --git a/src/test/ui/issue-5100.stderr b/src/test/ui/issues/issue-5100.stderr similarity index 100% rename from src/test/ui/issue-5100.stderr rename to src/test/ui/issues/issue-5100.stderr diff --git a/src/test/ui/issue-51022.rs b/src/test/ui/issues/issue-51022.rs similarity index 100% rename from src/test/ui/issue-51022.rs rename to src/test/ui/issues/issue-51022.rs diff --git a/src/test/ui/issue-51022.stderr b/src/test/ui/issues/issue-51022.stderr similarity index 100% rename from src/test/ui/issue-51022.stderr rename to src/test/ui/issues/issue-51022.stderr diff --git a/src/test/ui/issue-51044.rs b/src/test/ui/issues/issue-51044.rs similarity index 100% rename from src/test/ui/issue-51044.rs rename to src/test/ui/issues/issue-51044.rs diff --git a/src/test/ui/issue-51102.rs b/src/test/ui/issues/issue-51102.rs similarity index 100% rename from src/test/ui/issue-51102.rs rename to src/test/ui/issues/issue-51102.rs diff --git a/src/test/ui/issue-51102.stderr b/src/test/ui/issues/issue-51102.stderr similarity index 100% rename from src/test/ui/issue-51102.stderr rename to src/test/ui/issues/issue-51102.stderr diff --git a/src/test/ui/issue-51116.rs b/src/test/ui/issues/issue-51116.rs similarity index 100% rename from src/test/ui/issue-51116.rs rename to src/test/ui/issues/issue-51116.rs diff --git a/src/test/ui/issue-51116.stderr b/src/test/ui/issues/issue-51116.stderr similarity index 100% rename from src/test/ui/issue-51116.stderr rename to src/test/ui/issues/issue-51116.stderr diff --git a/src/test/ui/issue-51244.nll.stderr b/src/test/ui/issues/issue-51244.nll.stderr similarity index 100% rename from src/test/ui/issue-51244.nll.stderr rename to src/test/ui/issues/issue-51244.nll.stderr diff --git a/src/test/ui/issue-51244.rs b/src/test/ui/issues/issue-51244.rs similarity index 100% rename from src/test/ui/issue-51244.rs rename to src/test/ui/issues/issue-51244.rs diff --git a/src/test/ui/issue-51244.stderr b/src/test/ui/issues/issue-51244.stderr similarity index 100% rename from src/test/ui/issue-51244.stderr rename to src/test/ui/issues/issue-51244.stderr diff --git a/src/test/ui/issue-51279.rs b/src/test/ui/issues/issue-51279.rs similarity index 100% rename from src/test/ui/issue-51279.rs rename to src/test/ui/issues/issue-51279.rs diff --git a/src/test/ui/issue-51279.stderr b/src/test/ui/issues/issue-51279.stderr similarity index 100% rename from src/test/ui/issue-51279.stderr rename to src/test/ui/issues/issue-51279.stderr diff --git a/src/test/ui/issue-51515.rs b/src/test/ui/issues/issue-51515.rs similarity index 100% rename from src/test/ui/issue-51515.rs rename to src/test/ui/issues/issue-51515.rs diff --git a/src/test/ui/issue-51515.stderr b/src/test/ui/issues/issue-51515.stderr similarity index 100% rename from src/test/ui/issue-51515.stderr rename to src/test/ui/issues/issue-51515.stderr diff --git a/src/test/ui/issue-5153.rs b/src/test/ui/issues/issue-5153.rs similarity index 100% rename from src/test/ui/issue-5153.rs rename to src/test/ui/issues/issue-5153.rs diff --git a/src/test/ui/issue-5153.stderr b/src/test/ui/issues/issue-5153.stderr similarity index 100% rename from src/test/ui/issue-5153.stderr rename to src/test/ui/issues/issue-5153.stderr diff --git a/src/test/ui/issue-51632-try-desugar-incompatible-types.fixed b/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.fixed similarity index 100% rename from src/test/ui/issue-51632-try-desugar-incompatible-types.fixed rename to src/test/ui/issues/issue-51632-try-desugar-incompatible-types.fixed diff --git a/src/test/ui/issue-51632-try-desugar-incompatible-types.rs b/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.rs similarity index 100% rename from src/test/ui/issue-51632-try-desugar-incompatible-types.rs rename to src/test/ui/issues/issue-51632-try-desugar-incompatible-types.rs diff --git a/src/test/ui/issue-51632-try-desugar-incompatible-types.stderr b/src/test/ui/issues/issue-51632-try-desugar-incompatible-types.stderr similarity index 100% rename from src/test/ui/issue-51632-try-desugar-incompatible-types.stderr rename to src/test/ui/issues/issue-51632-try-desugar-incompatible-types.stderr diff --git a/src/test/ui/issue-51714.rs b/src/test/ui/issues/issue-51714.rs similarity index 100% rename from src/test/ui/issue-51714.rs rename to src/test/ui/issues/issue-51714.rs diff --git a/src/test/ui/issue-51714.stderr b/src/test/ui/issues/issue-51714.stderr similarity index 100% rename from src/test/ui/issue-51714.stderr rename to src/test/ui/issues/issue-51714.stderr diff --git a/src/test/ui/issue-51848.rs b/src/test/ui/issues/issue-51848.rs similarity index 100% rename from src/test/ui/issue-51848.rs rename to src/test/ui/issues/issue-51848.rs diff --git a/src/test/ui/issue-51848.stderr b/src/test/ui/issues/issue-51848.stderr similarity index 100% rename from src/test/ui/issue-51848.stderr rename to src/test/ui/issues/issue-51848.stderr diff --git a/src/test/ui/issue-51874.rs b/src/test/ui/issues/issue-51874.rs similarity index 100% rename from src/test/ui/issue-51874.rs rename to src/test/ui/issues/issue-51874.rs diff --git a/src/test/ui/issue-51874.stderr b/src/test/ui/issues/issue-51874.stderr similarity index 100% rename from src/test/ui/issue-51874.stderr rename to src/test/ui/issues/issue-51874.stderr diff --git a/src/test/ui/issue-52023-array-size-pointer-cast.rs b/src/test/ui/issues/issue-52023-array-size-pointer-cast.rs similarity index 100% rename from src/test/ui/issue-52023-array-size-pointer-cast.rs rename to src/test/ui/issues/issue-52023-array-size-pointer-cast.rs diff --git a/src/test/ui/issue-52023-array-size-pointer-cast.stderr b/src/test/ui/issues/issue-52023-array-size-pointer-cast.stderr similarity index 100% rename from src/test/ui/issue-52023-array-size-pointer-cast.stderr rename to src/test/ui/issues/issue-52023-array-size-pointer-cast.stderr diff --git a/src/test/ui/issue-52049.nll.stderr b/src/test/ui/issues/issue-52049.nll.stderr similarity index 100% rename from src/test/ui/issue-52049.nll.stderr rename to src/test/ui/issues/issue-52049.nll.stderr diff --git a/src/test/ui/issue-52049.rs b/src/test/ui/issues/issue-52049.rs similarity index 100% rename from src/test/ui/issue-52049.rs rename to src/test/ui/issues/issue-52049.rs diff --git a/src/test/ui/issue-52049.stderr b/src/test/ui/issues/issue-52049.stderr similarity index 100% rename from src/test/ui/issue-52049.stderr rename to src/test/ui/issues/issue-52049.stderr diff --git a/src/test/ui/issue-52057.rs b/src/test/ui/issues/issue-52057.rs similarity index 100% rename from src/test/ui/issue-52057.rs rename to src/test/ui/issues/issue-52057.rs diff --git a/src/test/ui/issue-52126-assign-op-invariance.nll.stderr b/src/test/ui/issues/issue-52126-assign-op-invariance.nll.stderr similarity index 100% rename from src/test/ui/issue-52126-assign-op-invariance.nll.stderr rename to src/test/ui/issues/issue-52126-assign-op-invariance.nll.stderr diff --git a/src/test/ui/issue-52126-assign-op-invariance.rs b/src/test/ui/issues/issue-52126-assign-op-invariance.rs similarity index 100% rename from src/test/ui/issue-52126-assign-op-invariance.rs rename to src/test/ui/issues/issue-52126-assign-op-invariance.rs diff --git a/src/test/ui/issue-52126-assign-op-invariance.stderr b/src/test/ui/issues/issue-52126-assign-op-invariance.stderr similarity index 100% rename from src/test/ui/issue-52126-assign-op-invariance.stderr rename to src/test/ui/issues/issue-52126-assign-op-invariance.stderr diff --git a/src/test/ui/issue-5216.rs b/src/test/ui/issues/issue-5216.rs similarity index 100% rename from src/test/ui/issue-5216.rs rename to src/test/ui/issues/issue-5216.rs diff --git a/src/test/ui/issue-5216.stderr b/src/test/ui/issues/issue-5216.stderr similarity index 100% rename from src/test/ui/issue-5216.stderr rename to src/test/ui/issues/issue-5216.stderr diff --git a/src/test/ui/issue-52213.nll.stderr b/src/test/ui/issues/issue-52213.nll.stderr similarity index 100% rename from src/test/ui/issue-52213.nll.stderr rename to src/test/ui/issues/issue-52213.nll.stderr diff --git a/src/test/ui/issue-52213.rs b/src/test/ui/issues/issue-52213.rs similarity index 100% rename from src/test/ui/issue-52213.rs rename to src/test/ui/issues/issue-52213.rs diff --git a/src/test/ui/issue-52213.stderr b/src/test/ui/issues/issue-52213.stderr similarity index 100% rename from src/test/ui/issue-52213.stderr rename to src/test/ui/issues/issue-52213.stderr diff --git a/src/test/ui/issue-5239-1.rs b/src/test/ui/issues/issue-5239-1.rs similarity index 100% rename from src/test/ui/issue-5239-1.rs rename to src/test/ui/issues/issue-5239-1.rs diff --git a/src/test/ui/issue-5239-1.stderr b/src/test/ui/issues/issue-5239-1.stderr similarity index 100% rename from src/test/ui/issue-5239-1.stderr rename to src/test/ui/issues/issue-5239-1.stderr diff --git a/src/test/ui/compile-fail-migration/issue-52489.rs b/src/test/ui/issues/issue-52489.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-52489.rs rename to src/test/ui/issues/issue-52489.rs diff --git a/src/test/ui/compile-fail-migration/issue-52489.stderr b/src/test/ui/issues/issue-52489.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-52489.stderr rename to src/test/ui/issues/issue-52489.stderr diff --git a/src/test/ui/issue-52533-1.nll.stderr b/src/test/ui/issues/issue-52533-1.nll.stderr similarity index 100% rename from src/test/ui/issue-52533-1.nll.stderr rename to src/test/ui/issues/issue-52533-1.nll.stderr diff --git a/src/test/ui/issue-52533-1.rs b/src/test/ui/issues/issue-52533-1.rs similarity index 100% rename from src/test/ui/issue-52533-1.rs rename to src/test/ui/issues/issue-52533-1.rs diff --git a/src/test/ui/issue-52533-1.stderr b/src/test/ui/issues/issue-52533-1.stderr similarity index 100% rename from src/test/ui/issue-52533-1.stderr rename to src/test/ui/issues/issue-52533-1.stderr diff --git a/src/test/ui/issue-52533.nll.stderr b/src/test/ui/issues/issue-52533.nll.stderr similarity index 100% rename from src/test/ui/issue-52533.nll.stderr rename to src/test/ui/issues/issue-52533.nll.stderr diff --git a/src/test/ui/issue-52533.rs b/src/test/ui/issues/issue-52533.rs similarity index 100% rename from src/test/ui/issue-52533.rs rename to src/test/ui/issues/issue-52533.rs diff --git a/src/test/ui/issue-52533.stderr b/src/test/ui/issues/issue-52533.stderr similarity index 100% rename from src/test/ui/issue-52533.stderr rename to src/test/ui/issues/issue-52533.stderr diff --git a/src/test/ui/issue-5358-1.rs b/src/test/ui/issues/issue-5358-1.rs similarity index 100% rename from src/test/ui/issue-5358-1.rs rename to src/test/ui/issues/issue-5358-1.rs diff --git a/src/test/ui/issue-5358-1.stderr b/src/test/ui/issues/issue-5358-1.stderr similarity index 100% rename from src/test/ui/issue-5358-1.stderr rename to src/test/ui/issues/issue-5358-1.stderr diff --git a/src/test/ui/issue-5439.rs b/src/test/ui/issues/issue-5439.rs similarity index 100% rename from src/test/ui/issue-5439.rs rename to src/test/ui/issues/issue-5439.rs diff --git a/src/test/ui/issue-5439.stderr b/src/test/ui/issues/issue-5439.stderr similarity index 100% rename from src/test/ui/issue-5439.stderr rename to src/test/ui/issues/issue-5439.stderr diff --git a/src/test/ui/compile-fail-migration/issue-5500-1.ast.stderr b/src/test/ui/issues/issue-5500-1.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-5500-1.ast.stderr rename to src/test/ui/issues/issue-5500-1.ast.stderr diff --git a/src/test/ui/compile-fail-migration/issue-5500-1.mir.stderr b/src/test/ui/issues/issue-5500-1.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-5500-1.mir.stderr rename to src/test/ui/issues/issue-5500-1.mir.stderr diff --git a/src/test/ui/compile-fail-migration/issue-5500-1.rs b/src/test/ui/issues/issue-5500-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-5500-1.rs rename to src/test/ui/issues/issue-5500-1.rs diff --git a/src/test/ui/compile-fail-migration/issue-5844.rs b/src/test/ui/issues/issue-5844.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue-5844.rs rename to src/test/ui/issues/issue-5844.rs diff --git a/src/test/ui/compile-fail-migration/issue-5844.stderr b/src/test/ui/issues/issue-5844.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue-5844.stderr rename to src/test/ui/issues/issue-5844.stderr diff --git a/src/test/ui/issue-5883.rs b/src/test/ui/issues/issue-5883.rs similarity index 100% rename from src/test/ui/issue-5883.rs rename to src/test/ui/issues/issue-5883.rs diff --git a/src/test/ui/issue-5883.stderr b/src/test/ui/issues/issue-5883.stderr similarity index 100% rename from src/test/ui/issue-5883.stderr rename to src/test/ui/issues/issue-5883.stderr diff --git a/src/test/ui/issue-5927.rs b/src/test/ui/issues/issue-5927.rs similarity index 100% rename from src/test/ui/issue-5927.rs rename to src/test/ui/issues/issue-5927.rs diff --git a/src/test/ui/issue-5927.stderr b/src/test/ui/issues/issue-5927.stderr similarity index 100% rename from src/test/ui/issue-5927.stderr rename to src/test/ui/issues/issue-5927.stderr diff --git a/src/test/ui/issue-5997-enum.rs b/src/test/ui/issues/issue-5997-enum.rs similarity index 100% rename from src/test/ui/issue-5997-enum.rs rename to src/test/ui/issues/issue-5997-enum.rs diff --git a/src/test/ui/issue-5997-enum.stderr b/src/test/ui/issues/issue-5997-enum.stderr similarity index 100% rename from src/test/ui/issue-5997-enum.stderr rename to src/test/ui/issues/issue-5997-enum.stderr diff --git a/src/test/ui/issue-5997-struct.rs b/src/test/ui/issues/issue-5997-struct.rs similarity index 100% rename from src/test/ui/issue-5997-struct.rs rename to src/test/ui/issues/issue-5997-struct.rs diff --git a/src/test/ui/issue-5997-struct.stderr b/src/test/ui/issues/issue-5997-struct.stderr similarity index 100% rename from src/test/ui/issue-5997-struct.stderr rename to src/test/ui/issues/issue-5997-struct.stderr diff --git a/src/test/ui/issue-6458-2.rs b/src/test/ui/issues/issue-6458-2.rs similarity index 100% rename from src/test/ui/issue-6458-2.rs rename to src/test/ui/issues/issue-6458-2.rs diff --git a/src/test/ui/issue-6458-2.stderr b/src/test/ui/issues/issue-6458-2.stderr similarity index 100% rename from src/test/ui/issue-6458-2.stderr rename to src/test/ui/issues/issue-6458-2.stderr diff --git a/src/test/ui/issue-6458-3.rs b/src/test/ui/issues/issue-6458-3.rs similarity index 100% rename from src/test/ui/issue-6458-3.rs rename to src/test/ui/issues/issue-6458-3.rs diff --git a/src/test/ui/issue-6458-3.stderr b/src/test/ui/issues/issue-6458-3.stderr similarity index 100% rename from src/test/ui/issue-6458-3.stderr rename to src/test/ui/issues/issue-6458-3.stderr diff --git a/src/test/ui/issue-6458-4.rs b/src/test/ui/issues/issue-6458-4.rs similarity index 100% rename from src/test/ui/issue-6458-4.rs rename to src/test/ui/issues/issue-6458-4.rs diff --git a/src/test/ui/issue-6458-4.stderr b/src/test/ui/issues/issue-6458-4.stderr similarity index 100% rename from src/test/ui/issue-6458-4.stderr rename to src/test/ui/issues/issue-6458-4.stderr diff --git a/src/test/ui/issue-6458.rs b/src/test/ui/issues/issue-6458.rs similarity index 100% rename from src/test/ui/issue-6458.rs rename to src/test/ui/issues/issue-6458.rs diff --git a/src/test/ui/issue-6458.stderr b/src/test/ui/issues/issue-6458.stderr similarity index 100% rename from src/test/ui/issue-6458.stderr rename to src/test/ui/issues/issue-6458.stderr diff --git a/src/test/ui/issue-6596-1.rs b/src/test/ui/issues/issue-6596-1.rs similarity index 100% rename from src/test/ui/issue-6596-1.rs rename to src/test/ui/issues/issue-6596-1.rs diff --git a/src/test/ui/issue-6596-1.stderr b/src/test/ui/issues/issue-6596-1.stderr similarity index 100% rename from src/test/ui/issue-6596-1.stderr rename to src/test/ui/issues/issue-6596-1.stderr diff --git a/src/test/ui/issue-6596-2.rs b/src/test/ui/issues/issue-6596-2.rs similarity index 100% rename from src/test/ui/issue-6596-2.rs rename to src/test/ui/issues/issue-6596-2.rs diff --git a/src/test/ui/issue-6596-2.stderr b/src/test/ui/issues/issue-6596-2.stderr similarity index 100% rename from src/test/ui/issue-6596-2.stderr rename to src/test/ui/issues/issue-6596-2.stderr diff --git a/src/test/ui/issue-6642.rs b/src/test/ui/issues/issue-6642.rs similarity index 100% rename from src/test/ui/issue-6642.rs rename to src/test/ui/issues/issue-6642.rs diff --git a/src/test/ui/issue-6642.stderr b/src/test/ui/issues/issue-6642.stderr similarity index 100% rename from src/test/ui/issue-6642.stderr rename to src/test/ui/issues/issue-6642.stderr diff --git a/src/test/ui/issue-6738.rs b/src/test/ui/issues/issue-6738.rs similarity index 100% rename from src/test/ui/issue-6738.rs rename to src/test/ui/issues/issue-6738.rs diff --git a/src/test/ui/issue-6738.stderr b/src/test/ui/issues/issue-6738.stderr similarity index 100% rename from src/test/ui/issue-6738.stderr rename to src/test/ui/issues/issue-6738.stderr diff --git a/src/test/ui/issue-6801.nll.stderr b/src/test/ui/issues/issue-6801.nll.stderr similarity index 100% rename from src/test/ui/issue-6801.nll.stderr rename to src/test/ui/issues/issue-6801.nll.stderr diff --git a/src/test/ui/issue-6801.rs b/src/test/ui/issues/issue-6801.rs similarity index 100% rename from src/test/ui/issue-6801.rs rename to src/test/ui/issues/issue-6801.rs diff --git a/src/test/ui/issue-6801.stderr b/src/test/ui/issues/issue-6801.stderr similarity index 100% rename from src/test/ui/issue-6801.stderr rename to src/test/ui/issues/issue-6801.stderr diff --git a/src/test/ui/issue-6804.rs b/src/test/ui/issues/issue-6804.rs similarity index 100% rename from src/test/ui/issue-6804.rs rename to src/test/ui/issues/issue-6804.rs diff --git a/src/test/ui/issue-6804.stderr b/src/test/ui/issues/issue-6804.stderr similarity index 100% rename from src/test/ui/issue-6804.stderr rename to src/test/ui/issues/issue-6804.stderr diff --git a/src/test/ui/issue-6936.rs b/src/test/ui/issues/issue-6936.rs similarity index 100% rename from src/test/ui/issue-6936.rs rename to src/test/ui/issues/issue-6936.rs diff --git a/src/test/ui/issue-6936.stderr b/src/test/ui/issues/issue-6936.stderr similarity index 100% rename from src/test/ui/issue-6936.stderr rename to src/test/ui/issues/issue-6936.stderr diff --git a/src/test/ui/issue-7013.rs b/src/test/ui/issues/issue-7013.rs similarity index 100% rename from src/test/ui/issue-7013.rs rename to src/test/ui/issues/issue-7013.rs diff --git a/src/test/ui/issue-7013.stderr b/src/test/ui/issues/issue-7013.stderr similarity index 100% rename from src/test/ui/issue-7013.stderr rename to src/test/ui/issues/issue-7013.stderr diff --git a/src/test/ui/issue-7044.rs b/src/test/ui/issues/issue-7044.rs similarity index 100% rename from src/test/ui/issue-7044.rs rename to src/test/ui/issues/issue-7044.rs diff --git a/src/test/ui/issue-7044.stderr b/src/test/ui/issues/issue-7044.stderr similarity index 100% rename from src/test/ui/issue-7044.stderr rename to src/test/ui/issues/issue-7044.stderr diff --git a/src/test/ui/issue-7061.rs b/src/test/ui/issues/issue-7061.rs similarity index 100% rename from src/test/ui/issue-7061.rs rename to src/test/ui/issues/issue-7061.rs diff --git a/src/test/ui/issue-7061.stderr b/src/test/ui/issues/issue-7061.stderr similarity index 100% rename from src/test/ui/issue-7061.stderr rename to src/test/ui/issues/issue-7061.stderr diff --git a/src/test/ui/issue-7092.rs b/src/test/ui/issues/issue-7092.rs similarity index 100% rename from src/test/ui/issue-7092.rs rename to src/test/ui/issues/issue-7092.rs diff --git a/src/test/ui/issue-7092.stderr b/src/test/ui/issues/issue-7092.stderr similarity index 100% rename from src/test/ui/issue-7092.stderr rename to src/test/ui/issues/issue-7092.stderr diff --git a/src/test/ui/issue-7246.rs b/src/test/ui/issues/issue-7246.rs similarity index 100% rename from src/test/ui/issue-7246.rs rename to src/test/ui/issues/issue-7246.rs diff --git a/src/test/ui/issue-7246.stderr b/src/test/ui/issues/issue-7246.stderr similarity index 100% rename from src/test/ui/issue-7246.stderr rename to src/test/ui/issues/issue-7246.stderr diff --git a/src/test/ui/issue-7364.rs b/src/test/ui/issues/issue-7364.rs similarity index 100% rename from src/test/ui/issue-7364.rs rename to src/test/ui/issues/issue-7364.rs diff --git a/src/test/ui/issue-7364.stderr b/src/test/ui/issues/issue-7364.stderr similarity index 100% rename from src/test/ui/issue-7364.stderr rename to src/test/ui/issues/issue-7364.stderr diff --git a/src/test/ui/issue-7607-1.rs b/src/test/ui/issues/issue-7607-1.rs similarity index 100% rename from src/test/ui/issue-7607-1.rs rename to src/test/ui/issues/issue-7607-1.rs diff --git a/src/test/ui/issue-7607-1.stderr b/src/test/ui/issues/issue-7607-1.stderr similarity index 100% rename from src/test/ui/issue-7607-1.stderr rename to src/test/ui/issues/issue-7607-1.stderr diff --git a/src/test/ui/issue-7813.rs b/src/test/ui/issues/issue-7813.rs similarity index 100% rename from src/test/ui/issue-7813.rs rename to src/test/ui/issues/issue-7813.rs diff --git a/src/test/ui/issue-7813.stderr b/src/test/ui/issues/issue-7813.stderr similarity index 100% rename from src/test/ui/issue-7813.stderr rename to src/test/ui/issues/issue-7813.stderr diff --git a/src/test/ui/issue-7867.rs b/src/test/ui/issues/issue-7867.rs similarity index 100% rename from src/test/ui/issue-7867.rs rename to src/test/ui/issues/issue-7867.rs diff --git a/src/test/ui/issue-7867.stderr b/src/test/ui/issues/issue-7867.stderr similarity index 100% rename from src/test/ui/issue-7867.stderr rename to src/test/ui/issues/issue-7867.stderr diff --git a/src/test/ui/issue-7950.rs b/src/test/ui/issues/issue-7950.rs similarity index 100% rename from src/test/ui/issue-7950.rs rename to src/test/ui/issues/issue-7950.rs diff --git a/src/test/ui/issue-7950.stderr b/src/test/ui/issues/issue-7950.stderr similarity index 100% rename from src/test/ui/issue-7950.stderr rename to src/test/ui/issues/issue-7950.stderr diff --git a/src/test/ui/issue-7970a.rs b/src/test/ui/issues/issue-7970a.rs similarity index 100% rename from src/test/ui/issue-7970a.rs rename to src/test/ui/issues/issue-7970a.rs diff --git a/src/test/ui/issue-7970a.stderr b/src/test/ui/issues/issue-7970a.stderr similarity index 100% rename from src/test/ui/issue-7970a.stderr rename to src/test/ui/issues/issue-7970a.stderr diff --git a/src/test/ui/issue-7970b.rs b/src/test/ui/issues/issue-7970b.rs similarity index 100% rename from src/test/ui/issue-7970b.rs rename to src/test/ui/issues/issue-7970b.rs diff --git a/src/test/ui/issue-7970b.stderr b/src/test/ui/issues/issue-7970b.stderr similarity index 100% rename from src/test/ui/issue-7970b.stderr rename to src/test/ui/issues/issue-7970b.stderr diff --git a/src/test/ui/issue-8153.rs b/src/test/ui/issues/issue-8153.rs similarity index 100% rename from src/test/ui/issue-8153.rs rename to src/test/ui/issues/issue-8153.rs diff --git a/src/test/ui/issue-8153.stderr b/src/test/ui/issues/issue-8153.stderr similarity index 100% rename from src/test/ui/issue-8153.stderr rename to src/test/ui/issues/issue-8153.stderr diff --git a/src/test/ui/issue-8208.rs b/src/test/ui/issues/issue-8208.rs similarity index 100% rename from src/test/ui/issue-8208.rs rename to src/test/ui/issues/issue-8208.rs diff --git a/src/test/ui/issue-8208.stderr b/src/test/ui/issues/issue-8208.stderr similarity index 100% rename from src/test/ui/issue-8208.stderr rename to src/test/ui/issues/issue-8208.stderr diff --git a/src/test/ui/issue-8460-const.rs b/src/test/ui/issues/issue-8460-const.rs similarity index 100% rename from src/test/ui/issue-8460-const.rs rename to src/test/ui/issues/issue-8460-const.rs diff --git a/src/test/ui/issue-8460-const.stderr b/src/test/ui/issues/issue-8460-const.stderr similarity index 100% rename from src/test/ui/issue-8460-const.stderr rename to src/test/ui/issues/issue-8460-const.stderr diff --git a/src/test/ui/issue-8640.rs b/src/test/ui/issues/issue-8640.rs similarity index 100% rename from src/test/ui/issue-8640.rs rename to src/test/ui/issues/issue-8640.rs diff --git a/src/test/ui/issue-8640.stderr b/src/test/ui/issues/issue-8640.stderr similarity index 100% rename from src/test/ui/issue-8640.stderr rename to src/test/ui/issues/issue-8640.stderr diff --git a/src/test/ui/issue-8727.rs b/src/test/ui/issues/issue-8727.rs similarity index 100% rename from src/test/ui/issue-8727.rs rename to src/test/ui/issues/issue-8727.rs diff --git a/src/test/ui/issue-8727.stderr b/src/test/ui/issues/issue-8727.stderr similarity index 100% rename from src/test/ui/issue-8727.stderr rename to src/test/ui/issues/issue-8727.stderr diff --git a/src/test/ui/issue-8761.rs b/src/test/ui/issues/issue-8761.rs similarity index 100% rename from src/test/ui/issue-8761.rs rename to src/test/ui/issues/issue-8761.rs diff --git a/src/test/ui/issue-8761.stderr b/src/test/ui/issues/issue-8761.stderr similarity index 100% rename from src/test/ui/issue-8761.stderr rename to src/test/ui/issues/issue-8761.stderr diff --git a/src/test/ui/issue-8767.rs b/src/test/ui/issues/issue-8767.rs similarity index 100% rename from src/test/ui/issue-8767.rs rename to src/test/ui/issues/issue-8767.rs diff --git a/src/test/ui/issue-8767.stderr b/src/test/ui/issues/issue-8767.stderr similarity index 100% rename from src/test/ui/issue-8767.stderr rename to src/test/ui/issues/issue-8767.stderr diff --git a/src/test/ui/issue-9575.rs b/src/test/ui/issues/issue-9575.rs similarity index 100% rename from src/test/ui/issue-9575.rs rename to src/test/ui/issues/issue-9575.rs diff --git a/src/test/ui/issue-9575.stderr b/src/test/ui/issues/issue-9575.stderr similarity index 100% rename from src/test/ui/issue-9575.stderr rename to src/test/ui/issues/issue-9575.stderr diff --git a/src/test/ui/issue-9725.rs b/src/test/ui/issues/issue-9725.rs similarity index 100% rename from src/test/ui/issue-9725.rs rename to src/test/ui/issues/issue-9725.rs diff --git a/src/test/ui/issue-9725.stderr b/src/test/ui/issues/issue-9725.stderr similarity index 100% rename from src/test/ui/issue-9725.stderr rename to src/test/ui/issues/issue-9725.stderr diff --git a/src/test/ui/issue-9814.rs b/src/test/ui/issues/issue-9814.rs similarity index 100% rename from src/test/ui/issue-9814.rs rename to src/test/ui/issues/issue-9814.rs diff --git a/src/test/ui/issue-9814.stderr b/src/test/ui/issues/issue-9814.stderr similarity index 100% rename from src/test/ui/issue-9814.stderr rename to src/test/ui/issues/issue-9814.stderr diff --git a/src/test/ui/issue-pr29383.rs b/src/test/ui/issues/issue-pr29383.rs similarity index 100% rename from src/test/ui/issue-pr29383.rs rename to src/test/ui/issues/issue-pr29383.rs diff --git a/src/test/ui/issue-pr29383.stderr b/src/test/ui/issues/issue-pr29383.stderr similarity index 100% rename from src/test/ui/issue-pr29383.stderr rename to src/test/ui/issues/issue-pr29383.stderr diff --git a/src/test/ui/compile-fail-migration/issue32829.rs b/src/test/ui/issues/issue32829.rs similarity index 100% rename from src/test/ui/compile-fail-migration/issue32829.rs rename to src/test/ui/issues/issue32829.rs diff --git a/src/test/ui/compile-fail-migration/issue32829.stderr b/src/test/ui/issues/issue32829.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/issue32829.stderr rename to src/test/ui/issues/issue32829.stderr diff --git a/src/test/ui/compile-fail-migration/keyword-extern-as-identifier.rs b/src/test/ui/keyword/keyword-extern-as-identifier.rs similarity index 100% rename from src/test/ui/compile-fail-migration/keyword-extern-as-identifier.rs rename to src/test/ui/keyword/keyword-extern-as-identifier.rs diff --git a/src/test/ui/keyword/keyword-extern-as-identifier.stderr b/src/test/ui/keyword/keyword-extern-as-identifier.stderr new file mode 100644 index 00000000000..523da8d32c4 --- /dev/null +++ b/src/test/ui/keyword/keyword-extern-as-identifier.stderr @@ -0,0 +1,9 @@ +error[E0531]: cannot find unit struct/variant or constant `extern` in this scope + --> $DIR/keyword-extern-as-identifier.rs:14:9 + | +LL | let extern = 0; //~ ERROR cannot find unit struct/variant or constant `extern` in this scope + | ^^^^^^ not found in this scope + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0531`. diff --git a/src/test/ui/compile-fail-migration/keyword-false-as-identifier.rs b/src/test/ui/keyword/keyword-false-as-identifier.rs similarity index 100% rename from src/test/ui/compile-fail-migration/keyword-false-as-identifier.rs rename to src/test/ui/keyword/keyword-false-as-identifier.rs diff --git a/src/test/ui/compile-fail-migration/keyword-false-as-identifier.stderr b/src/test/ui/keyword/keyword-false-as-identifier.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/keyword-false-as-identifier.stderr rename to src/test/ui/keyword/keyword-false-as-identifier.stderr diff --git a/src/test/ui/compile-fail-migration/keyword-self-as-identifier.rs b/src/test/ui/keyword/keyword-self-as-identifier.rs similarity index 100% rename from src/test/ui/compile-fail-migration/keyword-self-as-identifier.rs rename to src/test/ui/keyword/keyword-self-as-identifier.rs diff --git a/src/test/ui/compile-fail-migration/keyword-self-as-identifier.stderr b/src/test/ui/keyword/keyword-self-as-identifier.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/keyword-self-as-identifier.stderr rename to src/test/ui/keyword/keyword-self-as-identifier.stderr diff --git a/src/test/ui/compile-fail-migration/keyword-super-as-identifier.rs b/src/test/ui/keyword/keyword-super-as-identifier.rs similarity index 100% rename from src/test/ui/compile-fail-migration/keyword-super-as-identifier.rs rename to src/test/ui/keyword/keyword-super-as-identifier.rs diff --git a/src/test/ui/compile-fail-migration/keyword-super-as-identifier.stderr b/src/test/ui/keyword/keyword-super-as-identifier.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/keyword-super-as-identifier.stderr rename to src/test/ui/keyword/keyword-super-as-identifier.stderr diff --git a/src/test/ui/compile-fail-migration/keyword-super.rs b/src/test/ui/keyword/keyword-super.rs similarity index 100% rename from src/test/ui/compile-fail-migration/keyword-super.rs rename to src/test/ui/keyword/keyword-super.rs diff --git a/src/test/ui/compile-fail-migration/keyword-super.stderr b/src/test/ui/keyword/keyword-super.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/keyword-super.stderr rename to src/test/ui/keyword/keyword-super.stderr diff --git a/src/test/ui/compile-fail-migration/keyword-true-as-identifier.rs b/src/test/ui/keyword/keyword-true-as-identifier.rs similarity index 100% rename from src/test/ui/compile-fail-migration/keyword-true-as-identifier.rs rename to src/test/ui/keyword/keyword-true-as-identifier.rs diff --git a/src/test/ui/compile-fail-migration/keyword-true-as-identifier.stderr b/src/test/ui/keyword/keyword-true-as-identifier.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/keyword-true-as-identifier.stderr rename to src/test/ui/keyword/keyword-true-as-identifier.stderr diff --git a/src/test/ui/compile-fail-migration/kindck-copy.rs b/src/test/ui/kindck/kindck-copy.rs similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-copy.rs rename to src/test/ui/kindck/kindck-copy.rs diff --git a/src/test/ui/compile-fail-migration/kindck-copy.stderr b/src/test/ui/kindck/kindck-copy.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-copy.stderr rename to src/test/ui/kindck/kindck-copy.stderr diff --git a/src/test/ui/compile-fail-migration/kindck-impl-type-params-2.rs b/src/test/ui/kindck/kindck-impl-type-params-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-impl-type-params-2.rs rename to src/test/ui/kindck/kindck-impl-type-params-2.rs diff --git a/src/test/ui/compile-fail-migration/kindck-impl-type-params-2.stderr b/src/test/ui/kindck/kindck-impl-type-params-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-impl-type-params-2.stderr rename to src/test/ui/kindck/kindck-impl-type-params-2.stderr diff --git a/src/test/ui/compile-fail-migration/kindck-impl-type-params.nll.stderr b/src/test/ui/kindck/kindck-impl-type-params.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-impl-type-params.nll.stderr rename to src/test/ui/kindck/kindck-impl-type-params.nll.stderr diff --git a/src/test/ui/compile-fail-migration/kindck-impl-type-params.rs b/src/test/ui/kindck/kindck-impl-type-params.rs similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-impl-type-params.rs rename to src/test/ui/kindck/kindck-impl-type-params.rs diff --git a/src/test/ui/compile-fail-migration/kindck-impl-type-params.stderr b/src/test/ui/kindck/kindck-impl-type-params.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-impl-type-params.stderr rename to src/test/ui/kindck/kindck-impl-type-params.stderr diff --git a/src/test/ui/compile-fail-migration/kindck-inherited-copy-bound.rs b/src/test/ui/kindck/kindck-inherited-copy-bound.rs similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-inherited-copy-bound.rs rename to src/test/ui/kindck/kindck-inherited-copy-bound.rs diff --git a/src/test/ui/compile-fail-migration/kindck-inherited-copy-bound.stderr b/src/test/ui/kindck/kindck-inherited-copy-bound.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-inherited-copy-bound.stderr rename to src/test/ui/kindck/kindck-inherited-copy-bound.stderr diff --git a/src/test/ui/compile-fail-migration/kindck-nonsendable-1.rs b/src/test/ui/kindck/kindck-nonsendable-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-nonsendable-1.rs rename to src/test/ui/kindck/kindck-nonsendable-1.rs diff --git a/src/test/ui/compile-fail-migration/kindck-nonsendable-1.stderr b/src/test/ui/kindck/kindck-nonsendable-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-nonsendable-1.stderr rename to src/test/ui/kindck/kindck-nonsendable-1.stderr diff --git a/src/test/ui/compile-fail-migration/kindck-send-object.rs b/src/test/ui/kindck/kindck-send-object.rs similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-send-object.rs rename to src/test/ui/kindck/kindck-send-object.rs diff --git a/src/test/ui/compile-fail-migration/kindck-send-object.stderr b/src/test/ui/kindck/kindck-send-object.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-send-object.stderr rename to src/test/ui/kindck/kindck-send-object.stderr diff --git a/src/test/ui/compile-fail-migration/kindck-send-object1.nll.stderr b/src/test/ui/kindck/kindck-send-object1.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-send-object1.nll.stderr rename to src/test/ui/kindck/kindck-send-object1.nll.stderr diff --git a/src/test/ui/compile-fail-migration/kindck-send-object1.rs b/src/test/ui/kindck/kindck-send-object1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-send-object1.rs rename to src/test/ui/kindck/kindck-send-object1.rs diff --git a/src/test/ui/compile-fail-migration/kindck-send-object1.stderr b/src/test/ui/kindck/kindck-send-object1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-send-object1.stderr rename to src/test/ui/kindck/kindck-send-object1.stderr diff --git a/src/test/ui/compile-fail-migration/kindck-send-object2.rs b/src/test/ui/kindck/kindck-send-object2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-send-object2.rs rename to src/test/ui/kindck/kindck-send-object2.rs diff --git a/src/test/ui/compile-fail-migration/kindck-send-object2.stderr b/src/test/ui/kindck/kindck-send-object2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-send-object2.stderr rename to src/test/ui/kindck/kindck-send-object2.stderr diff --git a/src/test/ui/compile-fail-migration/kindck-send-owned.rs b/src/test/ui/kindck/kindck-send-owned.rs similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-send-owned.rs rename to src/test/ui/kindck/kindck-send-owned.rs diff --git a/src/test/ui/compile-fail-migration/kindck-send-owned.stderr b/src/test/ui/kindck/kindck-send-owned.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-send-owned.stderr rename to src/test/ui/kindck/kindck-send-owned.stderr diff --git a/src/test/ui/compile-fail-migration/kindck-send-unsafe.rs b/src/test/ui/kindck/kindck-send-unsafe.rs similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-send-unsafe.rs rename to src/test/ui/kindck/kindck-send-unsafe.rs diff --git a/src/test/ui/compile-fail-migration/kindck-send-unsafe.rs~rust-lang_master b/src/test/ui/kindck/kindck-send-unsafe.rs~rust-lang_master similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-send-unsafe.rs~rust-lang_master rename to src/test/ui/kindck/kindck-send-unsafe.rs~rust-lang_master diff --git a/src/test/ui/compile-fail-migration/kindck-send-unsafe.stderr b/src/test/ui/kindck/kindck-send-unsafe.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/kindck-send-unsafe.stderr rename to src/test/ui/kindck/kindck-send-unsafe.stderr diff --git a/src/test/ui/compile-fail-migration/label-static.rs b/src/test/ui/label/label-static.rs similarity index 100% rename from src/test/ui/compile-fail-migration/label-static.rs rename to src/test/ui/label/label-static.rs diff --git a/src/test/ui/compile-fail-migration/label-static.stderr b/src/test/ui/label/label-static.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/label-static.stderr rename to src/test/ui/label/label-static.stderr diff --git a/src/test/ui/compile-fail-migration/label-underscore.rs b/src/test/ui/label/label-underscore.rs similarity index 100% rename from src/test/ui/compile-fail-migration/label-underscore.rs rename to src/test/ui/label/label-underscore.rs diff --git a/src/test/ui/compile-fail-migration/label-underscore.stderr b/src/test/ui/label/label-underscore.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/label-underscore.stderr rename to src/test/ui/label/label-underscore.stderr diff --git a/src/test/ui/label_break_value_continue.rs b/src/test/ui/label/label_break_value_continue.rs similarity index 100% rename from src/test/ui/label_break_value_continue.rs rename to src/test/ui/label/label_break_value_continue.rs diff --git a/src/test/ui/label_break_value_continue.stderr b/src/test/ui/label/label_break_value_continue.stderr similarity index 100% rename from src/test/ui/label_break_value_continue.stderr rename to src/test/ui/label/label_break_value_continue.stderr diff --git a/src/test/ui/label_break_value_illegal_uses.rs b/src/test/ui/label/label_break_value_illegal_uses.rs similarity index 100% rename from src/test/ui/label_break_value_illegal_uses.rs rename to src/test/ui/label/label_break_value_illegal_uses.rs diff --git a/src/test/ui/label_break_value_illegal_uses.stderr b/src/test/ui/label/label_break_value_illegal_uses.stderr similarity index 100% rename from src/test/ui/label_break_value_illegal_uses.stderr rename to src/test/ui/label/label_break_value_illegal_uses.stderr diff --git a/src/test/ui/label_break_value_unlabeled_break.rs b/src/test/ui/label/label_break_value_unlabeled_break.rs similarity index 100% rename from src/test/ui/label_break_value_unlabeled_break.rs rename to src/test/ui/label/label_break_value_unlabeled_break.rs diff --git a/src/test/ui/label_break_value_unlabeled_break.stderr b/src/test/ui/label/label_break_value_unlabeled_break.stderr similarity index 100% rename from src/test/ui/label_break_value_unlabeled_break.stderr rename to src/test/ui/label/label_break_value_unlabeled_break.stderr diff --git a/src/test/ui/compile-fail-migration/lang-item-missing.rs b/src/test/ui/lang-item-missing.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lang-item-missing.rs rename to src/test/ui/lang-item-missing.rs diff --git a/src/test/ui/compile-fail-migration/lang-item-missing.stderr b/src/test/ui/lang-item-missing.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lang-item-missing.stderr rename to src/test/ui/lang-item-missing.stderr diff --git a/src/test/ui/compile-fail-migration/lexical-scopes.rs b/src/test/ui/lexical-scopes.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lexical-scopes.rs rename to src/test/ui/lexical-scopes.rs diff --git a/src/test/ui/compile-fail-migration/lexical-scopes.stderr b/src/test/ui/lexical-scopes.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lexical-scopes.stderr rename to src/test/ui/lexical-scopes.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/lifetime_bound_will_change_warning_lib.rs b/src/test/ui/lifetimes/auxiliary/lifetime_bound_will_change_warning_lib.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/lifetime_bound_will_change_warning_lib.rs rename to src/test/ui/lifetimes/auxiliary/lifetime_bound_will_change_warning_lib.rs diff --git a/src/test/ui/compile-fail-migration/lifetime-bound-will-change-warning.nll.stderr b/src/test/ui/lifetimes/lifetime-bound-will-change-warning.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lifetime-bound-will-change-warning.nll.stderr rename to src/test/ui/lifetimes/lifetime-bound-will-change-warning.nll.stderr diff --git a/src/test/ui/compile-fail-migration/lifetime-bound-will-change-warning.rs b/src/test/ui/lifetimes/lifetime-bound-will-change-warning.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lifetime-bound-will-change-warning.rs rename to src/test/ui/lifetimes/lifetime-bound-will-change-warning.rs diff --git a/src/test/ui/compile-fail-migration/lifetime-bound-will-change-warning.stderr b/src/test/ui/lifetimes/lifetime-bound-will-change-warning.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lifetime-bound-will-change-warning.stderr rename to src/test/ui/lifetimes/lifetime-bound-will-change-warning.stderr diff --git a/src/test/ui/lifetime-elision-return-type-requires-explicit-lifetime.rs b/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.rs similarity index 100% rename from src/test/ui/lifetime-elision-return-type-requires-explicit-lifetime.rs rename to src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.rs diff --git a/src/test/ui/lifetime-elision-return-type-requires-explicit-lifetime.stderr b/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr similarity index 100% rename from src/test/ui/lifetime-elision-return-type-requires-explicit-lifetime.stderr rename to src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr diff --git a/src/test/ui/lifetime-errors/42701_one_named_and_one_anonymous.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/42701_one_named_and_one_anonymous.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.nll.stderr diff --git a/src/test/ui/lifetime-errors/42701_one_named_and_one_anonymous.rs b/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.rs similarity index 100% rename from src/test/ui/lifetime-errors/42701_one_named_and_one_anonymous.rs rename to src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.rs diff --git a/src/test/ui/lifetime-errors/42701_one_named_and_one_anonymous.stderr b/src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.stderr similarity index 100% rename from src/test/ui/lifetime-errors/42701_one_named_and_one_anonymous.stderr rename to src/test/ui/lifetimes/lifetime-errors/42701_one_named_and_one_anonymous.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.rs rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.rs diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-early-bound-in-struct.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-2.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-2.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-2.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-2.rs rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.rs diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-2.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-2.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-2.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-3.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-3.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-3.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-3.rs rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.rs diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-3.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-3.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-3.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.rs rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.rs diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-2.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.rs rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.rs diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl-3.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.rs rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.rs diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else.rs rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.rs diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.rs rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.rs diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.rs b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.rs rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.rs diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr diff --git a/src/test/ui/lifetime-errors/ex1b-return-no-names-if-else.rs b/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex1b-return-no-names-if-else.rs rename to src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.rs diff --git a/src/test/ui/lifetime-errors/ex1b-return-no-names-if-else.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex1b-return-no-names-if-else.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.stderr diff --git a/src/test/ui/lifetime-errors/ex2a-push-one-existing-name-2.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex2a-push-one-existing-name-2.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex2a-push-one-existing-name-2.rs b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex2a-push-one-existing-name-2.rs rename to src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.rs diff --git a/src/test/ui/lifetime-errors/ex2a-push-one-existing-name-2.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex2a-push-one-existing-name-2.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-2.stderr diff --git a/src/test/ui/lifetime-errors/ex2a-push-one-existing-name-early-bound.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex2a-push-one-existing-name-early-bound.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex2a-push-one-existing-name-early-bound.rs b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex2a-push-one-existing-name-early-bound.rs rename to src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.rs diff --git a/src/test/ui/lifetime-errors/ex2a-push-one-existing-name-early-bound.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex2a-push-one-existing-name-early-bound.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name-early-bound.stderr diff --git a/src/test/ui/lifetime-errors/ex2a-push-one-existing-name.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex2a-push-one-existing-name.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex2a-push-one-existing-name.rs b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex2a-push-one-existing-name.rs rename to src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.rs diff --git a/src/test/ui/lifetime-errors/ex2a-push-one-existing-name.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex2a-push-one-existing-name.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex2a-push-one-existing-name.stderr diff --git a/src/test/ui/lifetime-errors/ex2b-push-no-existing-names.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex2b-push-no-existing-names.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex2b-push-no-existing-names.rs b/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex2b-push-no-existing-names.rs rename to src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.rs diff --git a/src/test/ui/lifetime-errors/ex2b-push-no-existing-names.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex2b-push-no-existing-names.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex2b-push-no-existing-names.stderr diff --git a/src/test/ui/lifetime-errors/ex2c-push-inference-variable.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex2c-push-inference-variable.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex2c-push-inference-variable.rs b/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex2c-push-inference-variable.rs rename to src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.rs diff --git a/src/test/ui/lifetime-errors/ex2c-push-inference-variable.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex2c-push-inference-variable.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex2c-push-inference-variable.stderr diff --git a/src/test/ui/lifetime-errors/ex2d-push-inference-variable-2.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex2d-push-inference-variable-2.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex2d-push-inference-variable-2.rs b/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex2d-push-inference-variable-2.rs rename to src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.rs diff --git a/src/test/ui/lifetime-errors/ex2d-push-inference-variable-2.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex2d-push-inference-variable-2.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex2d-push-inference-variable-2.stderr diff --git a/src/test/ui/lifetime-errors/ex2e-push-inference-variable-3.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex2e-push-inference-variable-3.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex2e-push-inference-variable-3.rs b/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex2e-push-inference-variable-3.rs rename to src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.rs diff --git a/src/test/ui/lifetime-errors/ex2e-push-inference-variable-3.stderr b/src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex2e-push-inference-variable-3.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex2e-push-inference-variable-3.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-2.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-2.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-2.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-2.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-2.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-2.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-2.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-3.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-3.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-3.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-3.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-3.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-3.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-3.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-2.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-earlybound-regions.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs-latebound-regions.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-both-are-structs.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-latebound-regions.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-latebound-regions.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-latebound-regions.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-latebound-regions.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-latebound-regions.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-latebound-regions.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-latebound-regions.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-2.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-3.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-4.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-one-is-struct.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-self-is-anon.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-self-is-anon.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-self-is-anon.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-self-is-anon.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-impl-items.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-using-impl-items.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-impl-items.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-using-impl-items.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-impl-items.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-trait-objects.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-using-trait-objects.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-trait-objects.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-using-trait-objects.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-trait-objects.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions-using-trait-objects.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-using-trait-objects.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.nll.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions.nll.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.nll.stderr diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions.rs b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.rs similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions.rs rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.rs diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.stderr similarity index 100% rename from src/test/ui/lifetime-errors/ex3-both-anon-regions.stderr rename to src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions.stderr diff --git a/src/test/ui/lifetime-errors/liveness-assign-imm-local-notes.rs b/src/test/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.rs similarity index 100% rename from src/test/ui/lifetime-errors/liveness-assign-imm-local-notes.rs rename to src/test/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.rs diff --git a/src/test/ui/lifetime-errors/liveness-assign-imm-local-notes.stderr b/src/test/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.stderr similarity index 100% rename from src/test/ui/lifetime-errors/liveness-assign-imm-local-notes.stderr rename to src/test/ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.stderr diff --git a/src/test/ui/compile-fail-migration/lifetime-no-keyword.rs b/src/test/ui/lifetimes/lifetime-no-keyword.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lifetime-no-keyword.rs rename to src/test/ui/lifetimes/lifetime-no-keyword.rs diff --git a/src/test/ui/compile-fail-migration/lifetime-no-keyword.stderr b/src/test/ui/lifetimes/lifetime-no-keyword.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lifetime-no-keyword.stderr rename to src/test/ui/lifetimes/lifetime-no-keyword.stderr diff --git a/src/test/ui/compile-fail-migration/linkage2.rs b/src/test/ui/linkage2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/linkage2.rs rename to src/test/ui/linkage2.rs diff --git a/src/test/ui/compile-fail-migration/linkage2.stderr b/src/test/ui/linkage2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/linkage2.stderr rename to src/test/ui/linkage2.stderr diff --git a/src/test/ui/compile-fail-migration/linkage3.rs b/src/test/ui/linkage3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/linkage3.rs rename to src/test/ui/linkage3.rs diff --git a/src/test/ui/compile-fail-migration/linkage3.stderr b/src/test/ui/linkage3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/linkage3.stderr rename to src/test/ui/linkage3.stderr diff --git a/src/test/ui/compile-fail-migration/linkage4.rs b/src/test/ui/linkage4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/linkage4.rs rename to src/test/ui/linkage4.rs diff --git a/src/test/ui/compile-fail-migration/linkage4.stderr b/src/test/ui/linkage4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/linkage4.stderr rename to src/test/ui/linkage4.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/inherited_stability.rs b/src/test/ui/lint/auxiliary/inherited_stability.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/inherited_stability.rs rename to src/test/ui/lint/auxiliary/inherited_stability.rs diff --git a/src/test/ui/auxiliary/lint_output_format.rs b/src/test/ui/lint/auxiliary/lint_output_format.rs similarity index 100% rename from src/test/ui/auxiliary/lint_output_format.rs rename to src/test/ui/lint/auxiliary/lint_output_format.rs diff --git a/src/test/ui/lint/auxiliary/lint_stability.rs b/src/test/ui/lint/auxiliary/lint_stability.rs new file mode 100644 index 00000000000..5547458abbe --- /dev/null +++ b/src/test/ui/lint/auxiliary/lint_stability.rs @@ -0,0 +1,198 @@ +// Copyright 2013 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![crate_name="lint_stability"] +#![crate_type = "lib"] +#![feature(staged_api)] +#![feature(associated_type_defaults)] +#![stable(feature = "lint_stability", since = "1.0.0")] + +#[stable(feature = "stable_test_feature", since = "1.0.0")] +#[rustc_deprecated(since = "1.0.0", reason = "text")] +pub fn deprecated() {} +#[stable(feature = "stable_test_feature", since = "1.0.0")] +#[rustc_deprecated(since = "1.0.0", reason = "text")] +pub fn deprecated_text() {} + +#[stable(feature = "stable_test_feature", since = "1.0.0")] +#[rustc_deprecated(since = "99.99.99", reason = "text")] +pub fn deprecated_future() {} + +#[unstable(feature = "unstable_test_feature", issue = "0")] +#[rustc_deprecated(since = "1.0.0", reason = "text")] +pub fn deprecated_unstable() {} +#[unstable(feature = "unstable_test_feature", issue = "0")] +#[rustc_deprecated(since = "1.0.0", reason = "text")] +pub fn deprecated_unstable_text() {} + +#[unstable(feature = "unstable_test_feature", issue = "0")] +pub fn unstable() {} +#[unstable(feature = "unstable_test_feature", reason = "text", issue = "0")] +pub fn unstable_text() {} + +#[stable(feature = "rust1", since = "1.0.0")] +pub fn stable() {} +#[stable(feature = "rust1", since = "1.0.0")] +pub fn stable_text() {} + +#[stable(feature = "rust1", since = "1.0.0")] +pub struct MethodTester; + +impl MethodTester { + #[stable(feature = "stable_test_feature", since = "1.0.0")] + #[rustc_deprecated(since = "1.0.0", reason = "text")] + pub fn method_deprecated(&self) {} + #[stable(feature = "stable_test_feature", since = "1.0.0")] + #[rustc_deprecated(since = "1.0.0", reason = "text")] + pub fn method_deprecated_text(&self) {} + + #[unstable(feature = "unstable_test_feature", issue = "0")] + #[rustc_deprecated(since = "1.0.0", reason = "text")] + pub fn method_deprecated_unstable(&self) {} + #[unstable(feature = "unstable_test_feature", issue = "0")] + #[rustc_deprecated(since = "1.0.0", reason = "text")] + pub fn method_deprecated_unstable_text(&self) {} + + #[unstable(feature = "unstable_test_feature", issue = "0")] + pub fn method_unstable(&self) {} + #[unstable(feature = "unstable_test_feature", reason = "text", issue = "0")] + pub fn method_unstable_text(&self) {} + + #[stable(feature = "rust1", since = "1.0.0")] + pub fn method_stable(&self) {} + #[stable(feature = "rust1", since = "1.0.0")] + pub fn method_stable_text(&self) {} +} + +#[stable(feature = "stable_test_feature", since = "1.0.0")] +pub trait Trait { + #[stable(feature = "stable_test_feature", since = "1.0.0")] + #[rustc_deprecated(since = "1.0.0", reason = "text")] + fn trait_deprecated(&self) {} + #[stable(feature = "stable_test_feature", since = "1.0.0")] + #[rustc_deprecated(since = "1.0.0", reason = "text")] + fn trait_deprecated_text(&self) {} + + #[unstable(feature = "unstable_test_feature", issue = "0")] + #[rustc_deprecated(since = "1.0.0", reason = "text")] + fn trait_deprecated_unstable(&self) {} + #[unstable(feature = "unstable_test_feature", issue = "0")] + #[rustc_deprecated(since = "1.0.0", reason = "text")] + fn trait_deprecated_unstable_text(&self) {} + + #[unstable(feature = "unstable_test_feature", issue = "0")] + fn trait_unstable(&self) {} + #[unstable(feature = "unstable_test_feature", reason = "text", issue = "0")] + fn trait_unstable_text(&self) {} + + #[stable(feature = "rust1", since = "1.0.0")] + fn trait_stable(&self) {} + #[stable(feature = "rust1", since = "1.0.0")] + fn trait_stable_text(&self) {} +} + +#[stable(feature = "stable_test_feature", since = "1.0.0")] +pub trait TraitWithAssociatedTypes { + #[unstable(feature = "unstable_test_feature", issue = "0")] + type TypeUnstable = u8; + #[stable(feature = "stable_test_feature", since = "1.0.0")] + #[rustc_deprecated(since = "1.0.0", reason = "text")] + type TypeDeprecated = u8; +} + +#[stable(feature = "stable_test_feature", since = "1.0.0")] +impl Trait for MethodTester {} + +#[unstable(feature = "unstable_test_feature", issue = "0")] +pub trait UnstableTrait { fn dummy(&self) { } } + +#[stable(feature = "stable_test_feature", since = "1.0.0")] +#[rustc_deprecated(since = "1.0.0", reason = "text")] +pub trait DeprecatedTrait { + #[stable(feature = "stable_test_feature", since = "1.0.0")] fn dummy(&self) { } +} + +#[stable(feature = "stable_test_feature", since = "1.0.0")] +#[rustc_deprecated(since = "1.0.0", reason = "text")] +pub struct DeprecatedStruct { + #[stable(feature = "stable_test_feature", since = "1.0.0")] pub i: isize +} +#[unstable(feature = "unstable_test_feature", issue = "0")] +#[rustc_deprecated(since = "1.0.0", reason = "text")] +pub struct DeprecatedUnstableStruct { + #[stable(feature = "stable_test_feature", since = "1.0.0")] pub i: isize +} +#[unstable(feature = "unstable_test_feature", issue = "0")] +pub struct UnstableStruct { + #[stable(feature = "stable_test_feature", since = "1.0.0")] pub i: isize +} +#[stable(feature = "rust1", since = "1.0.0")] +pub struct StableStruct { + #[stable(feature = "stable_test_feature", since = "1.0.0")] pub i: isize +} +#[unstable(feature = "unstable_test_feature", issue = "0")] +pub enum UnstableEnum {} +#[stable(feature = "rust1", since = "1.0.0")] +pub enum StableEnum {} + +#[stable(feature = "stable_test_feature", since = "1.0.0")] +#[rustc_deprecated(since = "1.0.0", reason = "text")] +pub struct DeprecatedUnitStruct; +#[unstable(feature = "unstable_test_feature", issue = "0")] +#[rustc_deprecated(since = "1.0.0", reason = "text")] +pub struct DeprecatedUnstableUnitStruct; +#[unstable(feature = "unstable_test_feature", issue = "0")] +pub struct UnstableUnitStruct; +#[stable(feature = "rust1", since = "1.0.0")] +pub struct StableUnitStruct; + +#[stable(feature = "stable_test_feature", since = "1.0.0")] +pub enum Enum { + #[stable(feature = "stable_test_feature", since = "1.0.0")] + #[rustc_deprecated(since = "1.0.0", reason = "text")] + DeprecatedVariant, + #[unstable(feature = "unstable_test_feature", issue = "0")] + #[rustc_deprecated(since = "1.0.0", reason = "text")] + DeprecatedUnstableVariant, + #[unstable(feature = "unstable_test_feature", issue = "0")] + UnstableVariant, + + #[stable(feature = "rust1", since = "1.0.0")] + StableVariant, +} + +#[stable(feature = "stable_test_feature", since = "1.0.0")] +#[rustc_deprecated(since = "1.0.0", reason = "text")] +pub struct DeprecatedTupleStruct(#[stable(feature = "rust1", since = "1.0.0")] pub isize); +#[unstable(feature = "unstable_test_feature", issue = "0")] +#[rustc_deprecated(since = "1.0.0", reason = "text")] +pub struct DeprecatedUnstableTupleStruct(#[stable(feature = "rust1", since = "1.0.0")] pub isize); +#[unstable(feature = "unstable_test_feature", issue = "0")] +pub struct UnstableTupleStruct(#[stable(feature = "rust1", since = "1.0.0")] pub isize); +#[stable(feature = "rust1", since = "1.0.0")] +pub struct StableTupleStruct(#[stable(feature = "rust1", since = "1.0.0")] pub isize); + +#[stable(feature = "stable_test_feature", since = "1.0.0")] +#[macro_export] +macro_rules! macro_test { + () => (deprecated()); +} + +#[stable(feature = "stable_test_feature", since = "1.0.0")] +#[macro_export] +macro_rules! macro_test_arg { + ($func:expr) => ($func); +} + +#[stable(feature = "stable_test_feature", since = "1.0.0")] +#[macro_export] +macro_rules! macro_test_arg_nested { + ($func:ident) => (macro_test_arg!($func())); +} diff --git a/src/test/ui/compile-fail-migration/auxiliary/lint_stability_fields.rs b/src/test/ui/lint/auxiliary/lint_stability_fields.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/lint_stability_fields.rs rename to src/test/ui/lint/auxiliary/lint_stability_fields.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/lint_unused_extern_crate.rs b/src/test/ui/lint/auxiliary/lint_unused_extern_crate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/lint_unused_extern_crate.rs rename to src/test/ui/lint/auxiliary/lint_unused_extern_crate.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/lint_unused_extern_crate2.rs b/src/test/ui/lint/auxiliary/lint_unused_extern_crate2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/lint_unused_extern_crate2.rs rename to src/test/ui/lint/auxiliary/lint_unused_extern_crate2.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/lint_unused_extern_crate3.rs b/src/test/ui/lint/auxiliary/lint_unused_extern_crate3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/lint_unused_extern_crate3.rs rename to src/test/ui/lint/auxiliary/lint_unused_extern_crate3.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/lint_unused_extern_crate4.rs b/src/test/ui/lint/auxiliary/lint_unused_extern_crate4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/lint_unused_extern_crate4.rs rename to src/test/ui/lint/auxiliary/lint_unused_extern_crate4.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/lint_unused_extern_crate5.rs b/src/test/ui/lint/auxiliary/lint_unused_extern_crate5.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/lint_unused_extern_crate5.rs rename to src/test/ui/lint/auxiliary/lint_unused_extern_crate5.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/stability_cfg1.rs b/src/test/ui/lint/auxiliary/stability_cfg1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/stability_cfg1.rs rename to src/test/ui/lint/auxiliary/stability_cfg1.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/lint_output_format.rs b/src/test/ui/lint/auxiliary/stability_cfg2.rs similarity index 51% rename from src/test/ui/compile-fail-migration/auxiliary/lint_output_format.rs rename to src/test/ui/lint/auxiliary/stability_cfg2.rs index 6ba66f3e45f..a59f4b4e8f4 100644 --- a/src/test/ui/compile-fail-migration/auxiliary/lint_output_format.rs +++ b/src/test/ui/lint/auxiliary/stability_cfg2.rs @@ -8,23 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_name="lint_output_format"] -#![crate_type = "lib"] +// compile-flags:--cfg foo + +#![cfg_attr(foo, unstable(feature = "unstable_test_feature", issue = "0"))] +#![cfg_attr(not(foo), stable(feature = "test_feature", since = "1.0.0"))] #![feature(staged_api)] -#![unstable(feature = "unstable_test_feature", issue = "0")] - -#[stable(feature = "stable_test_feature", since = "1.0.0")] -#[rustc_deprecated(since = "1.0.0", reason = "text")] -pub fn foo() -> usize { - 20 -} - -#[unstable(feature = "unstable_test_feature", issue = "0")] -pub fn bar() -> usize { - 40 -} - -#[unstable(feature = "unstable_test_feature", issue = "0")] -pub fn baz() -> usize { - 30 -} diff --git a/src/test/ui/lint-anon-param-edition.fixed b/src/test/ui/lint/lint-anon-param-edition.fixed similarity index 100% rename from src/test/ui/lint-anon-param-edition.fixed rename to src/test/ui/lint/lint-anon-param-edition.fixed diff --git a/src/test/ui/lint-anon-param-edition.rs b/src/test/ui/lint/lint-anon-param-edition.rs similarity index 100% rename from src/test/ui/lint-anon-param-edition.rs rename to src/test/ui/lint/lint-anon-param-edition.rs diff --git a/src/test/ui/lint-anon-param-edition.stderr b/src/test/ui/lint/lint-anon-param-edition.stderr similarity index 100% rename from src/test/ui/lint-anon-param-edition.stderr rename to src/test/ui/lint/lint-anon-param-edition.stderr diff --git a/src/test/ui/compile-fail-migration/lint-attr-non-item-node.rs b/src/test/ui/lint/lint-attr-non-item-node.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-attr-non-item-node.rs rename to src/test/ui/lint/lint-attr-non-item-node.rs diff --git a/src/test/ui/compile-fail-migration/lint-attr-non-item-node.stderr b/src/test/ui/lint/lint-attr-non-item-node.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-attr-non-item-node.stderr rename to src/test/ui/lint/lint-attr-non-item-node.stderr diff --git a/src/test/ui/compile-fail-migration/lint-change-warnings.rs b/src/test/ui/lint/lint-change-warnings.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-change-warnings.rs rename to src/test/ui/lint/lint-change-warnings.rs diff --git a/src/test/ui/compile-fail-migration/lint-change-warnings.stderr b/src/test/ui/lint/lint-change-warnings.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-change-warnings.stderr rename to src/test/ui/lint/lint-change-warnings.stderr diff --git a/src/test/ui/compile-fail-migration/lint-ctypes-enum.rs b/src/test/ui/lint/lint-ctypes-enum.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-ctypes-enum.rs rename to src/test/ui/lint/lint-ctypes-enum.rs diff --git a/src/test/ui/compile-fail-migration/lint-ctypes-enum.stderr b/src/test/ui/lint/lint-ctypes-enum.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-ctypes-enum.stderr rename to src/test/ui/lint/lint-ctypes-enum.stderr diff --git a/src/test/ui/lint-ctypes.rs b/src/test/ui/lint/lint-ctypes.rs similarity index 100% rename from src/test/ui/lint-ctypes.rs rename to src/test/ui/lint/lint-ctypes.rs diff --git a/src/test/ui/lint-ctypes.stderr b/src/test/ui/lint/lint-ctypes.stderr similarity index 100% rename from src/test/ui/lint-ctypes.stderr rename to src/test/ui/lint/lint-ctypes.stderr diff --git a/src/test/ui/compile-fail-migration/lint-dead-code-1.rs b/src/test/ui/lint/lint-dead-code-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-dead-code-1.rs rename to src/test/ui/lint/lint-dead-code-1.rs diff --git a/src/test/ui/compile-fail-migration/lint-dead-code-1.stderr b/src/test/ui/lint/lint-dead-code-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-dead-code-1.stderr rename to src/test/ui/lint/lint-dead-code-1.stderr diff --git a/src/test/ui/compile-fail-migration/lint-dead-code-2.rs b/src/test/ui/lint/lint-dead-code-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-dead-code-2.rs rename to src/test/ui/lint/lint-dead-code-2.rs diff --git a/src/test/ui/compile-fail-migration/lint-dead-code-2.stderr b/src/test/ui/lint/lint-dead-code-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-dead-code-2.stderr rename to src/test/ui/lint/lint-dead-code-2.stderr diff --git a/src/test/ui/compile-fail-migration/lint-dead-code-3.rs b/src/test/ui/lint/lint-dead-code-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-dead-code-3.rs rename to src/test/ui/lint/lint-dead-code-3.rs diff --git a/src/test/ui/compile-fail-migration/lint-dead-code-3.stderr b/src/test/ui/lint/lint-dead-code-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-dead-code-3.stderr rename to src/test/ui/lint/lint-dead-code-3.stderr diff --git a/src/test/ui/compile-fail-migration/lint-dead-code-4.rs b/src/test/ui/lint/lint-dead-code-4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-dead-code-4.rs rename to src/test/ui/lint/lint-dead-code-4.rs diff --git a/src/test/ui/compile-fail-migration/lint-dead-code-4.stderr b/src/test/ui/lint/lint-dead-code-4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-dead-code-4.stderr rename to src/test/ui/lint/lint-dead-code-4.stderr diff --git a/src/test/ui/compile-fail-migration/lint-dead-code-5.rs b/src/test/ui/lint/lint-dead-code-5.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-dead-code-5.rs rename to src/test/ui/lint/lint-dead-code-5.rs diff --git a/src/test/ui/compile-fail-migration/lint-dead-code-5.stderr b/src/test/ui/lint/lint-dead-code-5.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-dead-code-5.stderr rename to src/test/ui/lint/lint-dead-code-5.stderr diff --git a/src/test/ui/compile-fail-migration/lint-dead-code-type-alias.rs b/src/test/ui/lint/lint-dead-code-type-alias.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-dead-code-type-alias.rs rename to src/test/ui/lint/lint-dead-code-type-alias.rs diff --git a/src/test/ui/compile-fail-migration/lint-dead-code-type-alias.stderr b/src/test/ui/lint/lint-dead-code-type-alias.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-dead-code-type-alias.stderr rename to src/test/ui/lint/lint-dead-code-type-alias.stderr diff --git a/src/test/ui/compile-fail-migration/lint-dead-code-variant.rs b/src/test/ui/lint/lint-dead-code-variant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-dead-code-variant.rs rename to src/test/ui/lint/lint-dead-code-variant.rs diff --git a/src/test/ui/compile-fail-migration/lint-dead-code-variant.stderr b/src/test/ui/lint/lint-dead-code-variant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-dead-code-variant.stderr rename to src/test/ui/lint/lint-dead-code-variant.stderr diff --git a/src/test/ui/compile-fail-migration/lint-directives-on-use-items-issue-10534.rs b/src/test/ui/lint/lint-directives-on-use-items-issue-10534.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-directives-on-use-items-issue-10534.rs rename to src/test/ui/lint/lint-directives-on-use-items-issue-10534.rs diff --git a/src/test/ui/compile-fail-migration/lint-directives-on-use-items-issue-10534.stderr b/src/test/ui/lint/lint-directives-on-use-items-issue-10534.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-directives-on-use-items-issue-10534.stderr rename to src/test/ui/lint/lint-directives-on-use-items-issue-10534.stderr diff --git a/src/test/ui/compile-fail-migration/lint-exceeding-bitshifts.rs b/src/test/ui/lint/lint-exceeding-bitshifts.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-exceeding-bitshifts.rs rename to src/test/ui/lint/lint-exceeding-bitshifts.rs diff --git a/src/test/ui/compile-fail-migration/lint-exceeding-bitshifts.stderr b/src/test/ui/lint/lint-exceeding-bitshifts.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-exceeding-bitshifts.stderr rename to src/test/ui/lint/lint-exceeding-bitshifts.stderr diff --git a/src/test/ui/compile-fail-migration/lint-exceeding-bitshifts2.rs b/src/test/ui/lint/lint-exceeding-bitshifts2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-exceeding-bitshifts2.rs rename to src/test/ui/lint/lint-exceeding-bitshifts2.rs diff --git a/src/test/ui/compile-fail-migration/lint-exceeding-bitshifts2.stderr b/src/test/ui/lint/lint-exceeding-bitshifts2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-exceeding-bitshifts2.stderr rename to src/test/ui/lint/lint-exceeding-bitshifts2.stderr diff --git a/src/test/ui/lint-forbid-attr.rs b/src/test/ui/lint/lint-forbid-attr.rs similarity index 100% rename from src/test/ui/lint-forbid-attr.rs rename to src/test/ui/lint/lint-forbid-attr.rs diff --git a/src/test/ui/lint-forbid-attr.stderr b/src/test/ui/lint/lint-forbid-attr.stderr similarity index 100% rename from src/test/ui/lint-forbid-attr.stderr rename to src/test/ui/lint/lint-forbid-attr.stderr diff --git a/src/test/ui/compile-fail-migration/lint-forbid-cmdline.rs b/src/test/ui/lint/lint-forbid-cmdline.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-forbid-cmdline.rs rename to src/test/ui/lint/lint-forbid-cmdline.rs diff --git a/src/test/ui/compile-fail-migration/lint-forbid-cmdline.stderr b/src/test/ui/lint/lint-forbid-cmdline.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-forbid-cmdline.stderr rename to src/test/ui/lint/lint-forbid-cmdline.stderr diff --git a/src/test/ui/compile-fail-migration/lint-impl-fn.rs b/src/test/ui/lint/lint-impl-fn.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-impl-fn.rs rename to src/test/ui/lint/lint-impl-fn.rs diff --git a/src/test/ui/compile-fail-migration/lint-impl-fn.stderr b/src/test/ui/lint/lint-impl-fn.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-impl-fn.stderr rename to src/test/ui/lint/lint-impl-fn.stderr diff --git a/src/test/ui/compile-fail-migration/lint-malformed.rs b/src/test/ui/lint/lint-malformed.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-malformed.rs rename to src/test/ui/lint/lint-malformed.rs diff --git a/src/test/ui/compile-fail-migration/lint-malformed.stderr b/src/test/ui/lint/lint-malformed.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-malformed.stderr rename to src/test/ui/lint/lint-malformed.stderr diff --git a/src/test/ui/compile-fail-migration/lint-misplaced-attr.rs b/src/test/ui/lint/lint-misplaced-attr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-misplaced-attr.rs rename to src/test/ui/lint/lint-misplaced-attr.rs diff --git a/src/test/ui/compile-fail-migration/lint-misplaced-attr.stderr b/src/test/ui/lint/lint-misplaced-attr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-misplaced-attr.stderr rename to src/test/ui/lint/lint-misplaced-attr.stderr diff --git a/src/test/ui/compile-fail-migration/lint-missing-copy-implementations.rs b/src/test/ui/lint/lint-missing-copy-implementations.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-missing-copy-implementations.rs rename to src/test/ui/lint/lint-missing-copy-implementations.rs diff --git a/src/test/ui/compile-fail-migration/lint-missing-copy-implementations.stderr b/src/test/ui/lint/lint-missing-copy-implementations.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-missing-copy-implementations.stderr rename to src/test/ui/lint/lint-missing-copy-implementations.stderr diff --git a/src/test/ui/compile-fail-migration/lint-missing-doc.rs b/src/test/ui/lint/lint-missing-doc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-missing-doc.rs rename to src/test/ui/lint/lint-missing-doc.rs diff --git a/src/test/ui/compile-fail-migration/lint-missing-doc.stderr b/src/test/ui/lint/lint-missing-doc.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-missing-doc.stderr rename to src/test/ui/lint/lint-missing-doc.stderr diff --git a/src/test/ui/compile-fail-migration/lint-non-camel-case-types.rs b/src/test/ui/lint/lint-non-camel-case-types.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-non-camel-case-types.rs rename to src/test/ui/lint/lint-non-camel-case-types.rs diff --git a/src/test/ui/compile-fail-migration/lint-non-camel-case-types.stderr b/src/test/ui/lint/lint-non-camel-case-types.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-non-camel-case-types.stderr rename to src/test/ui/lint/lint-non-camel-case-types.stderr diff --git a/src/test/ui/compile-fail-migration/lint-non-snake-case-crate-2.rs b/src/test/ui/lint/lint-non-snake-case-crate-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-non-snake-case-crate-2.rs rename to src/test/ui/lint/lint-non-snake-case-crate-2.rs diff --git a/src/test/ui/compile-fail-migration/lint-non-snake-case-crate-2.stderr b/src/test/ui/lint/lint-non-snake-case-crate-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-non-snake-case-crate-2.stderr rename to src/test/ui/lint/lint-non-snake-case-crate-2.stderr diff --git a/src/test/ui/compile-fail-migration/lint-non-snake-case-crate.rs b/src/test/ui/lint/lint-non-snake-case-crate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-non-snake-case-crate.rs rename to src/test/ui/lint/lint-non-snake-case-crate.rs diff --git a/src/test/ui/compile-fail-migration/lint-non-snake-case-crate.stderr b/src/test/ui/lint/lint-non-snake-case-crate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-non-snake-case-crate.stderr rename to src/test/ui/lint/lint-non-snake-case-crate.stderr diff --git a/src/test/ui/compile-fail-migration/lint-non-snake-case-functions.rs b/src/test/ui/lint/lint-non-snake-case-functions.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-non-snake-case-functions.rs rename to src/test/ui/lint/lint-non-snake-case-functions.rs diff --git a/src/test/ui/compile-fail-migration/lint-non-snake-case-functions.stderr b/src/test/ui/lint/lint-non-snake-case-functions.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-non-snake-case-functions.stderr rename to src/test/ui/lint/lint-non-snake-case-functions.stderr diff --git a/src/test/ui/compile-fail-migration/lint-non-snake-case-lifetimes.rs b/src/test/ui/lint/lint-non-snake-case-lifetimes.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-non-snake-case-lifetimes.rs rename to src/test/ui/lint/lint-non-snake-case-lifetimes.rs diff --git a/src/test/ui/compile-fail-migration/lint-non-snake-case-lifetimes.stderr b/src/test/ui/lint/lint-non-snake-case-lifetimes.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-non-snake-case-lifetimes.stderr rename to src/test/ui/lint/lint-non-snake-case-lifetimes.stderr diff --git a/src/test/ui/compile-fail-migration/lint-non-snake-case-modules.rs b/src/test/ui/lint/lint-non-snake-case-modules.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-non-snake-case-modules.rs rename to src/test/ui/lint/lint-non-snake-case-modules.rs diff --git a/src/test/ui/compile-fail-migration/lint-non-snake-case-modules.stderr b/src/test/ui/lint/lint-non-snake-case-modules.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-non-snake-case-modules.stderr rename to src/test/ui/lint/lint-non-snake-case-modules.stderr diff --git a/src/test/ui/compile-fail-migration/lint-non-uppercase-statics.rs b/src/test/ui/lint/lint-non-uppercase-statics.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-non-uppercase-statics.rs rename to src/test/ui/lint/lint-non-uppercase-statics.rs diff --git a/src/test/ui/compile-fail-migration/lint-non-uppercase-statics.stderr b/src/test/ui/lint/lint-non-uppercase-statics.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-non-uppercase-statics.stderr rename to src/test/ui/lint/lint-non-uppercase-statics.stderr diff --git a/src/test/ui/compile-fail-migration/lint-obsolete-attr.rs b/src/test/ui/lint/lint-obsolete-attr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-obsolete-attr.rs rename to src/test/ui/lint/lint-obsolete-attr.rs diff --git a/src/test/ui/compile-fail-migration/lint-obsolete-attr.stderr b/src/test/ui/lint/lint-obsolete-attr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-obsolete-attr.stderr rename to src/test/ui/lint/lint-obsolete-attr.stderr diff --git a/src/test/ui/lint-output-format-2.rs b/src/test/ui/lint/lint-output-format-2.rs similarity index 100% rename from src/test/ui/lint-output-format-2.rs rename to src/test/ui/lint/lint-output-format-2.rs diff --git a/src/test/ui/lint-output-format-2.stderr b/src/test/ui/lint/lint-output-format-2.stderr similarity index 100% rename from src/test/ui/lint-output-format-2.stderr rename to src/test/ui/lint/lint-output-format-2.stderr diff --git a/src/test/ui/compile-fail-migration/lint-output-format.rs b/src/test/ui/lint/lint-output-format.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-output-format.rs rename to src/test/ui/lint/lint-output-format.rs diff --git a/src/test/ui/compile-fail-migration/lint-output-format.stderr b/src/test/ui/lint/lint-output-format.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-output-format.stderr rename to src/test/ui/lint/lint-output-format.stderr diff --git a/src/test/ui/compile-fail-migration/lint-owned-heap-memory.rs b/src/test/ui/lint/lint-owned-heap-memory.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-owned-heap-memory.rs rename to src/test/ui/lint/lint-owned-heap-memory.rs diff --git a/src/test/ui/compile-fail-migration/lint-owned-heap-memory.stderr b/src/test/ui/lint/lint-owned-heap-memory.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-owned-heap-memory.stderr rename to src/test/ui/lint/lint-owned-heap-memory.stderr diff --git a/src/test/ui/compile-fail-migration/lint-qualification.rs b/src/test/ui/lint/lint-qualification.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-qualification.rs rename to src/test/ui/lint/lint-qualification.rs diff --git a/src/test/ui/compile-fail-migration/lint-qualification.stderr b/src/test/ui/lint/lint-qualification.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-qualification.stderr rename to src/test/ui/lint/lint-qualification.stderr diff --git a/src/test/ui/compile-fail-migration/lint-removed-allow.rs b/src/test/ui/lint/lint-removed-allow.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-removed-allow.rs rename to src/test/ui/lint/lint-removed-allow.rs diff --git a/src/test/ui/compile-fail-migration/lint-removed-allow.stderr b/src/test/ui/lint/lint-removed-allow.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-removed-allow.stderr rename to src/test/ui/lint/lint-removed-allow.stderr diff --git a/src/test/ui/compile-fail-migration/lint-removed-cmdline.rs b/src/test/ui/lint/lint-removed-cmdline.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-removed-cmdline.rs rename to src/test/ui/lint/lint-removed-cmdline.rs diff --git a/src/test/ui/compile-fail-migration/lint-removed-cmdline.stderr b/src/test/ui/lint/lint-removed-cmdline.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-removed-cmdline.stderr rename to src/test/ui/lint/lint-removed-cmdline.stderr diff --git a/src/test/ui/compile-fail-migration/lint-removed.rs b/src/test/ui/lint/lint-removed.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-removed.rs rename to src/test/ui/lint/lint-removed.rs diff --git a/src/test/ui/compile-fail-migration/lint-removed.stderr b/src/test/ui/lint/lint-removed.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-removed.stderr rename to src/test/ui/lint/lint-removed.stderr diff --git a/src/test/ui/compile-fail-migration/lint-renamed-allow.rs b/src/test/ui/lint/lint-renamed-allow.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-renamed-allow.rs rename to src/test/ui/lint/lint-renamed-allow.rs diff --git a/src/test/ui/compile-fail-migration/lint-renamed-allow.stderr b/src/test/ui/lint/lint-renamed-allow.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-renamed-allow.stderr rename to src/test/ui/lint/lint-renamed-allow.stderr diff --git a/src/test/ui/compile-fail-migration/lint-renamed-cmdline.rs b/src/test/ui/lint/lint-renamed-cmdline.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-renamed-cmdline.rs rename to src/test/ui/lint/lint-renamed-cmdline.rs diff --git a/src/test/ui/compile-fail-migration/lint-renamed-cmdline.stderr b/src/test/ui/lint/lint-renamed-cmdline.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-renamed-cmdline.stderr rename to src/test/ui/lint/lint-renamed-cmdline.stderr diff --git a/src/test/ui/compile-fail-migration/lint-renamed.rs b/src/test/ui/lint/lint-renamed.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-renamed.rs rename to src/test/ui/lint/lint-renamed.rs diff --git a/src/test/ui/compile-fail-migration/lint-renamed.stderr b/src/test/ui/lint/lint-renamed.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-renamed.stderr rename to src/test/ui/lint/lint-renamed.stderr diff --git a/src/test/ui/compile-fail-migration/lint-shorthand-field.rs b/src/test/ui/lint/lint-shorthand-field.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-shorthand-field.rs rename to src/test/ui/lint/lint-shorthand-field.rs diff --git a/src/test/ui/compile-fail-migration/lint-shorthand-field.stderr b/src/test/ui/lint/lint-shorthand-field.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-shorthand-field.stderr rename to src/test/ui/lint/lint-shorthand-field.stderr diff --git a/src/test/ui/compile-fail-migration/lint-stability-2.rs b/src/test/ui/lint/lint-stability-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-stability-2.rs rename to src/test/ui/lint/lint-stability-2.rs diff --git a/src/test/ui/compile-fail-migration/lint-stability-2.stderr b/src/test/ui/lint/lint-stability-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-stability-2.stderr rename to src/test/ui/lint/lint-stability-2.stderr diff --git a/src/test/ui/compile-fail-migration/lint-stability-deprecated.rs b/src/test/ui/lint/lint-stability-deprecated.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-stability-deprecated.rs rename to src/test/ui/lint/lint-stability-deprecated.rs diff --git a/src/test/ui/compile-fail-migration/lint-stability-deprecated.stderr b/src/test/ui/lint/lint-stability-deprecated.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-stability-deprecated.stderr rename to src/test/ui/lint/lint-stability-deprecated.stderr diff --git a/src/test/ui/compile-fail-migration/lint-stability-fields-deprecated.rs b/src/test/ui/lint/lint-stability-fields-deprecated.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-stability-fields-deprecated.rs rename to src/test/ui/lint/lint-stability-fields-deprecated.rs diff --git a/src/test/ui/compile-fail-migration/lint-stability-fields-deprecated.stderr b/src/test/ui/lint/lint-stability-fields-deprecated.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-stability-fields-deprecated.stderr rename to src/test/ui/lint/lint-stability-fields-deprecated.stderr diff --git a/src/test/ui/compile-fail-migration/lint-stability-fields.rs b/src/test/ui/lint/lint-stability-fields.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-stability-fields.rs rename to src/test/ui/lint/lint-stability-fields.rs diff --git a/src/test/ui/compile-fail-migration/lint-stability-fields.stderr b/src/test/ui/lint/lint-stability-fields.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-stability-fields.stderr rename to src/test/ui/lint/lint-stability-fields.stderr diff --git a/src/test/ui/compile-fail-migration/lint-stability.rs b/src/test/ui/lint/lint-stability.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-stability.rs rename to src/test/ui/lint/lint-stability.rs diff --git a/src/test/ui/compile-fail-migration/lint-stability.stderr b/src/test/ui/lint/lint-stability.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-stability.stderr rename to src/test/ui/lint/lint-stability.stderr diff --git a/src/test/ui/compile-fail-migration/lint-stability2.rs b/src/test/ui/lint/lint-stability2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-stability2.rs rename to src/test/ui/lint/lint-stability2.rs diff --git a/src/test/ui/compile-fail-migration/lint-stability2.stderr b/src/test/ui/lint/lint-stability2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-stability2.stderr rename to src/test/ui/lint/lint-stability2.stderr diff --git a/src/test/ui/compile-fail-migration/lint-stability3.rs b/src/test/ui/lint/lint-stability3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-stability3.rs rename to src/test/ui/lint/lint-stability3.rs diff --git a/src/test/ui/compile-fail-migration/lint-stability3.stderr b/src/test/ui/lint/lint-stability3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-stability3.stderr rename to src/test/ui/lint/lint-stability3.stderr diff --git a/src/test/ui/compile-fail-migration/lint-type-limits.rs b/src/test/ui/lint/lint-type-limits.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-type-limits.rs rename to src/test/ui/lint/lint-type-limits.rs diff --git a/src/test/ui/compile-fail-migration/lint-type-limits.stderr b/src/test/ui/lint/lint-type-limits.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-type-limits.stderr rename to src/test/ui/lint/lint-type-limits.stderr diff --git a/src/test/ui/compile-fail-migration/lint-type-limits2.rs b/src/test/ui/lint/lint-type-limits2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-type-limits2.rs rename to src/test/ui/lint/lint-type-limits2.rs diff --git a/src/test/ui/compile-fail-migration/lint-type-limits2.stderr b/src/test/ui/lint/lint-type-limits2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-type-limits2.stderr rename to src/test/ui/lint/lint-type-limits2.stderr diff --git a/src/test/ui/compile-fail-migration/lint-type-limits3.rs b/src/test/ui/lint/lint-type-limits3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-type-limits3.rs rename to src/test/ui/lint/lint-type-limits3.rs diff --git a/src/test/ui/compile-fail-migration/lint-type-limits3.stderr b/src/test/ui/lint/lint-type-limits3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-type-limits3.stderr rename to src/test/ui/lint/lint-type-limits3.stderr diff --git a/src/test/ui/compile-fail-migration/lint-type-overflow.rs b/src/test/ui/lint/lint-type-overflow.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-type-overflow.rs rename to src/test/ui/lint/lint-type-overflow.rs diff --git a/src/test/ui/compile-fail-migration/lint-type-overflow.stderr b/src/test/ui/lint/lint-type-overflow.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-type-overflow.stderr rename to src/test/ui/lint/lint-type-overflow.stderr diff --git a/src/test/ui/compile-fail-migration/lint-type-overflow2.rs b/src/test/ui/lint/lint-type-overflow2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-type-overflow2.rs rename to src/test/ui/lint/lint-type-overflow2.rs diff --git a/src/test/ui/compile-fail-migration/lint-type-overflow2.stderr b/src/test/ui/lint/lint-type-overflow2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-type-overflow2.stderr rename to src/test/ui/lint/lint-type-overflow2.stderr diff --git a/src/test/ui/lint-unconditional-recursion.rs b/src/test/ui/lint/lint-unconditional-recursion.rs similarity index 100% rename from src/test/ui/lint-unconditional-recursion.rs rename to src/test/ui/lint/lint-unconditional-recursion.rs diff --git a/src/test/ui/lint-unconditional-recursion.stderr b/src/test/ui/lint/lint-unconditional-recursion.stderr similarity index 100% rename from src/test/ui/lint-unconditional-recursion.stderr rename to src/test/ui/lint/lint-unconditional-recursion.stderr diff --git a/src/test/ui/compile-fail-migration/lint-unexported-no-mangle.rs b/src/test/ui/lint/lint-unexported-no-mangle.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unexported-no-mangle.rs rename to src/test/ui/lint/lint-unexported-no-mangle.rs diff --git a/src/test/ui/compile-fail-migration/lint-unexported-no-mangle.stderr b/src/test/ui/lint/lint-unexported-no-mangle.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unexported-no-mangle.stderr rename to src/test/ui/lint/lint-unexported-no-mangle.stderr diff --git a/src/test/ui/compile-fail-migration/lint-unknown-attr.rs b/src/test/ui/lint/lint-unknown-attr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unknown-attr.rs rename to src/test/ui/lint/lint-unknown-attr.rs diff --git a/src/test/ui/compile-fail-migration/lint-unknown-attr.stderr b/src/test/ui/lint/lint-unknown-attr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unknown-attr.stderr rename to src/test/ui/lint/lint-unknown-attr.stderr diff --git a/src/test/ui/compile-fail-migration/lint-unknown-feature-default.rs b/src/test/ui/lint/lint-unknown-feature-default.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unknown-feature-default.rs rename to src/test/ui/lint/lint-unknown-feature-default.rs diff --git a/src/test/ui/compile-fail-migration/lint-unknown-feature-default.stderr b/src/test/ui/lint/lint-unknown-feature-default.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unknown-feature-default.stderr rename to src/test/ui/lint/lint-unknown-feature-default.stderr diff --git a/src/test/ui/compile-fail-migration/lint-unknown-feature.rs b/src/test/ui/lint/lint-unknown-feature.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unknown-feature.rs rename to src/test/ui/lint/lint-unknown-feature.rs diff --git a/src/test/ui/compile-fail-migration/lint-unknown-feature.stderr b/src/test/ui/lint/lint-unknown-feature.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unknown-feature.stderr rename to src/test/ui/lint/lint-unknown-feature.stderr diff --git a/src/test/ui/compile-fail-migration/lint-unknown-lint-cmdline.rs b/src/test/ui/lint/lint-unknown-lint-cmdline.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unknown-lint-cmdline.rs rename to src/test/ui/lint/lint-unknown-lint-cmdline.rs diff --git a/src/test/ui/compile-fail-migration/lint-unknown-lint-cmdline.stderr b/src/test/ui/lint/lint-unknown-lint-cmdline.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unknown-lint-cmdline.stderr rename to src/test/ui/lint/lint-unknown-lint-cmdline.stderr diff --git a/src/test/ui/compile-fail-migration/lint-unknown-lint.rs b/src/test/ui/lint/lint-unknown-lint.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unknown-lint.rs rename to src/test/ui/lint/lint-unknown-lint.rs diff --git a/src/test/ui/compile-fail-migration/lint-unknown-lint.stderr b/src/test/ui/lint/lint-unknown-lint.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unknown-lint.stderr rename to src/test/ui/lint/lint-unknown-lint.stderr diff --git a/src/test/ui/compile-fail-migration/lint-unnecessary-import-braces.rs b/src/test/ui/lint/lint-unnecessary-import-braces.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unnecessary-import-braces.rs rename to src/test/ui/lint/lint-unnecessary-import-braces.rs diff --git a/src/test/ui/compile-fail-migration/lint-unnecessary-import-braces.stderr b/src/test/ui/lint/lint-unnecessary-import-braces.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unnecessary-import-braces.stderr rename to src/test/ui/lint/lint-unnecessary-import-braces.stderr diff --git a/src/test/ui/compile-fail-migration/lint-unnecessary-parens.rs b/src/test/ui/lint/lint-unnecessary-parens.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unnecessary-parens.rs rename to src/test/ui/lint/lint-unnecessary-parens.rs diff --git a/src/test/ui/compile-fail-migration/lint-unnecessary-parens.stderr b/src/test/ui/lint/lint-unnecessary-parens.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unnecessary-parens.stderr rename to src/test/ui/lint/lint-unnecessary-parens.stderr diff --git a/src/test/ui/compile-fail-migration/lint-unsafe-code.rs b/src/test/ui/lint/lint-unsafe-code.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unsafe-code.rs rename to src/test/ui/lint/lint-unsafe-code.rs diff --git a/src/test/ui/compile-fail-migration/lint-unsafe-code.stderr b/src/test/ui/lint/lint-unsafe-code.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unsafe-code.stderr rename to src/test/ui/lint/lint-unsafe-code.stderr diff --git a/src/test/ui/compile-fail-migration/lint-unused-extern-crate.rs b/src/test/ui/lint/lint-unused-extern-crate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unused-extern-crate.rs rename to src/test/ui/lint/lint-unused-extern-crate.rs diff --git a/src/test/ui/compile-fail-migration/lint-unused-extern-crate.stderr b/src/test/ui/lint/lint-unused-extern-crate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unused-extern-crate.stderr rename to src/test/ui/lint/lint-unused-extern-crate.stderr diff --git a/src/test/ui/compile-fail-migration/lint-unused-imports.rs b/src/test/ui/lint/lint-unused-imports.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unused-imports.rs rename to src/test/ui/lint/lint-unused-imports.rs diff --git a/src/test/ui/compile-fail-migration/lint-unused-imports.stderr b/src/test/ui/lint/lint-unused-imports.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unused-imports.stderr rename to src/test/ui/lint/lint-unused-imports.stderr diff --git a/src/test/ui/compile-fail-migration/lint-unused-mut-self.rs b/src/test/ui/lint/lint-unused-mut-self.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unused-mut-self.rs rename to src/test/ui/lint/lint-unused-mut-self.rs diff --git a/src/test/ui/compile-fail-migration/lint-unused-mut-self.stderr b/src/test/ui/lint/lint-unused-mut-self.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unused-mut-self.stderr rename to src/test/ui/lint/lint-unused-mut-self.stderr diff --git a/src/test/ui/compile-fail-migration/lint-unused-mut-variables.lexical.stderr b/src/test/ui/lint/lint-unused-mut-variables.lexical.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unused-mut-variables.lexical.stderr rename to src/test/ui/lint/lint-unused-mut-variables.lexical.stderr diff --git a/src/test/ui/compile-fail-migration/lint-unused-mut-variables.nll.stderr b/src/test/ui/lint/lint-unused-mut-variables.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unused-mut-variables.nll.stderr rename to src/test/ui/lint/lint-unused-mut-variables.nll.stderr diff --git a/src/test/ui/compile-fail-migration/lint-unused-mut-variables.rs b/src/test/ui/lint/lint-unused-mut-variables.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-unused-mut-variables.rs rename to src/test/ui/lint/lint-unused-mut-variables.rs diff --git a/src/test/ui/compile-fail-migration/lint-uppercase-variables.rs b/src/test/ui/lint/lint-uppercase-variables.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lint-uppercase-variables.rs rename to src/test/ui/lint/lint-uppercase-variables.rs diff --git a/src/test/ui/compile-fail-migration/lint-uppercase-variables.stderr b/src/test/ui/lint/lint-uppercase-variables.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lint-uppercase-variables.stderr rename to src/test/ui/lint/lint-uppercase-variables.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-assign-imm-local-in-loop.ast.nll.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-assign-imm-local-in-loop.ast.nll.stderr rename to src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-assign-imm-local-in-loop.ast.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-assign-imm-local-in-loop.ast.stderr rename to src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.ast.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-assign-imm-local-in-loop.mir.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-assign-imm-local-in-loop.mir.stderr rename to src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.mir.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-assign-imm-local-in-loop.rs b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.rs similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-assign-imm-local-in-loop.rs rename to src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.rs diff --git a/src/test/ui/compile-fail-migration/liveness-assign-imm-local-in-op-eq.ast.nll.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-assign-imm-local-in-op-eq.ast.nll.stderr rename to src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-assign-imm-local-in-op-eq.ast.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-assign-imm-local-in-op-eq.ast.stderr rename to src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.ast.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-assign-imm-local-in-op-eq.mir.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-assign-imm-local-in-op-eq.mir.stderr rename to src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.mir.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-assign-imm-local-in-op-eq.rs b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.rs similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-assign-imm-local-in-op-eq.rs rename to src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.rs diff --git a/src/test/ui/compile-fail-migration/liveness-assign-imm-local-with-drop.ast.nll.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-assign-imm-local-with-drop.ast.nll.stderr rename to src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-assign-imm-local-with-drop.ast.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-assign-imm-local-with-drop.ast.stderr rename to src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.ast.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-assign-imm-local-with-drop.mir.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-assign-imm-local-with-drop.mir.stderr rename to src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.mir.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-assign-imm-local-with-drop.rs b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.rs similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-assign-imm-local-with-drop.rs rename to src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.rs diff --git a/src/test/ui/compile-fail-migration/liveness-assign-imm-local-with-init.ast.nll.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-assign-imm-local-with-init.ast.nll.stderr rename to src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-assign-imm-local-with-init.ast.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-assign-imm-local-with-init.ast.stderr rename to src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.ast.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-assign-imm-local-with-init.mir.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-assign-imm-local-with-init.mir.stderr rename to src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.mir.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-assign-imm-local-with-init.rs b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.rs similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-assign-imm-local-with-init.rs rename to src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.rs diff --git a/src/test/ui/compile-fail-migration/liveness-closure-require-ret.rs b/src/test/ui/liveness/liveness-closure-require-ret.rs similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-closure-require-ret.rs rename to src/test/ui/liveness/liveness-closure-require-ret.rs diff --git a/src/test/ui/compile-fail-migration/liveness-closure-require-ret.stderr b/src/test/ui/liveness/liveness-closure-require-ret.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-closure-require-ret.stderr rename to src/test/ui/liveness/liveness-closure-require-ret.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-dead.rs b/src/test/ui/liveness/liveness-dead.rs similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-dead.rs rename to src/test/ui/liveness/liveness-dead.rs diff --git a/src/test/ui/compile-fail-migration/liveness-dead.stderr b/src/test/ui/liveness/liveness-dead.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-dead.stderr rename to src/test/ui/liveness/liveness-dead.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-forgot-ret.rs b/src/test/ui/liveness/liveness-forgot-ret.rs similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-forgot-ret.rs rename to src/test/ui/liveness/liveness-forgot-ret.rs diff --git a/src/test/ui/compile-fail-migration/liveness-forgot-ret.stderr b/src/test/ui/liveness/liveness-forgot-ret.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-forgot-ret.stderr rename to src/test/ui/liveness/liveness-forgot-ret.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-issue-2163.rs b/src/test/ui/liveness/liveness-issue-2163.rs similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-issue-2163.rs rename to src/test/ui/liveness/liveness-issue-2163.rs diff --git a/src/test/ui/compile-fail-migration/liveness-issue-2163.stderr b/src/test/ui/liveness/liveness-issue-2163.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-issue-2163.stderr rename to src/test/ui/liveness/liveness-issue-2163.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-missing-ret2.rs b/src/test/ui/liveness/liveness-missing-ret2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-missing-ret2.rs rename to src/test/ui/liveness/liveness-missing-ret2.rs diff --git a/src/test/ui/compile-fail-migration/liveness-missing-ret2.stderr b/src/test/ui/liveness/liveness-missing-ret2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-missing-ret2.stderr rename to src/test/ui/liveness/liveness-missing-ret2.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-move-call-arg.rs b/src/test/ui/liveness/liveness-move-call-arg.rs similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-move-call-arg.rs rename to src/test/ui/liveness/liveness-move-call-arg.rs diff --git a/src/test/ui/compile-fail-migration/liveness-move-call-arg.stderr b/src/test/ui/liveness/liveness-move-call-arg.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-move-call-arg.stderr rename to src/test/ui/liveness/liveness-move-call-arg.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-move-in-loop.rs b/src/test/ui/liveness/liveness-move-in-loop.rs similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-move-in-loop.rs rename to src/test/ui/liveness/liveness-move-in-loop.rs diff --git a/src/test/ui/compile-fail-migration/liveness-move-in-loop.stderr b/src/test/ui/liveness/liveness-move-in-loop.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-move-in-loop.stderr rename to src/test/ui/liveness/liveness-move-in-loop.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-move-in-while.nll.stderr b/src/test/ui/liveness/liveness-move-in-while.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-move-in-while.nll.stderr rename to src/test/ui/liveness/liveness-move-in-while.nll.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-move-in-while.rs b/src/test/ui/liveness/liveness-move-in-while.rs similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-move-in-while.rs rename to src/test/ui/liveness/liveness-move-in-while.rs diff --git a/src/test/ui/compile-fail-migration/liveness-move-in-while.stderr b/src/test/ui/liveness/liveness-move-in-while.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-move-in-while.stderr rename to src/test/ui/liveness/liveness-move-in-while.stderr diff --git a/src/test/ui/liveness-return-last-stmt-semi.rs b/src/test/ui/liveness/liveness-return-last-stmt-semi.rs similarity index 100% rename from src/test/ui/liveness-return-last-stmt-semi.rs rename to src/test/ui/liveness/liveness-return-last-stmt-semi.rs diff --git a/src/test/ui/liveness-return-last-stmt-semi.stderr b/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr similarity index 100% rename from src/test/ui/liveness-return-last-stmt-semi.stderr rename to src/test/ui/liveness/liveness-return-last-stmt-semi.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-unused.rs b/src/test/ui/liveness/liveness-unused.rs similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-unused.rs rename to src/test/ui/liveness/liveness-unused.rs diff --git a/src/test/ui/compile-fail-migration/liveness-unused.stderr b/src/test/ui/liveness/liveness-unused.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-unused.stderr rename to src/test/ui/liveness/liveness-unused.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-use-after-move.nll.stderr b/src/test/ui/liveness/liveness-use-after-move.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-use-after-move.nll.stderr rename to src/test/ui/liveness/liveness-use-after-move.nll.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-use-after-move.rs b/src/test/ui/liveness/liveness-use-after-move.rs similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-use-after-move.rs rename to src/test/ui/liveness/liveness-use-after-move.rs diff --git a/src/test/ui/compile-fail-migration/liveness-use-after-move.stderr b/src/test/ui/liveness/liveness-use-after-move.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-use-after-move.stderr rename to src/test/ui/liveness/liveness-use-after-move.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-use-after-send.nll.stderr b/src/test/ui/liveness/liveness-use-after-send.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-use-after-send.nll.stderr rename to src/test/ui/liveness/liveness-use-after-send.nll.stderr diff --git a/src/test/ui/compile-fail-migration/liveness-use-after-send.rs b/src/test/ui/liveness/liveness-use-after-send.rs similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-use-after-send.rs rename to src/test/ui/liveness/liveness-use-after-send.rs diff --git a/src/test/ui/compile-fail-migration/liveness-use-after-send.stderr b/src/test/ui/liveness/liveness-use-after-send.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/liveness-use-after-send.stderr rename to src/test/ui/liveness/liveness-use-after-send.stderr diff --git a/src/test/ui/loop-break-value-no-repeat.rs b/src/test/ui/loops/loop-break-value-no-repeat.rs similarity index 100% rename from src/test/ui/loop-break-value-no-repeat.rs rename to src/test/ui/loops/loop-break-value-no-repeat.rs diff --git a/src/test/ui/loop-break-value-no-repeat.stderr b/src/test/ui/loops/loop-break-value-no-repeat.stderr similarity index 100% rename from src/test/ui/loop-break-value-no-repeat.stderr rename to src/test/ui/loops/loop-break-value-no-repeat.stderr diff --git a/src/test/ui/compile-fail-migration/loop-break-value.rs b/src/test/ui/loops/loop-break-value.rs similarity index 100% rename from src/test/ui/compile-fail-migration/loop-break-value.rs rename to src/test/ui/loops/loop-break-value.rs diff --git a/src/test/ui/compile-fail-migration/loop-break-value.stderr b/src/test/ui/loops/loop-break-value.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/loop-break-value.stderr rename to src/test/ui/loops/loop-break-value.stderr diff --git a/src/test/ui/compile-fail-migration/loop-labeled-break-value.rs b/src/test/ui/loops/loop-labeled-break-value.rs similarity index 100% rename from src/test/ui/compile-fail-migration/loop-labeled-break-value.rs rename to src/test/ui/loops/loop-labeled-break-value.rs diff --git a/src/test/ui/compile-fail-migration/loop-labeled-break-value.stderr b/src/test/ui/loops/loop-labeled-break-value.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/loop-labeled-break-value.stderr rename to src/test/ui/loops/loop-labeled-break-value.stderr diff --git a/src/test/ui/compile-fail-migration/loop-proper-liveness.nll.stderr b/src/test/ui/loops/loop-proper-liveness.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/loop-proper-liveness.nll.stderr rename to src/test/ui/loops/loop-proper-liveness.nll.stderr diff --git a/src/test/ui/compile-fail-migration/loop-proper-liveness.rs b/src/test/ui/loops/loop-proper-liveness.rs similarity index 100% rename from src/test/ui/compile-fail-migration/loop-proper-liveness.rs rename to src/test/ui/loops/loop-proper-liveness.rs diff --git a/src/test/ui/compile-fail-migration/loop-proper-liveness.stderr b/src/test/ui/loops/loop-proper-liveness.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/loop-proper-liveness.stderr rename to src/test/ui/loops/loop-proper-liveness.stderr diff --git a/src/test/ui/compile-fail-migration/loop-properly-diverging-2.rs b/src/test/ui/loops/loop-properly-diverging-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/loop-properly-diverging-2.rs rename to src/test/ui/loops/loop-properly-diverging-2.rs diff --git a/src/test/ui/compile-fail-migration/loop-properly-diverging-2.stderr b/src/test/ui/loops/loop-properly-diverging-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/loop-properly-diverging-2.stderr rename to src/test/ui/loops/loop-properly-diverging-2.stderr diff --git a/src/test/ui/loops-reject-duplicate-labels-2.rs b/src/test/ui/loops/loops-reject-duplicate-labels-2.rs similarity index 100% rename from src/test/ui/loops-reject-duplicate-labels-2.rs rename to src/test/ui/loops/loops-reject-duplicate-labels-2.rs diff --git a/src/test/ui/loops-reject-duplicate-labels-2.stderr b/src/test/ui/loops/loops-reject-duplicate-labels-2.stderr similarity index 100% rename from src/test/ui/loops-reject-duplicate-labels-2.stderr rename to src/test/ui/loops/loops-reject-duplicate-labels-2.stderr diff --git a/src/test/ui/loops-reject-duplicate-labels.rs b/src/test/ui/loops/loops-reject-duplicate-labels.rs similarity index 100% rename from src/test/ui/loops-reject-duplicate-labels.rs rename to src/test/ui/loops/loops-reject-duplicate-labels.rs diff --git a/src/test/ui/loops-reject-duplicate-labels.stderr b/src/test/ui/loops/loops-reject-duplicate-labels.stderr similarity index 100% rename from src/test/ui/loops-reject-duplicate-labels.stderr rename to src/test/ui/loops/loops-reject-duplicate-labels.stderr diff --git a/src/test/ui/loops-reject-labels-shadowing-lifetimes.rs b/src/test/ui/loops/loops-reject-labels-shadowing-lifetimes.rs similarity index 100% rename from src/test/ui/loops-reject-labels-shadowing-lifetimes.rs rename to src/test/ui/loops/loops-reject-labels-shadowing-lifetimes.rs diff --git a/src/test/ui/loops-reject-labels-shadowing-lifetimes.stderr b/src/test/ui/loops/loops-reject-labels-shadowing-lifetimes.stderr similarity index 100% rename from src/test/ui/loops-reject-labels-shadowing-lifetimes.stderr rename to src/test/ui/loops/loops-reject-labels-shadowing-lifetimes.stderr diff --git a/src/test/ui/loops-reject-lifetime-shadowing-label.rs b/src/test/ui/loops/loops-reject-lifetime-shadowing-label.rs similarity index 100% rename from src/test/ui/loops-reject-lifetime-shadowing-label.rs rename to src/test/ui/loops/loops-reject-lifetime-shadowing-label.rs diff --git a/src/test/ui/loops-reject-lifetime-shadowing-label.stderr b/src/test/ui/loops/loops-reject-lifetime-shadowing-label.stderr similarity index 100% rename from src/test/ui/loops-reject-lifetime-shadowing-label.stderr rename to src/test/ui/loops/loops-reject-lifetime-shadowing-label.stderr diff --git a/src/test/ui/compile-fail-migration/lto-duplicate-symbols.rs b/src/test/ui/lto-duplicate-symbols.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lto-duplicate-symbols.rs rename to src/test/ui/lto-duplicate-symbols.rs diff --git a/src/test/ui/compile-fail-migration/lto-duplicate-symbols.stderr b/src/test/ui/lto-duplicate-symbols.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lto-duplicate-symbols.stderr rename to src/test/ui/lto-duplicate-symbols.stderr diff --git a/src/test/ui/compile-fail-migration/lub-if.nll.stderr b/src/test/ui/lub-if.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lub-if.nll.stderr rename to src/test/ui/lub-if.nll.stderr diff --git a/src/test/ui/compile-fail-migration/lub-if.rs b/src/test/ui/lub-if.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lub-if.rs rename to src/test/ui/lub-if.rs diff --git a/src/test/ui/compile-fail-migration/lub-if.stderr b/src/test/ui/lub-if.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lub-if.stderr rename to src/test/ui/lub-if.stderr diff --git a/src/test/ui/compile-fail-migration/lub-match.nll.stderr b/src/test/ui/lub-match.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lub-match.nll.stderr rename to src/test/ui/lub-match.nll.stderr diff --git a/src/test/ui/compile-fail-migration/lub-match.rs b/src/test/ui/lub-match.rs similarity index 100% rename from src/test/ui/compile-fail-migration/lub-match.rs rename to src/test/ui/lub-match.rs diff --git a/src/test/ui/compile-fail-migration/lub-match.stderr b/src/test/ui/lub-match.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/lub-match.stderr rename to src/test/ui/lub-match.stderr diff --git a/src/test/ui/auxiliary/macro-in-other-crate.rs b/src/test/ui/macros/auxiliary/macro-in-other-crate.rs similarity index 100% rename from src/test/ui/auxiliary/macro-in-other-crate.rs rename to src/test/ui/macros/auxiliary/macro-in-other-crate.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/macro_crate_nonterminal.rs b/src/test/ui/macros/auxiliary/macro_crate_nonterminal.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/macro_crate_nonterminal.rs rename to src/test/ui/macros/auxiliary/macro_crate_nonterminal.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/two_macros.rs b/src/test/ui/macros/auxiliary/two_macros.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/two_macros.rs rename to src/test/ui/macros/auxiliary/two_macros.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/unstable-macros.rs b/src/test/ui/macros/auxiliary/unstable-macros.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/unstable-macros.rs rename to src/test/ui/macros/auxiliary/unstable-macros.rs diff --git a/src/test/ui/compile-fail-migration/macro-attribute.rs b/src/test/ui/macros/macro-attribute.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-attribute.rs rename to src/test/ui/macros/macro-attribute.rs diff --git a/src/test/ui/macros/macro-attribute.stderr b/src/test/ui/macros/macro-attribute.stderr new file mode 100644 index 00000000000..48132dddf1a --- /dev/null +++ b/src/test/ui/macros/macro-attribute.stderr @@ -0,0 +1,11 @@ +error[E0658]: arbitrary tokens in non-macro attributes are unstable (see issue #44690) + --> $DIR/macro-attribute.rs:11:1 + | +LL | #[doc = $not_there] //~ ERROR arbitrary tokens in non-macro attributes are unstable + | ^^^^^^^^^^^^^^^^^^^ + | + = help: add #![feature(unrestricted_attribute_tokens)] to the crate attributes to enable + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0658`. diff --git a/src/test/ui/compile-fail-migration/macro-comma-behavior.core.stderr b/src/test/ui/macros/macro-comma-behavior.core.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-comma-behavior.core.stderr rename to src/test/ui/macros/macro-comma-behavior.core.stderr diff --git a/src/test/ui/compile-fail-migration/macro-comma-behavior.rs b/src/test/ui/macros/macro-comma-behavior.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-comma-behavior.rs rename to src/test/ui/macros/macro-comma-behavior.rs diff --git a/src/test/ui/compile-fail-migration/macro-comma-behavior.std.stderr b/src/test/ui/macros/macro-comma-behavior.std.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-comma-behavior.std.stderr rename to src/test/ui/macros/macro-comma-behavior.std.stderr diff --git a/src/test/ui/compile-fail-migration/macro-comma-support.rs b/src/test/ui/macros/macro-comma-support.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-comma-support.rs rename to src/test/ui/macros/macro-comma-support.rs diff --git a/src/test/ui/compile-fail-migration/macro-comma-support.stderr b/src/test/ui/macros/macro-comma-support.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-comma-support.stderr rename to src/test/ui/macros/macro-comma-support.stderr diff --git a/src/test/ui/macro-context.rs b/src/test/ui/macros/macro-context.rs similarity index 100% rename from src/test/ui/macro-context.rs rename to src/test/ui/macros/macro-context.rs diff --git a/src/test/ui/macro-context.stderr b/src/test/ui/macros/macro-context.stderr similarity index 100% rename from src/test/ui/macro-context.stderr rename to src/test/ui/macros/macro-context.stderr diff --git a/src/test/ui/compile-fail-migration/macro-crate-nonterminal-non-root.rs b/src/test/ui/macros/macro-crate-nonterminal-non-root.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-crate-nonterminal-non-root.rs rename to src/test/ui/macros/macro-crate-nonterminal-non-root.rs diff --git a/src/test/ui/compile-fail-migration/macro-crate-nonterminal-non-root.stderr b/src/test/ui/macros/macro-crate-nonterminal-non-root.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-crate-nonterminal-non-root.stderr rename to src/test/ui/macros/macro-crate-nonterminal-non-root.stderr diff --git a/src/test/ui/compile-fail-migration/macro-error.rs b/src/test/ui/macros/macro-error.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-error.rs rename to src/test/ui/macros/macro-error.rs diff --git a/src/test/ui/compile-fail-migration/macro-error.stderr b/src/test/ui/macros/macro-error.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-error.stderr rename to src/test/ui/macros/macro-error.stderr diff --git a/src/test/ui/compile-fail-migration/macro-expanded-include/file.txt b/src/test/ui/macros/macro-expanded-include/file.txt similarity index 100% rename from src/test/ui/compile-fail-migration/macro-expanded-include/file.txt rename to src/test/ui/macros/macro-expanded-include/file.txt diff --git a/src/test/ui/compile-fail-migration/macro-expanded-include/foo/mod.rs b/src/test/ui/macros/macro-expanded-include/foo/mod.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-expanded-include/foo/mod.rs rename to src/test/ui/macros/macro-expanded-include/foo/mod.rs diff --git a/src/test/ui/compile-fail-migration/macro-expanded-include/test.rs b/src/test/ui/macros/macro-expanded-include/test.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-expanded-include/test.rs rename to src/test/ui/macros/macro-expanded-include/test.rs diff --git a/src/test/ui/compile-fail-migration/macro-expanded-include/test.stderr b/src/test/ui/macros/macro-expanded-include/test.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-expanded-include/test.stderr rename to src/test/ui/macros/macro-expanded-include/test.stderr diff --git a/src/test/ui/compile-fail-migration/macro-expansion-tests.rs b/src/test/ui/macros/macro-expansion-tests.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-expansion-tests.rs rename to src/test/ui/macros/macro-expansion-tests.rs diff --git a/src/test/ui/compile-fail-migration/macro-expansion-tests.stderr b/src/test/ui/macros/macro-expansion-tests.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-expansion-tests.stderr rename to src/test/ui/macros/macro-expansion-tests.stderr diff --git a/src/test/ui/compile-fail-migration/macro-follow.rs b/src/test/ui/macros/macro-follow.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-follow.rs rename to src/test/ui/macros/macro-follow.rs diff --git a/src/test/ui/compile-fail-migration/macro-follow.stderr b/src/test/ui/macros/macro-follow.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-follow.stderr rename to src/test/ui/macros/macro-follow.stderr diff --git a/src/test/ui/compile-fail-migration/macro-followed-by-seq-bad.rs b/src/test/ui/macros/macro-followed-by-seq-bad.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-followed-by-seq-bad.rs rename to src/test/ui/macros/macro-followed-by-seq-bad.rs diff --git a/src/test/ui/compile-fail-migration/macro-followed-by-seq-bad.stderr b/src/test/ui/macros/macro-followed-by-seq-bad.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-followed-by-seq-bad.stderr rename to src/test/ui/macros/macro-followed-by-seq-bad.stderr diff --git a/src/test/ui/compile-fail-migration/macro-inner-attributes.rs b/src/test/ui/macros/macro-inner-attributes.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-inner-attributes.rs rename to src/test/ui/macros/macro-inner-attributes.rs diff --git a/src/test/ui/compile-fail-migration/macro-inner-attributes.stderr b/src/test/ui/macros/macro-inner-attributes.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-inner-attributes.stderr rename to src/test/ui/macros/macro-inner-attributes.stderr diff --git a/src/test/ui/compile-fail-migration/macro-input-future-proofing.rs b/src/test/ui/macros/macro-input-future-proofing.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-input-future-proofing.rs rename to src/test/ui/macros/macro-input-future-proofing.rs diff --git a/src/test/ui/compile-fail-migration/macro-input-future-proofing.stderr b/src/test/ui/macros/macro-input-future-proofing.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-input-future-proofing.stderr rename to src/test/ui/macros/macro-input-future-proofing.stderr diff --git a/src/test/ui/macro-invalid-fragment-spec.rs b/src/test/ui/macros/macro-invalid-fragment-spec.rs similarity index 100% rename from src/test/ui/macro-invalid-fragment-spec.rs rename to src/test/ui/macros/macro-invalid-fragment-spec.rs diff --git a/src/test/ui/macro-invalid-fragment-spec.stderr b/src/test/ui/macros/macro-invalid-fragment-spec.stderr similarity index 100% rename from src/test/ui/macro-invalid-fragment-spec.stderr rename to src/test/ui/macros/macro-invalid-fragment-spec.stderr diff --git a/src/test/ui/compile-fail-migration/macro-local-data-key-priv.rs b/src/test/ui/macros/macro-local-data-key-priv.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-local-data-key-priv.rs rename to src/test/ui/macros/macro-local-data-key-priv.rs diff --git a/src/test/ui/compile-fail-migration/macro-local-data-key-priv.stderr b/src/test/ui/macros/macro-local-data-key-priv.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-local-data-key-priv.stderr rename to src/test/ui/macros/macro-local-data-key-priv.stderr diff --git a/src/test/ui/compile-fail-migration/macro-match-nonterminal.rs b/src/test/ui/macros/macro-match-nonterminal.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-match-nonterminal.rs rename to src/test/ui/macros/macro-match-nonterminal.rs diff --git a/src/test/ui/compile-fail-migration/macro-match-nonterminal.stderr b/src/test/ui/macros/macro-match-nonterminal.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-match-nonterminal.stderr rename to src/test/ui/macros/macro-match-nonterminal.stderr diff --git a/src/test/ui/compile-fail-migration/macro-missing-delimiters.rs b/src/test/ui/macros/macro-missing-delimiters.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-missing-delimiters.rs rename to src/test/ui/macros/macro-missing-delimiters.rs diff --git a/src/test/ui/compile-fail-migration/macro-missing-delimiters.stderr b/src/test/ui/macros/macro-missing-delimiters.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-missing-delimiters.stderr rename to src/test/ui/macros/macro-missing-delimiters.stderr diff --git a/src/test/ui/compile-fail-migration/macro-missing-fragment.rs b/src/test/ui/macros/macro-missing-fragment.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-missing-fragment.rs rename to src/test/ui/macros/macro-missing-fragment.rs diff --git a/src/test/ui/compile-fail-migration/macro-missing-fragment.stderr b/src/test/ui/macros/macro-missing-fragment.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-missing-fragment.stderr rename to src/test/ui/macros/macro-missing-fragment.stderr diff --git a/src/test/ui/compile-fail-migration/macro-non-lifetime.rs b/src/test/ui/macros/macro-non-lifetime.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-non-lifetime.rs rename to src/test/ui/macros/macro-non-lifetime.rs diff --git a/src/test/ui/compile-fail-migration/macro-non-lifetime.stderr b/src/test/ui/macros/macro-non-lifetime.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-non-lifetime.stderr rename to src/test/ui/macros/macro-non-lifetime.stderr diff --git a/src/test/ui/compile-fail-migration/macro-outer-attributes.rs b/src/test/ui/macros/macro-outer-attributes.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-outer-attributes.rs rename to src/test/ui/macros/macro-outer-attributes.rs diff --git a/src/test/ui/compile-fail-migration/macro-outer-attributes.stderr b/src/test/ui/macros/macro-outer-attributes.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-outer-attributes.stderr rename to src/test/ui/macros/macro-outer-attributes.stderr diff --git a/src/test/ui/compile-fail-migration/macro-parameter-span.rs b/src/test/ui/macros/macro-parameter-span.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-parameter-span.rs rename to src/test/ui/macros/macro-parameter-span.rs diff --git a/src/test/ui/compile-fail-migration/macro-parameter-span.stderr b/src/test/ui/macros/macro-parameter-span.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-parameter-span.stderr rename to src/test/ui/macros/macro-parameter-span.stderr diff --git a/src/test/ui/macro-path-prelude-fail-1.rs b/src/test/ui/macros/macro-path-prelude-fail-1.rs similarity index 100% rename from src/test/ui/macro-path-prelude-fail-1.rs rename to src/test/ui/macros/macro-path-prelude-fail-1.rs diff --git a/src/test/ui/macro-path-prelude-fail-1.stderr b/src/test/ui/macros/macro-path-prelude-fail-1.stderr similarity index 100% rename from src/test/ui/macro-path-prelude-fail-1.stderr rename to src/test/ui/macros/macro-path-prelude-fail-1.stderr diff --git a/src/test/ui/macro-path-prelude-fail-2.rs b/src/test/ui/macros/macro-path-prelude-fail-2.rs similarity index 100% rename from src/test/ui/macro-path-prelude-fail-2.rs rename to src/test/ui/macros/macro-path-prelude-fail-2.rs diff --git a/src/test/ui/macro-path-prelude-fail-2.stderr b/src/test/ui/macros/macro-path-prelude-fail-2.stderr similarity index 100% rename from src/test/ui/macro-path-prelude-fail-2.stderr rename to src/test/ui/macros/macro-path-prelude-fail-2.stderr diff --git a/src/test/ui/macro-path-prelude-fail-3.rs b/src/test/ui/macros/macro-path-prelude-fail-3.rs similarity index 100% rename from src/test/ui/macro-path-prelude-fail-3.rs rename to src/test/ui/macros/macro-path-prelude-fail-3.rs diff --git a/src/test/ui/macro-path-prelude-fail-3.stderr b/src/test/ui/macros/macro-path-prelude-fail-3.stderr similarity index 100% rename from src/test/ui/macro-path-prelude-fail-3.stderr rename to src/test/ui/macros/macro-path-prelude-fail-3.stderr diff --git a/src/test/ui/macro-path-prelude-pass.rs b/src/test/ui/macros/macro-path-prelude-pass.rs similarity index 100% rename from src/test/ui/macro-path-prelude-pass.rs rename to src/test/ui/macros/macro-path-prelude-pass.rs diff --git a/src/test/ui/macro-path-prelude-shadowing.rs b/src/test/ui/macros/macro-path-prelude-shadowing.rs similarity index 100% rename from src/test/ui/macro-path-prelude-shadowing.rs rename to src/test/ui/macros/macro-path-prelude-shadowing.rs diff --git a/src/test/ui/macro-path-prelude-shadowing.stderr b/src/test/ui/macros/macro-path-prelude-shadowing.stderr similarity index 100% rename from src/test/ui/macro-path-prelude-shadowing.stderr rename to src/test/ui/macros/macro-path-prelude-shadowing.stderr diff --git a/src/test/ui/macro-reexport-removed.rs b/src/test/ui/macros/macro-reexport-removed.rs similarity index 100% rename from src/test/ui/macro-reexport-removed.rs rename to src/test/ui/macros/macro-reexport-removed.rs diff --git a/src/test/ui/macro-reexport-removed.stderr b/src/test/ui/macros/macro-reexport-removed.stderr similarity index 100% rename from src/test/ui/macro-reexport-removed.stderr rename to src/test/ui/macros/macro-reexport-removed.stderr diff --git a/src/test/ui/macro-shadowing.rs b/src/test/ui/macros/macro-shadowing.rs similarity index 100% rename from src/test/ui/macro-shadowing.rs rename to src/test/ui/macros/macro-shadowing.rs diff --git a/src/test/ui/macro-shadowing.stderr b/src/test/ui/macros/macro-shadowing.stderr similarity index 100% rename from src/test/ui/macro-shadowing.stderr rename to src/test/ui/macros/macro-shadowing.stderr diff --git a/src/test/ui/compile-fail-migration/macro-stability.rs b/src/test/ui/macros/macro-stability.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-stability.rs rename to src/test/ui/macros/macro-stability.rs diff --git a/src/test/ui/compile-fail-migration/macro-stability.stderr b/src/test/ui/macros/macro-stability.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-stability.stderr rename to src/test/ui/macros/macro-stability.stderr diff --git a/src/test/ui/compile-fail-migration/macro-stmt-matchers.rs b/src/test/ui/macros/macro-stmt-matchers.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-stmt-matchers.rs rename to src/test/ui/macros/macro-stmt-matchers.rs diff --git a/src/test/ui/compile-fail-migration/macro-stmt-matchers.stderr b/src/test/ui/macros/macro-stmt-matchers.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-stmt-matchers.stderr rename to src/test/ui/macros/macro-stmt-matchers.stderr diff --git a/src/test/ui/compile-fail-migration/macro-tt-matchers.rs b/src/test/ui/macros/macro-tt-matchers.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-tt-matchers.rs rename to src/test/ui/macros/macro-tt-matchers.rs diff --git a/src/test/ui/compile-fail-migration/macro-tt-matchers.stderr b/src/test/ui/macros/macro-tt-matchers.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-tt-matchers.stderr rename to src/test/ui/macros/macro-tt-matchers.stderr diff --git a/src/test/ui/compile-fail-migration/macro-use-bad-args-1.rs b/src/test/ui/macros/macro-use-bad-args-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-use-bad-args-1.rs rename to src/test/ui/macros/macro-use-bad-args-1.rs diff --git a/src/test/ui/compile-fail-migration/macro-use-bad-args-1.stderr b/src/test/ui/macros/macro-use-bad-args-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-use-bad-args-1.stderr rename to src/test/ui/macros/macro-use-bad-args-1.stderr diff --git a/src/test/ui/compile-fail-migration/macro-use-bad-args-2.rs b/src/test/ui/macros/macro-use-bad-args-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-use-bad-args-2.rs rename to src/test/ui/macros/macro-use-bad-args-2.rs diff --git a/src/test/ui/compile-fail-migration/macro-use-bad-args-2.stderr b/src/test/ui/macros/macro-use-bad-args-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-use-bad-args-2.stderr rename to src/test/ui/macros/macro-use-bad-args-2.stderr diff --git a/src/test/ui/compile-fail-migration/macro-use-scope.rs b/src/test/ui/macros/macro-use-scope.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-use-scope.rs rename to src/test/ui/macros/macro-use-scope.rs diff --git a/src/test/ui/compile-fail-migration/macro-use-scope.stderr b/src/test/ui/macros/macro-use-scope.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-use-scope.stderr rename to src/test/ui/macros/macro-use-scope.stderr diff --git a/src/test/ui/compile-fail-migration/macro-use-undef.rs b/src/test/ui/macros/macro-use-undef.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-use-undef.rs rename to src/test/ui/macros/macro-use-undef.rs diff --git a/src/test/ui/compile-fail-migration/macro-use-undef.stderr b/src/test/ui/macros/macro-use-undef.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-use-undef.stderr rename to src/test/ui/macros/macro-use-undef.stderr diff --git a/src/test/ui/compile-fail-migration/macro-use-wrong-name.rs b/src/test/ui/macros/macro-use-wrong-name.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-use-wrong-name.rs rename to src/test/ui/macros/macro-use-wrong-name.rs diff --git a/src/test/ui/compile-fail-migration/macro-use-wrong-name.stderr b/src/test/ui/macros/macro-use-wrong-name.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macro-use-wrong-name.stderr rename to src/test/ui/macros/macro-use-wrong-name.stderr diff --git a/src/test/ui/compile-fail-migration/macro-with-seps-err-msg.rs b/src/test/ui/macros/macro-with-seps-err-msg.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macro-with-seps-err-msg.rs rename to src/test/ui/macros/macro-with-seps-err-msg.rs diff --git a/src/test/ui/macros/macro-with-seps-err-msg.stderr b/src/test/ui/macros/macro-with-seps-err-msg.stderr new file mode 100644 index 00000000000..0b6d186b236 --- /dev/null +++ b/src/test/ui/macros/macro-with-seps-err-msg.stderr @@ -0,0 +1,11 @@ +error[E0658]: non-ident macro paths are experimental (see issue #35896) + --> $DIR/macro-with-seps-err-msg.rs:14:5 + | +LL | globnar::brotz!(); //~ ERROR non-ident macro paths are experimental + | ^^^^^^^^^^^^^^ + | + = help: add #![feature(use_extern_macros)] to the crate attributes to enable + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0658`. diff --git a/src/test/ui/compile-fail-migration/macros-in-extern.rs b/src/test/ui/macros/macros-in-extern.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macros-in-extern.rs rename to src/test/ui/macros/macros-in-extern.rs diff --git a/src/test/ui/compile-fail-migration/macros-in-extern.stderr b/src/test/ui/macros/macros-in-extern.stderr similarity index 70% rename from src/test/ui/compile-fail-migration/macros-in-extern.stderr rename to src/test/ui/macros/macros-in-extern.stderr index ffac282040c..60492d34451 100644 --- a/src/test/ui/compile-fail-migration/macros-in-extern.stderr +++ b/src/test/ui/macros/macros-in-extern.stderr @@ -1,4 +1,4 @@ -error[E0658]: macro and proc-macro invocations in `extern {}` blocks are experimental. (see issue #49476) +error[E0658]: macro invocations in `extern {}` blocks are experimental (see issue #49476) --> $DIR/macros-in-extern.rs:36:5 | LL | returns_isize!(rust_get_test_int); @@ -6,7 +6,7 @@ LL | returns_isize!(rust_get_test_int); | = help: add #![feature(macros_in_extern)] to the crate attributes to enable -error[E0658]: macro and proc-macro invocations in `extern {}` blocks are experimental. (see issue #49476) +error[E0658]: macro invocations in `extern {}` blocks are experimental (see issue #49476) --> $DIR/macros-in-extern.rs:38:5 | LL | takes_u32_returns_u32!(rust_dbg_extern_identity_u32); @@ -14,7 +14,7 @@ LL | takes_u32_returns_u32!(rust_dbg_extern_identity_u32); | = help: add #![feature(macros_in_extern)] to the crate attributes to enable -error[E0658]: macro and proc-macro invocations in `extern {}` blocks are experimental. (see issue #49476) +error[E0658]: macro invocations in `extern {}` blocks are experimental (see issue #49476) --> $DIR/macros-in-extern.rs:40:5 | LL | emits_nothing!(); diff --git a/src/test/ui/compile-fail-migration/macros-nonfatal-errors.rs b/src/test/ui/macros/macros-nonfatal-errors.rs similarity index 100% rename from src/test/ui/compile-fail-migration/macros-nonfatal-errors.rs rename to src/test/ui/macros/macros-nonfatal-errors.rs diff --git a/src/test/ui/compile-fail-migration/macros-nonfatal-errors.stderr b/src/test/ui/macros/macros-nonfatal-errors.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/macros-nonfatal-errors.stderr rename to src/test/ui/macros/macros-nonfatal-errors.stderr diff --git a/src/test/ui/compile-fail-migration/main-wrong-type.rs b/src/test/ui/main-wrong-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/main-wrong-type.rs rename to src/test/ui/main-wrong-type.rs diff --git a/src/test/ui/compile-fail-migration/main-wrong-type.stderr b/src/test/ui/main-wrong-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/main-wrong-type.stderr rename to src/test/ui/main-wrong-type.stderr diff --git a/src/test/ui/compile-fail-migration/malformed-derive-entry.rs b/src/test/ui/malformed/malformed-derive-entry.rs similarity index 100% rename from src/test/ui/compile-fail-migration/malformed-derive-entry.rs rename to src/test/ui/malformed/malformed-derive-entry.rs diff --git a/src/test/ui/compile-fail-migration/malformed-derive-entry.stderr b/src/test/ui/malformed/malformed-derive-entry.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/malformed-derive-entry.stderr rename to src/test/ui/malformed/malformed-derive-entry.stderr diff --git a/src/test/ui/compile-fail-migration/malformed-plugin-1.rs b/src/test/ui/malformed/malformed-plugin-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/malformed-plugin-1.rs rename to src/test/ui/malformed/malformed-plugin-1.rs diff --git a/src/test/ui/compile-fail-migration/malformed-plugin-1.stderr b/src/test/ui/malformed/malformed-plugin-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/malformed-plugin-1.stderr rename to src/test/ui/malformed/malformed-plugin-1.stderr diff --git a/src/test/ui/compile-fail-migration/malformed-plugin-2.rs b/src/test/ui/malformed/malformed-plugin-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/malformed-plugin-2.rs rename to src/test/ui/malformed/malformed-plugin-2.rs diff --git a/src/test/ui/compile-fail-migration/malformed-plugin-2.stderr b/src/test/ui/malformed/malformed-plugin-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/malformed-plugin-2.stderr rename to src/test/ui/malformed/malformed-plugin-2.stderr diff --git a/src/test/ui/compile-fail-migration/malformed-plugin-3.rs b/src/test/ui/malformed/malformed-plugin-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/malformed-plugin-3.rs rename to src/test/ui/malformed/malformed-plugin-3.rs diff --git a/src/test/ui/compile-fail-migration/malformed-plugin-3.stderr b/src/test/ui/malformed/malformed-plugin-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/malformed-plugin-3.stderr rename to src/test/ui/malformed/malformed-plugin-3.stderr diff --git a/src/test/ui/compile-fail-migration/malformed_macro_lhs.rs b/src/test/ui/malformed_macro_lhs.rs similarity index 100% rename from src/test/ui/compile-fail-migration/malformed_macro_lhs.rs rename to src/test/ui/malformed_macro_lhs.rs diff --git a/src/test/ui/compile-fail-migration/malformed_macro_lhs.stderr b/src/test/ui/malformed_macro_lhs.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/malformed_macro_lhs.stderr rename to src/test/ui/malformed_macro_lhs.stderr diff --git a/src/test/ui/compile-fail-migration/manual-link-bad-form.rs b/src/test/ui/manual/manual-link-bad-form.rs similarity index 100% rename from src/test/ui/compile-fail-migration/manual-link-bad-form.rs rename to src/test/ui/manual/manual-link-bad-form.rs diff --git a/src/test/ui/compile-fail-migration/manual-link-bad-form.stderr b/src/test/ui/manual/manual-link-bad-form.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/manual-link-bad-form.stderr rename to src/test/ui/manual/manual-link-bad-form.stderr diff --git a/src/test/ui/compile-fail-migration/manual-link-bad-kind.rs b/src/test/ui/manual/manual-link-bad-kind.rs similarity index 100% rename from src/test/ui/compile-fail-migration/manual-link-bad-kind.rs rename to src/test/ui/manual/manual-link-bad-kind.rs diff --git a/src/test/ui/compile-fail-migration/manual-link-bad-kind.stderr b/src/test/ui/manual/manual-link-bad-kind.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/manual-link-bad-kind.stderr rename to src/test/ui/manual/manual-link-bad-kind.stderr diff --git a/src/test/ui/compile-fail-migration/manual-link-bad-search-path.rs b/src/test/ui/manual/manual-link-bad-search-path.rs similarity index 100% rename from src/test/ui/compile-fail-migration/manual-link-bad-search-path.rs rename to src/test/ui/manual/manual-link-bad-search-path.rs diff --git a/src/test/ui/compile-fail-migration/manual-link-bad-search-path.stderr b/src/test/ui/manual/manual-link-bad-search-path.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/manual-link-bad-search-path.stderr rename to src/test/ui/manual/manual-link-bad-search-path.stderr diff --git a/src/test/ui/compile-fail-migration/manual-link-framework.rs b/src/test/ui/manual/manual-link-framework.rs similarity index 100% rename from src/test/ui/compile-fail-migration/manual-link-framework.rs rename to src/test/ui/manual/manual-link-framework.rs diff --git a/src/test/ui/compile-fail-migration/manual-link-framework.stderr b/src/test/ui/manual/manual-link-framework.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/manual-link-framework.stderr rename to src/test/ui/manual/manual-link-framework.stderr diff --git a/src/test/ui/compile-fail-migration/map-types.rs b/src/test/ui/map-types.rs similarity index 100% rename from src/test/ui/compile-fail-migration/map-types.rs rename to src/test/ui/map-types.rs diff --git a/src/test/ui/compile-fail-migration/map-types.stderr b/src/test/ui/map-types.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/map-types.stderr rename to src/test/ui/map-types.stderr diff --git a/src/test/ui/compile-fail-migration/match-argm-statics-2.rs b/src/test/ui/match/match-argm-statics-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-argm-statics-2.rs rename to src/test/ui/match/match-argm-statics-2.rs diff --git a/src/test/ui/compile-fail-migration/match-argm-statics-2.stderr b/src/test/ui/match/match-argm-statics-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-argm-statics-2.stderr rename to src/test/ui/match/match-argm-statics-2.stderr diff --git a/src/test/ui/compile-fail-migration/match-arm-statics.rs b/src/test/ui/match/match-arm-statics.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-arm-statics.rs rename to src/test/ui/match/match-arm-statics.rs diff --git a/src/test/ui/compile-fail-migration/match-arm-statics.stderr b/src/test/ui/match/match-arm-statics.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-arm-statics.stderr rename to src/test/ui/match/match-arm-statics.stderr diff --git a/src/test/ui/compile-fail-migration/match-byte-array-patterns-2.rs b/src/test/ui/match/match-byte-array-patterns-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-byte-array-patterns-2.rs rename to src/test/ui/match/match-byte-array-patterns-2.rs diff --git a/src/test/ui/compile-fail-migration/match-byte-array-patterns-2.stderr b/src/test/ui/match/match-byte-array-patterns-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-byte-array-patterns-2.stderr rename to src/test/ui/match/match-byte-array-patterns-2.stderr diff --git a/src/test/ui/compile-fail-migration/match-byte-array-patterns.rs b/src/test/ui/match/match-byte-array-patterns.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-byte-array-patterns.rs rename to src/test/ui/match/match-byte-array-patterns.rs diff --git a/src/test/ui/compile-fail-migration/match-byte-array-patterns.stderr b/src/test/ui/match/match-byte-array-patterns.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-byte-array-patterns.stderr rename to src/test/ui/match/match-byte-array-patterns.stderr diff --git a/src/test/ui/compile-fail-migration/match-ill-type2.rs b/src/test/ui/match/match-ill-type2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-ill-type2.rs rename to src/test/ui/match/match-ill-type2.rs diff --git a/src/test/ui/compile-fail-migration/match-ill-type2.stderr b/src/test/ui/match/match-ill-type2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-ill-type2.stderr rename to src/test/ui/match/match-ill-type2.stderr diff --git a/src/test/ui/compile-fail-migration/match-join.rs b/src/test/ui/match/match-join.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-join.rs rename to src/test/ui/match/match-join.rs diff --git a/src/test/ui/compile-fail-migration/match-join.stderr b/src/test/ui/match/match-join.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-join.stderr rename to src/test/ui/match/match-join.stderr diff --git a/src/test/ui/compile-fail-migration/match-no-arms-unreachable-after.rs b/src/test/ui/match/match-no-arms-unreachable-after.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-no-arms-unreachable-after.rs rename to src/test/ui/match/match-no-arms-unreachable-after.rs diff --git a/src/test/ui/compile-fail-migration/match-no-arms-unreachable-after.stderr b/src/test/ui/match/match-no-arms-unreachable-after.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-no-arms-unreachable-after.stderr rename to src/test/ui/match/match-no-arms-unreachable-after.stderr diff --git a/src/test/ui/compile-fail-migration/match-non-exhaustive.rs b/src/test/ui/match/match-non-exhaustive.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-non-exhaustive.rs rename to src/test/ui/match/match-non-exhaustive.rs diff --git a/src/test/ui/compile-fail-migration/match-non-exhaustive.stderr b/src/test/ui/match/match-non-exhaustive.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-non-exhaustive.stderr rename to src/test/ui/match/match-non-exhaustive.stderr diff --git a/src/test/ui/compile-fail-migration/match-pattern-field-mismatch-2.rs b/src/test/ui/match/match-pattern-field-mismatch-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-pattern-field-mismatch-2.rs rename to src/test/ui/match/match-pattern-field-mismatch-2.rs diff --git a/src/test/ui/compile-fail-migration/match-pattern-field-mismatch-2.stderr b/src/test/ui/match/match-pattern-field-mismatch-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-pattern-field-mismatch-2.stderr rename to src/test/ui/match/match-pattern-field-mismatch-2.stderr diff --git a/src/test/ui/compile-fail-migration/match-pattern-field-mismatch.rs b/src/test/ui/match/match-pattern-field-mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-pattern-field-mismatch.rs rename to src/test/ui/match/match-pattern-field-mismatch.rs diff --git a/src/test/ui/compile-fail-migration/match-pattern-field-mismatch.stderr b/src/test/ui/match/match-pattern-field-mismatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-pattern-field-mismatch.stderr rename to src/test/ui/match/match-pattern-field-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/match-privately-empty.rs b/src/test/ui/match/match-privately-empty.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-privately-empty.rs rename to src/test/ui/match/match-privately-empty.rs diff --git a/src/test/ui/compile-fail-migration/match-privately-empty.stderr b/src/test/ui/match/match-privately-empty.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-privately-empty.stderr rename to src/test/ui/match/match-privately-empty.stderr diff --git a/src/test/ui/compile-fail-migration/match-range-fail-2.rs b/src/test/ui/match/match-range-fail-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-range-fail-2.rs rename to src/test/ui/match/match-range-fail-2.rs diff --git a/src/test/ui/compile-fail-migration/match-range-fail-2.stderr b/src/test/ui/match/match-range-fail-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-range-fail-2.stderr rename to src/test/ui/match/match-range-fail-2.stderr diff --git a/src/test/ui/compile-fail-migration/match-range-fail-dominate.rs b/src/test/ui/match/match-range-fail-dominate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-range-fail-dominate.rs rename to src/test/ui/match/match-range-fail-dominate.rs diff --git a/src/test/ui/compile-fail-migration/match-range-fail-dominate.stderr b/src/test/ui/match/match-range-fail-dominate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-range-fail-dominate.stderr rename to src/test/ui/match/match-range-fail-dominate.stderr diff --git a/src/test/ui/compile-fail-migration/match-range-fail.rs b/src/test/ui/match/match-range-fail.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-range-fail.rs rename to src/test/ui/match/match-range-fail.rs diff --git a/src/test/ui/compile-fail-migration/match-range-fail.stderr b/src/test/ui/match/match-range-fail.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-range-fail.stderr rename to src/test/ui/match/match-range-fail.stderr diff --git a/src/test/ui/compile-fail-migration/match-ref-ice.rs b/src/test/ui/match/match-ref-ice.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-ref-ice.rs rename to src/test/ui/match/match-ref-ice.rs diff --git a/src/test/ui/compile-fail-migration/match-ref-ice.stderr b/src/test/ui/match/match-ref-ice.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-ref-ice.stderr rename to src/test/ui/match/match-ref-ice.stderr diff --git a/src/test/ui/compile-fail-migration/match-ref-mut-invariance.nll.stderr b/src/test/ui/match/match-ref-mut-invariance.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-ref-mut-invariance.nll.stderr rename to src/test/ui/match/match-ref-mut-invariance.nll.stderr diff --git a/src/test/ui/compile-fail-migration/match-ref-mut-invariance.rs b/src/test/ui/match/match-ref-mut-invariance.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-ref-mut-invariance.rs rename to src/test/ui/match/match-ref-mut-invariance.rs diff --git a/src/test/ui/compile-fail-migration/match-ref-mut-invariance.stderr b/src/test/ui/match/match-ref-mut-invariance.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-ref-mut-invariance.stderr rename to src/test/ui/match/match-ref-mut-invariance.stderr diff --git a/src/test/ui/compile-fail-migration/match-ref-mut-let-invariance.nll.stderr b/src/test/ui/match/match-ref-mut-let-invariance.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-ref-mut-let-invariance.nll.stderr rename to src/test/ui/match/match-ref-mut-let-invariance.nll.stderr diff --git a/src/test/ui/compile-fail-migration/match-ref-mut-let-invariance.rs b/src/test/ui/match/match-ref-mut-let-invariance.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-ref-mut-let-invariance.rs rename to src/test/ui/match/match-ref-mut-let-invariance.rs diff --git a/src/test/ui/compile-fail-migration/match-ref-mut-let-invariance.stderr b/src/test/ui/match/match-ref-mut-let-invariance.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-ref-mut-let-invariance.stderr rename to src/test/ui/match/match-ref-mut-let-invariance.stderr diff --git a/src/test/ui/compile-fail-migration/match-slice-patterns.rs b/src/test/ui/match/match-slice-patterns.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-slice-patterns.rs rename to src/test/ui/match/match-slice-patterns.rs diff --git a/src/test/ui/compile-fail-migration/match-slice-patterns.stderr b/src/test/ui/match/match-slice-patterns.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-slice-patterns.stderr rename to src/test/ui/match/match-slice-patterns.stderr diff --git a/src/test/ui/compile-fail-migration/match-static-const-lc.rs b/src/test/ui/match/match-static-const-lc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-static-const-lc.rs rename to src/test/ui/match/match-static-const-lc.rs diff --git a/src/test/ui/compile-fail-migration/match-static-const-lc.stderr b/src/test/ui/match/match-static-const-lc.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-static-const-lc.stderr rename to src/test/ui/match/match-static-const-lc.stderr diff --git a/src/test/ui/compile-fail-migration/match-struct.rs b/src/test/ui/match/match-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-struct.rs rename to src/test/ui/match/match-struct.rs diff --git a/src/test/ui/compile-fail-migration/match-struct.stderr b/src/test/ui/match/match-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-struct.stderr rename to src/test/ui/match/match-struct.stderr diff --git a/src/test/ui/compile-fail-migration/match-tag-nullary.rs b/src/test/ui/match/match-tag-nullary.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-tag-nullary.rs rename to src/test/ui/match/match-tag-nullary.rs diff --git a/src/test/ui/compile-fail-migration/match-tag-nullary.stderr b/src/test/ui/match/match-tag-nullary.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-tag-nullary.stderr rename to src/test/ui/match/match-tag-nullary.stderr diff --git a/src/test/ui/compile-fail-migration/match-tag-unary.rs b/src/test/ui/match/match-tag-unary.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-tag-unary.rs rename to src/test/ui/match/match-tag-unary.rs diff --git a/src/test/ui/compile-fail-migration/match-tag-unary.stderr b/src/test/ui/match/match-tag-unary.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-tag-unary.stderr rename to src/test/ui/match/match-tag-unary.stderr diff --git a/src/test/ui/compile-fail-migration/match-unreachable-warning-with-diverging-discrim.rs b/src/test/ui/match/match-unreachable-warning-with-diverging-discrim.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-unreachable-warning-with-diverging-discrim.rs rename to src/test/ui/match/match-unreachable-warning-with-diverging-discrim.rs diff --git a/src/test/ui/compile-fail-migration/match-unreachable-warning-with-diverging-discrim.stderr b/src/test/ui/match/match-unreachable-warning-with-diverging-discrim.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-unreachable-warning-with-diverging-discrim.stderr rename to src/test/ui/match/match-unreachable-warning-with-diverging-discrim.stderr diff --git a/src/test/ui/compile-fail-migration/match-unresolved-one-arm.rs b/src/test/ui/match/match-unresolved-one-arm.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-unresolved-one-arm.rs rename to src/test/ui/match/match-unresolved-one-arm.rs diff --git a/src/test/ui/compile-fail-migration/match-unresolved-one-arm.stderr b/src/test/ui/match/match-unresolved-one-arm.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-unresolved-one-arm.stderr rename to src/test/ui/match/match-unresolved-one-arm.stderr diff --git a/src/test/ui/compile-fail-migration/match-vec-fixed.rs b/src/test/ui/match/match-vec-fixed.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-vec-fixed.rs rename to src/test/ui/match/match-vec-fixed.rs diff --git a/src/test/ui/compile-fail-migration/match-vec-fixed.stderr b/src/test/ui/match/match-vec-fixed.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-vec-fixed.stderr rename to src/test/ui/match/match-vec-fixed.stderr diff --git a/src/test/ui/compile-fail-migration/match-vec-mismatch-2.rs b/src/test/ui/match/match-vec-mismatch-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-vec-mismatch-2.rs rename to src/test/ui/match/match-vec-mismatch-2.rs diff --git a/src/test/ui/compile-fail-migration/match-vec-mismatch-2.stderr b/src/test/ui/match/match-vec-mismatch-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-vec-mismatch-2.stderr rename to src/test/ui/match/match-vec-mismatch-2.stderr diff --git a/src/test/ui/compile-fail-migration/match-vec-mismatch.rs b/src/test/ui/match/match-vec-mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-vec-mismatch.rs rename to src/test/ui/match/match-vec-mismatch.rs diff --git a/src/test/ui/compile-fail-migration/match-vec-mismatch.stderr b/src/test/ui/match/match-vec-mismatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-vec-mismatch.stderr rename to src/test/ui/match/match-vec-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/match-vec-unreachable.rs b/src/test/ui/match/match-vec-unreachable.rs similarity index 100% rename from src/test/ui/compile-fail-migration/match-vec-unreachable.rs rename to src/test/ui/match/match-vec-unreachable.rs diff --git a/src/test/ui/compile-fail-migration/match-vec-unreachable.stderr b/src/test/ui/match/match-vec-unreachable.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/match-vec-unreachable.stderr rename to src/test/ui/match/match-vec-unreachable.stderr diff --git a/src/test/ui/compile-fail-migration/maybe-bounds-where-cpass.rs b/src/test/ui/maybe-bounds-where-cpass.rs similarity index 100% rename from src/test/ui/compile-fail-migration/maybe-bounds-where-cpass.rs rename to src/test/ui/maybe-bounds-where-cpass.rs diff --git a/src/test/ui/compile-fail-migration/maybe-bounds-where-cpass.stderr b/src/test/ui/maybe-bounds-where-cpass.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/maybe-bounds-where-cpass.stderr rename to src/test/ui/maybe-bounds-where-cpass.stderr diff --git a/src/test/ui/compile-fail-migration/maybe-bounds-where.rs b/src/test/ui/maybe-bounds-where.rs similarity index 100% rename from src/test/ui/compile-fail-migration/maybe-bounds-where.rs rename to src/test/ui/maybe-bounds-where.rs diff --git a/src/test/ui/compile-fail-migration/maybe-bounds-where.stderr b/src/test/ui/maybe-bounds-where.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/maybe-bounds-where.stderr rename to src/test/ui/maybe-bounds-where.stderr diff --git a/src/test/ui/compile-fail-migration/meta-expected-error-correct-rev.a.stderr b/src/test/ui/meta-expected-error-correct-rev.a.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/meta-expected-error-correct-rev.a.stderr rename to src/test/ui/meta-expected-error-correct-rev.a.stderr diff --git a/src/test/ui/compile-fail-migration/meta-expected-error-correct-rev.rs b/src/test/ui/meta-expected-error-correct-rev.rs similarity index 100% rename from src/test/ui/compile-fail-migration/meta-expected-error-correct-rev.rs rename to src/test/ui/meta-expected-error-correct-rev.rs diff --git a/src/test/ui/compile-fail-migration/meta-expected-error-wrong-rev.a.stderr b/src/test/ui/meta-expected-error-wrong-rev.a.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/meta-expected-error-wrong-rev.a.stderr rename to src/test/ui/meta-expected-error-wrong-rev.a.stderr diff --git a/src/test/ui/compile-fail-migration/meta-expected-error-wrong-rev.rs b/src/test/ui/meta-expected-error-wrong-rev.rs similarity index 100% rename from src/test/ui/compile-fail-migration/meta-expected-error-wrong-rev.rs rename to src/test/ui/meta-expected-error-wrong-rev.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/ambig_impl_2_lib.rs b/src/test/ui/methods/auxiliary/ambig_impl_2_lib.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/ambig_impl_2_lib.rs rename to src/test/ui/methods/auxiliary/ambig_impl_2_lib.rs diff --git a/src/test/ui/methods/auxiliary/macro-in-other-crate.rs b/src/test/ui/methods/auxiliary/macro-in-other-crate.rs new file mode 100644 index 00000000000..c787cedc2d0 --- /dev/null +++ b/src/test/ui/methods/auxiliary/macro-in-other-crate.rs @@ -0,0 +1,19 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#[macro_export] +macro_rules! mac { + ($ident:ident) => { let $ident = 42; } +} + +#[macro_export] +macro_rules! inline { + () => () +} diff --git a/src/test/ui/compile-fail-migration/method-ambig-one-trait-unknown-int-type.rs b/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/method-ambig-one-trait-unknown-int-type.rs rename to src/test/ui/methods/method-ambig-one-trait-unknown-int-type.rs diff --git a/src/test/ui/compile-fail-migration/method-ambig-one-trait-unknown-int-type.stderr b/src/test/ui/methods/method-ambig-one-trait-unknown-int-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/method-ambig-one-trait-unknown-int-type.stderr rename to src/test/ui/methods/method-ambig-one-trait-unknown-int-type.stderr diff --git a/src/test/ui/compile-fail-migration/method-ambig-two-traits-cross-crate.rs b/src/test/ui/methods/method-ambig-two-traits-cross-crate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/method-ambig-two-traits-cross-crate.rs rename to src/test/ui/methods/method-ambig-two-traits-cross-crate.rs diff --git a/src/test/ui/compile-fail-migration/method-ambig-two-traits-cross-crate.stderr b/src/test/ui/methods/method-ambig-two-traits-cross-crate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/method-ambig-two-traits-cross-crate.stderr rename to src/test/ui/methods/method-ambig-two-traits-cross-crate.stderr diff --git a/src/test/ui/compile-fail-migration/method-ambig-two-traits-from-bounds.rs b/src/test/ui/methods/method-ambig-two-traits-from-bounds.rs similarity index 100% rename from src/test/ui/compile-fail-migration/method-ambig-two-traits-from-bounds.rs rename to src/test/ui/methods/method-ambig-two-traits-from-bounds.rs diff --git a/src/test/ui/compile-fail-migration/method-ambig-two-traits-from-bounds.stderr b/src/test/ui/methods/method-ambig-two-traits-from-bounds.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/method-ambig-two-traits-from-bounds.stderr rename to src/test/ui/methods/method-ambig-two-traits-from-bounds.stderr diff --git a/src/test/ui/compile-fail-migration/method-ambig-two-traits-with-default-method.rs b/src/test/ui/methods/method-ambig-two-traits-with-default-method.rs similarity index 100% rename from src/test/ui/compile-fail-migration/method-ambig-two-traits-with-default-method.rs rename to src/test/ui/methods/method-ambig-two-traits-with-default-method.rs diff --git a/src/test/ui/compile-fail-migration/method-ambig-two-traits-with-default-method.stderr b/src/test/ui/methods/method-ambig-two-traits-with-default-method.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/method-ambig-two-traits-with-default-method.stderr rename to src/test/ui/methods/method-ambig-two-traits-with-default-method.stderr diff --git a/src/test/ui/method-call-err-msg.rs b/src/test/ui/methods/method-call-err-msg.rs similarity index 100% rename from src/test/ui/method-call-err-msg.rs rename to src/test/ui/methods/method-call-err-msg.rs diff --git a/src/test/ui/method-call-err-msg.stderr b/src/test/ui/methods/method-call-err-msg.stderr similarity index 100% rename from src/test/ui/method-call-err-msg.stderr rename to src/test/ui/methods/method-call-err-msg.stderr diff --git a/src/test/ui/compile-fail-migration/method-call-lifetime-args.rs b/src/test/ui/methods/method-call-lifetime-args-fail.rs similarity index 100% rename from src/test/ui/compile-fail-migration/method-call-lifetime-args.rs rename to src/test/ui/methods/method-call-lifetime-args-fail.rs diff --git a/src/test/ui/compile-fail-migration/method-call-lifetime-args.stderr b/src/test/ui/methods/method-call-lifetime-args-fail.stderr similarity index 79% rename from src/test/ui/compile-fail-migration/method-call-lifetime-args.stderr rename to src/test/ui/methods/method-call-lifetime-args-fail.stderr index 736dba9061e..3814f4b5065 100644 --- a/src/test/ui/compile-fail-migration/method-call-lifetime-args.stderr +++ b/src/test/ui/methods/method-call-lifetime-args-fail.stderr @@ -1,191 +1,191 @@ error[E0090]: too few lifetime parameters provided: expected 2 lifetime parameters, found 1 lifetime parameter - --> $DIR/method-call-lifetime-args.rs:26:7 + --> $DIR/method-call-lifetime-args-fail.rs:26:7 | LL | S.early::<'static>(); | ^^^^^ expected 2 lifetime parameters error[E0088]: too many lifetime parameters provided: expected at most 2 lifetime parameters, found 3 lifetime parameters - --> $DIR/method-call-lifetime-args.rs:28:33 + --> $DIR/method-call-lifetime-args-fail.rs:28:33 | LL | S.early::<'static, 'static, 'static>(); | ^^^^^^^ expected 2 lifetime parameters error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args.rs:37:15 + --> $DIR/method-call-lifetime-args-fail.rs:37:15 | LL | S::late::<'static>(S, &0, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args.rs:14:13 + --> $DIR/method-call-lifetime-args-fail.rs:14:13 | LL | fn late<'a, 'b>(self, _: &'a u8, _: &'b u8) {} | ^^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args.rs:39:15 + --> $DIR/method-call-lifetime-args-fail.rs:39:15 | LL | S::late::<'static, 'static>(S, &0, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args.rs:14:13 + --> $DIR/method-call-lifetime-args-fail.rs:14:13 | LL | fn late<'a, 'b>(self, _: &'a u8, _: &'b u8) {} | ^^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args.rs:41:15 + --> $DIR/method-call-lifetime-args-fail.rs:41:15 | LL | S::late::<'static, 'static, 'static>(S, &0, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args.rs:14:13 + --> $DIR/method-call-lifetime-args-fail.rs:14:13 | LL | fn late<'a, 'b>(self, _: &'a u8, _: &'b u8) {} | ^^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args.rs:44:21 + --> $DIR/method-call-lifetime-args-fail.rs:44:21 | LL | S::late_early::<'static, 'static>(S, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args.rs:17:19 + --> $DIR/method-call-lifetime-args-fail.rs:17:19 | LL | fn late_early<'a, 'b>(self, _: &'a u8) -> &'b u8 { loop {} } | ^^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args.rs:46:21 + --> $DIR/method-call-lifetime-args-fail.rs:46:21 | LL | S::late_early::<'static, 'static, 'static>(S, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args.rs:17:19 + --> $DIR/method-call-lifetime-args-fail.rs:17:19 | LL | fn late_early<'a, 'b>(self, _: &'a u8) -> &'b u8 { loop {} } | ^^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args.rs:50:24 + --> $DIR/method-call-lifetime-args-fail.rs:50:24 | LL | S::late_implicit::<'static>(S, &0, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args.rs:15:31 + --> $DIR/method-call-lifetime-args-fail.rs:15:31 | LL | fn late_implicit(self, _: &u8, _: &u8) {} | ^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args.rs:52:24 + --> $DIR/method-call-lifetime-args-fail.rs:52:24 | LL | S::late_implicit::<'static, 'static>(S, &0, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args.rs:15:31 + --> $DIR/method-call-lifetime-args-fail.rs:15:31 | LL | fn late_implicit(self, _: &u8, _: &u8) {} | ^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args.rs:54:24 + --> $DIR/method-call-lifetime-args-fail.rs:54:24 | LL | S::late_implicit::<'static, 'static, 'static>(S, &0, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args.rs:15:31 + --> $DIR/method-call-lifetime-args-fail.rs:15:31 | LL | fn late_implicit(self, _: &u8, _: &u8) {} | ^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args.rs:57:30 + --> $DIR/method-call-lifetime-args-fail.rs:57:30 | LL | S::late_implicit_early::<'static, 'static>(S, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args.rs:18:41 + --> $DIR/method-call-lifetime-args-fail.rs:18:41 | LL | fn late_implicit_early<'b>(self, _: &u8) -> &'b u8 { loop {} } | ^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args.rs:59:30 + --> $DIR/method-call-lifetime-args-fail.rs:59:30 | LL | S::late_implicit_early::<'static, 'static, 'static>(S, &0); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args.rs:18:41 + --> $DIR/method-call-lifetime-args-fail.rs:18:41 | LL | fn late_implicit_early<'b>(self, _: &u8) -> &'b u8 { loop {} } | ^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args.rs:62:35 + --> $DIR/method-call-lifetime-args-fail.rs:62:35 | LL | S::late_implicit_self_early::<'static, 'static>(&S); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args.rs:19:37 + --> $DIR/method-call-lifetime-args-fail.rs:19:37 | LL | fn late_implicit_self_early<'b>(&self) -> &'b u8 { loop {} } | ^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args.rs:64:35 + --> $DIR/method-call-lifetime-args-fail.rs:64:35 | LL | S::late_implicit_self_early::<'static, 'static, 'static>(&S); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args.rs:19:37 + --> $DIR/method-call-lifetime-args-fail.rs:19:37 | LL | fn late_implicit_self_early<'b>(&self) -> &'b u8 { loop {} } | ^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args.rs:67:28 + --> $DIR/method-call-lifetime-args-fail.rs:67:28 | LL | S::late_unused_early::<'static, 'static>(S); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args.rs:20:26 + --> $DIR/method-call-lifetime-args-fail.rs:20:26 | LL | fn late_unused_early<'a, 'b>(self) -> &'b u8 { loop {} } | ^^ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args.rs:69:28 + --> $DIR/method-call-lifetime-args-fail.rs:69:28 | LL | S::late_unused_early::<'static, 'static, 'static>(S); | ^^^^^^^ | note: the late bound lifetime parameter is introduced here - --> $DIR/method-call-lifetime-args.rs:20:26 + --> $DIR/method-call-lifetime-args-fail.rs:20:26 | LL | fn late_unused_early<'a, 'b>(self) -> &'b u8 { loop {} } | ^^ error[E0090]: too few lifetime parameters provided: expected 2 lifetime parameters, found 1 lifetime parameter - --> $DIR/method-call-lifetime-args.rs:73:5 + --> $DIR/method-call-lifetime-args-fail.rs:73:5 | LL | S::early::<'static>(S); | ^^^^^^^^^^^^^^^^^^^ expected 2 lifetime parameters error[E0088]: too many lifetime parameters provided: expected at most 2 lifetime parameters, found 3 lifetime parameters - --> $DIR/method-call-lifetime-args.rs:75:34 + --> $DIR/method-call-lifetime-args-fail.rs:75:34 | LL | S::early::<'static, 'static, 'static>(S); | ^^^^^^^ expected 2 lifetime parameters diff --git a/src/test/ui/compile-fail-migration/method-call-lifetime-args-lint.rs b/src/test/ui/methods/method-call-lifetime-args-lint-fail.rs similarity index 100% rename from src/test/ui/compile-fail-migration/method-call-lifetime-args-lint.rs rename to src/test/ui/methods/method-call-lifetime-args-lint-fail.rs diff --git a/src/test/ui/compile-fail-migration/method-call-lifetime-args-lint.stderr b/src/test/ui/methods/method-call-lifetime-args-lint-fail.stderr similarity index 90% rename from src/test/ui/compile-fail-migration/method-call-lifetime-args-lint.stderr rename to src/test/ui/methods/method-call-lifetime-args-lint-fail.stderr index 682cfbdb84a..34747edc2a0 100644 --- a/src/test/ui/compile-fail-migration/method-call-lifetime-args-lint.stderr +++ b/src/test/ui/methods/method-call-lifetime-args-lint-fail.stderr @@ -1,5 +1,5 @@ error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint.rs:33:14 + --> $DIR/method-call-lifetime-args-lint-fail.rs:33:14 | LL | fn late<'a, 'b>(self, _: &'a u8, _: &'b u8) {} | -- the late bound lifetime parameter is introduced here @@ -8,7 +8,7 @@ LL | S.late::<'static>(&0, &0); | ^^^^^^^ | note: lint level defined here - --> $DIR/method-call-lifetime-args-lint.rs:11:9 + --> $DIR/method-call-lifetime-args-lint-fail.rs:11:9 | LL | #![deny(late_bound_lifetime_arguments)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -16,7 +16,7 @@ LL | #![deny(late_bound_lifetime_arguments)] = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint.rs:36:14 + --> $DIR/method-call-lifetime-args-lint-fail.rs:36:14 | LL | fn late<'a, 'b>(self, _: &'a u8, _: &'b u8) {} | -- the late bound lifetime parameter is introduced here @@ -28,7 +28,7 @@ LL | S.late::<'static, 'static>(&0, &0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint.rs:39:14 + --> $DIR/method-call-lifetime-args-lint-fail.rs:39:14 | LL | fn late<'a, 'b>(self, _: &'a u8, _: &'b u8) {} | -- the late bound lifetime parameter is introduced here @@ -40,7 +40,7 @@ LL | S.late::<'static, 'static, 'static>(&0, &0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint.rs:43:20 + --> $DIR/method-call-lifetime-args-lint-fail.rs:43:20 | LL | fn late_early<'a, 'b>(self, _: &'a u8) -> &'b u8 { loop {} } | -- the late bound lifetime parameter is introduced here @@ -52,7 +52,7 @@ LL | S.late_early::<'static>(&0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint.rs:46:20 + --> $DIR/method-call-lifetime-args-lint-fail.rs:46:20 | LL | fn late_early<'a, 'b>(self, _: &'a u8) -> &'b u8 { loop {} } | -- the late bound lifetime parameter is introduced here @@ -64,7 +64,7 @@ LL | S.late_early::<'static, 'static>(&0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint.rs:49:20 + --> $DIR/method-call-lifetime-args-lint-fail.rs:49:20 | LL | fn late_early<'a, 'b>(self, _: &'a u8) -> &'b u8 { loop {} } | -- the late bound lifetime parameter is introduced here @@ -76,7 +76,7 @@ LL | S.late_early::<'static, 'static, 'static>(&0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint.rs:54:23 + --> $DIR/method-call-lifetime-args-lint-fail.rs:54:23 | LL | fn late_implicit(self, _: &u8, _: &u8) {} | - the late bound lifetime parameter is introduced here @@ -88,7 +88,7 @@ LL | S.late_implicit::<'static>(&0, &0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint.rs:57:23 + --> $DIR/method-call-lifetime-args-lint-fail.rs:57:23 | LL | fn late_implicit(self, _: &u8, _: &u8) {} | - the late bound lifetime parameter is introduced here @@ -100,7 +100,7 @@ LL | S.late_implicit::<'static, 'static>(&0, &0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint.rs:60:23 + --> $DIR/method-call-lifetime-args-lint-fail.rs:60:23 | LL | fn late_implicit(self, _: &u8, _: &u8) {} | - the late bound lifetime parameter is introduced here @@ -112,7 +112,7 @@ LL | S.late_implicit::<'static, 'static, 'static>(&0, &0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint.rs:64:29 + --> $DIR/method-call-lifetime-args-lint-fail.rs:64:29 | LL | fn late_implicit_early<'b>(self, _: &u8) -> &'b u8 { loop {} } | - the late bound lifetime parameter is introduced here @@ -124,7 +124,7 @@ LL | S.late_implicit_early::<'static>(&0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint.rs:67:29 + --> $DIR/method-call-lifetime-args-lint-fail.rs:67:29 | LL | fn late_implicit_early<'b>(self, _: &u8) -> &'b u8 { loop {} } | - the late bound lifetime parameter is introduced here @@ -136,7 +136,7 @@ LL | S.late_implicit_early::<'static, 'static>(&0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint.rs:70:29 + --> $DIR/method-call-lifetime-args-lint-fail.rs:70:29 | LL | fn late_implicit_early<'b>(self, _: &u8) -> &'b u8 { loop {} } | - the late bound lifetime parameter is introduced here @@ -148,7 +148,7 @@ LL | S.late_implicit_early::<'static, 'static, 'static>(&0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint.rs:79:21 + --> $DIR/method-call-lifetime-args-lint-fail.rs:79:21 | LL | fn late_early<'a, 'b>(self, _: &'a u8) -> &'b u8 { loop {} } | -- the late bound lifetime parameter is introduced here @@ -160,7 +160,7 @@ LL | S::late_early::<'static>(S, &0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint.rs:83:30 + --> $DIR/method-call-lifetime-args-lint-fail.rs:83:30 | LL | fn late_implicit_early<'b>(self, _: &u8) -> &'b u8 { loop {} } | - the late bound lifetime parameter is introduced here @@ -172,7 +172,7 @@ LL | S::late_implicit_early::<'static>(S, &0); = note: for more information, see issue #42868 error: cannot specify lifetime arguments explicitly if late bound lifetime parameters are present - --> $DIR/method-call-lifetime-args-lint.rs:92:9 + --> $DIR/method-call-lifetime-args-lint-fail.rs:92:9 | LL | fn f<'early, 'late, T: 'early>() {} | ----- the late bound lifetime parameter is introduced here diff --git a/src/test/ui/method-call-lifetime-args-lint.rs b/src/test/ui/methods/method-call-lifetime-args-lint.rs similarity index 100% rename from src/test/ui/method-call-lifetime-args-lint.rs rename to src/test/ui/methods/method-call-lifetime-args-lint.rs diff --git a/src/test/ui/method-call-lifetime-args-lint.stderr b/src/test/ui/methods/method-call-lifetime-args-lint.stderr similarity index 100% rename from src/test/ui/method-call-lifetime-args-lint.stderr rename to src/test/ui/methods/method-call-lifetime-args-lint.stderr diff --git a/src/test/ui/compile-fail-migration/method-call-lifetime-args-subst-index.rs b/src/test/ui/methods/method-call-lifetime-args-subst-index.rs similarity index 100% rename from src/test/ui/compile-fail-migration/method-call-lifetime-args-subst-index.rs rename to src/test/ui/methods/method-call-lifetime-args-subst-index.rs diff --git a/src/test/ui/compile-fail-migration/method-call-lifetime-args-subst-index.stderr b/src/test/ui/methods/method-call-lifetime-args-subst-index.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/method-call-lifetime-args-subst-index.stderr rename to src/test/ui/methods/method-call-lifetime-args-subst-index.stderr diff --git a/src/test/ui/compile-fail-migration/method-call-lifetime-args-unresolved.rs b/src/test/ui/methods/method-call-lifetime-args-unresolved.rs similarity index 100% rename from src/test/ui/compile-fail-migration/method-call-lifetime-args-unresolved.rs rename to src/test/ui/methods/method-call-lifetime-args-unresolved.rs diff --git a/src/test/ui/compile-fail-migration/method-call-lifetime-args-unresolved.stderr b/src/test/ui/methods/method-call-lifetime-args-unresolved.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/method-call-lifetime-args-unresolved.stderr rename to src/test/ui/methods/method-call-lifetime-args-unresolved.stderr diff --git a/src/test/ui/method-call-lifetime-args.rs b/src/test/ui/methods/method-call-lifetime-args.rs similarity index 100% rename from src/test/ui/method-call-lifetime-args.rs rename to src/test/ui/methods/method-call-lifetime-args.rs diff --git a/src/test/ui/method-call-lifetime-args.stderr b/src/test/ui/methods/method-call-lifetime-args.stderr similarity index 100% rename from src/test/ui/method-call-lifetime-args.stderr rename to src/test/ui/methods/method-call-lifetime-args.stderr diff --git a/src/test/ui/compile-fail-migration/method-call-type-binding.rs b/src/test/ui/methods/method-call-type-binding.rs similarity index 100% rename from src/test/ui/compile-fail-migration/method-call-type-binding.rs rename to src/test/ui/methods/method-call-type-binding.rs diff --git a/src/test/ui/compile-fail-migration/method-call-type-binding.stderr b/src/test/ui/methods/method-call-type-binding.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/method-call-type-binding.stderr rename to src/test/ui/methods/method-call-type-binding.stderr diff --git a/src/test/ui/compile-fail-migration/method-macro-backtrace.rs b/src/test/ui/methods/method-macro-backtrace.rs similarity index 100% rename from src/test/ui/compile-fail-migration/method-macro-backtrace.rs rename to src/test/ui/methods/method-macro-backtrace.rs diff --git a/src/test/ui/compile-fail-migration/method-macro-backtrace.stderr b/src/test/ui/methods/method-macro-backtrace.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/method-macro-backtrace.stderr rename to src/test/ui/methods/method-macro-backtrace.stderr diff --git a/src/test/ui/method-missing-call.rs b/src/test/ui/methods/method-missing-call.rs similarity index 100% rename from src/test/ui/method-missing-call.rs rename to src/test/ui/methods/method-missing-call.rs diff --git a/src/test/ui/method-missing-call.stderr b/src/test/ui/methods/method-missing-call.stderr similarity index 100% rename from src/test/ui/method-missing-call.stderr rename to src/test/ui/methods/method-missing-call.stderr diff --git a/src/test/ui/method-on-ambiguous-numeric-type.rs b/src/test/ui/methods/method-on-ambiguous-numeric-type.rs similarity index 100% rename from src/test/ui/method-on-ambiguous-numeric-type.rs rename to src/test/ui/methods/method-on-ambiguous-numeric-type.rs diff --git a/src/test/ui/method-on-ambiguous-numeric-type.stderr b/src/test/ui/methods/method-on-ambiguous-numeric-type.stderr similarity index 100% rename from src/test/ui/method-on-ambiguous-numeric-type.stderr rename to src/test/ui/methods/method-on-ambiguous-numeric-type.stderr diff --git a/src/test/ui/compile-fail-migration/method-path-in-pattern.rs b/src/test/ui/methods/method-path-in-pattern.rs similarity index 100% rename from src/test/ui/compile-fail-migration/method-path-in-pattern.rs rename to src/test/ui/methods/method-path-in-pattern.rs diff --git a/src/test/ui/compile-fail-migration/method-path-in-pattern.stderr b/src/test/ui/methods/method-path-in-pattern.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/method-path-in-pattern.stderr rename to src/test/ui/methods/method-path-in-pattern.stderr diff --git a/src/test/ui/compile-fail-migration/method-resolvable-path-in-pattern.rs b/src/test/ui/methods/method-resolvable-path-in-pattern.rs similarity index 100% rename from src/test/ui/compile-fail-migration/method-resolvable-path-in-pattern.rs rename to src/test/ui/methods/method-resolvable-path-in-pattern.rs diff --git a/src/test/ui/compile-fail-migration/method-resolvable-path-in-pattern.stderr b/src/test/ui/methods/method-resolvable-path-in-pattern.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/method-resolvable-path-in-pattern.stderr rename to src/test/ui/methods/method-resolvable-path-in-pattern.stderr diff --git a/src/test/ui/compile-fail-migration/method-self-arg-1.rs b/src/test/ui/methods/method-self-arg-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/method-self-arg-1.rs rename to src/test/ui/methods/method-self-arg-1.rs diff --git a/src/test/ui/compile-fail-migration/method-self-arg-1.stderr b/src/test/ui/methods/method-self-arg-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/method-self-arg-1.stderr rename to src/test/ui/methods/method-self-arg-1.stderr diff --git a/src/test/ui/compile-fail-migration/method-self-arg-2.rs b/src/test/ui/methods/method-self-arg-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/method-self-arg-2.rs rename to src/test/ui/methods/method-self-arg-2.rs diff --git a/src/test/ui/compile-fail-migration/method-self-arg-2.stderr b/src/test/ui/methods/method-self-arg-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/method-self-arg-2.stderr rename to src/test/ui/methods/method-self-arg-2.stderr diff --git a/src/test/ui/compile-fail-migration/minus-string.rs b/src/test/ui/minus-string.rs similarity index 100% rename from src/test/ui/compile-fail-migration/minus-string.rs rename to src/test/ui/minus-string.rs diff --git a/src/test/ui/compile-fail-migration/minus-string.stderr b/src/test/ui/minus-string.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/minus-string.stderr rename to src/test/ui/minus-string.stderr diff --git a/src/test/ui/compile-fail-migration/mir-dataflow/README.md b/src/test/ui/mir-dataflow/README.md similarity index 100% rename from src/test/ui/compile-fail-migration/mir-dataflow/README.md rename to src/test/ui/mir-dataflow/README.md diff --git a/src/test/ui/compile-fail-migration/mir-dataflow/def-inits-1.rs b/src/test/ui/mir-dataflow/def-inits-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mir-dataflow/def-inits-1.rs rename to src/test/ui/mir-dataflow/def-inits-1.rs diff --git a/src/test/ui/compile-fail-migration/mir-dataflow/def-inits-1.stderr b/src/test/ui/mir-dataflow/def-inits-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mir-dataflow/def-inits-1.stderr rename to src/test/ui/mir-dataflow/def-inits-1.stderr diff --git a/src/test/ui/compile-fail-migration/mir-dataflow/inits-1.rs b/src/test/ui/mir-dataflow/inits-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mir-dataflow/inits-1.rs rename to src/test/ui/mir-dataflow/inits-1.rs diff --git a/src/test/ui/compile-fail-migration/mir-dataflow/inits-1.stderr b/src/test/ui/mir-dataflow/inits-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mir-dataflow/inits-1.stderr rename to src/test/ui/mir-dataflow/inits-1.stderr diff --git a/src/test/ui/compile-fail-migration/mir-dataflow/uninits-1.rs b/src/test/ui/mir-dataflow/uninits-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mir-dataflow/uninits-1.rs rename to src/test/ui/mir-dataflow/uninits-1.rs diff --git a/src/test/ui/compile-fail-migration/mir-dataflow/uninits-1.stderr b/src/test/ui/mir-dataflow/uninits-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mir-dataflow/uninits-1.stderr rename to src/test/ui/mir-dataflow/uninits-1.stderr diff --git a/src/test/ui/compile-fail-migration/mir-dataflow/uninits-2.rs b/src/test/ui/mir-dataflow/uninits-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mir-dataflow/uninits-2.rs rename to src/test/ui/mir-dataflow/uninits-2.rs diff --git a/src/test/ui/compile-fail-migration/mir-dataflow/uninits-2.stderr b/src/test/ui/mir-dataflow/uninits-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mir-dataflow/uninits-2.stderr rename to src/test/ui/mir-dataflow/uninits-2.stderr diff --git a/src/test/ui/compile-fail-migration/mir-unpretty.rs b/src/test/ui/mir-unpretty.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mir-unpretty.rs rename to src/test/ui/mir-unpretty.rs diff --git a/src/test/ui/compile-fail-migration/mir-unpretty.stderr b/src/test/ui/mir-unpretty.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mir-unpretty.stderr rename to src/test/ui/mir-unpretty.stderr diff --git a/src/test/ui/missing/auxiliary/two_macros.rs b/src/test/ui/missing/auxiliary/two_macros.rs new file mode 100644 index 00000000000..060960f0dbc --- /dev/null +++ b/src/test/ui/missing/auxiliary/two_macros.rs @@ -0,0 +1,15 @@ +// Copyright 2015 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#[macro_export] +macro_rules! macro_one { () => ("one") } + +#[macro_export] +macro_rules! macro_two { () => ("two") } diff --git a/src/test/ui/missing-alloc_error_handler.rs b/src/test/ui/missing/missing-alloc_error_handler.rs similarity index 100% rename from src/test/ui/missing-alloc_error_handler.rs rename to src/test/ui/missing/missing-alloc_error_handler.rs diff --git a/src/test/ui/missing-alloc_error_handler.stderr b/src/test/ui/missing/missing-alloc_error_handler.stderr similarity index 100% rename from src/test/ui/missing-alloc_error_handler.stderr rename to src/test/ui/missing/missing-alloc_error_handler.stderr diff --git a/src/test/ui/missing-allocator.rs b/src/test/ui/missing/missing-allocator.rs similarity index 100% rename from src/test/ui/missing-allocator.rs rename to src/test/ui/missing/missing-allocator.rs diff --git a/src/test/ui/missing-allocator.stderr b/src/test/ui/missing/missing-allocator.stderr similarity index 100% rename from src/test/ui/missing-allocator.stderr rename to src/test/ui/missing/missing-allocator.stderr diff --git a/src/test/ui/missing-block-hint.rs b/src/test/ui/missing/missing-block-hint.rs similarity index 100% rename from src/test/ui/missing-block-hint.rs rename to src/test/ui/missing/missing-block-hint.rs diff --git a/src/test/ui/missing-block-hint.stderr b/src/test/ui/missing/missing-block-hint.stderr similarity index 100% rename from src/test/ui/missing-block-hint.stderr rename to src/test/ui/missing/missing-block-hint.stderr diff --git a/src/test/ui/missing-comma-in-match.fixed b/src/test/ui/missing/missing-comma-in-match.fixed similarity index 100% rename from src/test/ui/missing-comma-in-match.fixed rename to src/test/ui/missing/missing-comma-in-match.fixed diff --git a/src/test/ui/missing-comma-in-match.rs b/src/test/ui/missing/missing-comma-in-match.rs similarity index 100% rename from src/test/ui/missing-comma-in-match.rs rename to src/test/ui/missing/missing-comma-in-match.rs diff --git a/src/test/ui/missing-comma-in-match.stderr b/src/test/ui/missing/missing-comma-in-match.stderr similarity index 100% rename from src/test/ui/missing-comma-in-match.stderr rename to src/test/ui/missing/missing-comma-in-match.stderr diff --git a/src/test/ui/compile-fail-migration/missing-derivable-attr.rs b/src/test/ui/missing/missing-derivable-attr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/missing-derivable-attr.rs rename to src/test/ui/missing/missing-derivable-attr.rs diff --git a/src/test/ui/compile-fail-migration/missing-derivable-attr.stderr b/src/test/ui/missing/missing-derivable-attr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/missing-derivable-attr.stderr rename to src/test/ui/missing/missing-derivable-attr.stderr diff --git a/src/test/ui/missing-fields-in-struct-pattern.rs b/src/test/ui/missing/missing-fields-in-struct-pattern.rs similarity index 100% rename from src/test/ui/missing-fields-in-struct-pattern.rs rename to src/test/ui/missing/missing-fields-in-struct-pattern.rs diff --git a/src/test/ui/missing-fields-in-struct-pattern.stderr b/src/test/ui/missing/missing-fields-in-struct-pattern.stderr similarity index 100% rename from src/test/ui/missing-fields-in-struct-pattern.stderr rename to src/test/ui/missing/missing-fields-in-struct-pattern.stderr diff --git a/src/test/ui/missing-items/auxiliary/m1.rs b/src/test/ui/missing/missing-items/auxiliary/m1.rs similarity index 100% rename from src/test/ui/missing-items/auxiliary/m1.rs rename to src/test/ui/missing/missing-items/auxiliary/m1.rs diff --git a/src/test/ui/missing-items/issue-40221.rs b/src/test/ui/missing/missing-items/issue-40221.rs similarity index 100% rename from src/test/ui/missing-items/issue-40221.rs rename to src/test/ui/missing/missing-items/issue-40221.rs diff --git a/src/test/ui/missing-items/issue-40221.stderr b/src/test/ui/missing/missing-items/issue-40221.stderr similarity index 100% rename from src/test/ui/missing-items/issue-40221.stderr rename to src/test/ui/missing/missing-items/issue-40221.stderr diff --git a/src/test/ui/missing-items/m2.rs b/src/test/ui/missing/missing-items/m2.rs similarity index 100% rename from src/test/ui/missing-items/m2.rs rename to src/test/ui/missing/missing-items/m2.rs diff --git a/src/test/ui/missing-items/m2.stderr b/src/test/ui/missing/missing-items/m2.stderr similarity index 100% rename from src/test/ui/missing-items/m2.stderr rename to src/test/ui/missing/missing-items/m2.stderr diff --git a/src/test/ui/missing-items/missing-type-parameter.rs b/src/test/ui/missing/missing-items/missing-type-parameter.rs similarity index 100% rename from src/test/ui/missing-items/missing-type-parameter.rs rename to src/test/ui/missing/missing-items/missing-type-parameter.rs diff --git a/src/test/ui/missing-items/missing-type-parameter.stderr b/src/test/ui/missing/missing-items/missing-type-parameter.stderr similarity index 100% rename from src/test/ui/missing-items/missing-type-parameter.stderr rename to src/test/ui/missing/missing-items/missing-type-parameter.stderr diff --git a/src/test/ui/compile-fail-migration/missing-macro-use.rs b/src/test/ui/missing/missing-macro-use.rs similarity index 100% rename from src/test/ui/compile-fail-migration/missing-macro-use.rs rename to src/test/ui/missing/missing-macro-use.rs diff --git a/src/test/ui/compile-fail-migration/missing-macro-use.stderr b/src/test/ui/missing/missing-macro-use.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/missing-macro-use.stderr rename to src/test/ui/missing/missing-macro-use.stderr diff --git a/src/test/ui/compile-fail-migration/missing-main.rs b/src/test/ui/missing/missing-main.rs similarity index 100% rename from src/test/ui/compile-fail-migration/missing-main.rs rename to src/test/ui/missing/missing-main.rs diff --git a/src/test/ui/compile-fail-migration/missing-main.stderr b/src/test/ui/missing/missing-main.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/missing-main.stderr rename to src/test/ui/missing/missing-main.stderr diff --git a/src/test/ui/compile-fail-migration/missing-return.rs b/src/test/ui/missing/missing-return.rs similarity index 100% rename from src/test/ui/compile-fail-migration/missing-return.rs rename to src/test/ui/missing/missing-return.rs diff --git a/src/test/ui/compile-fail-migration/missing-return.stderr b/src/test/ui/missing/missing-return.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/missing-return.stderr rename to src/test/ui/missing/missing-return.stderr diff --git a/src/test/ui/compile-fail-migration/missing-semicolon-warning.rs b/src/test/ui/missing/missing-semicolon-warning.rs similarity index 100% rename from src/test/ui/compile-fail-migration/missing-semicolon-warning.rs rename to src/test/ui/missing/missing-semicolon-warning.rs diff --git a/src/test/ui/compile-fail-migration/missing-semicolon-warning.stderr b/src/test/ui/missing/missing-semicolon-warning.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/missing-semicolon-warning.stderr rename to src/test/ui/missing/missing-semicolon-warning.stderr diff --git a/src/test/ui/compile-fail-migration/missing-stability.rs b/src/test/ui/missing/missing-stability.rs similarity index 100% rename from src/test/ui/compile-fail-migration/missing-stability.rs rename to src/test/ui/missing/missing-stability.rs diff --git a/src/test/ui/compile-fail-migration/missing-stability.stderr b/src/test/ui/missing/missing-stability.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/missing-stability.stderr rename to src/test/ui/missing/missing-stability.stderr diff --git a/src/test/ui/compile-fail-migration/missing_debug_impls.rs b/src/test/ui/missing_debug_impls.rs similarity index 100% rename from src/test/ui/compile-fail-migration/missing_debug_impls.rs rename to src/test/ui/missing_debug_impls.rs diff --git a/src/test/ui/compile-fail-migration/missing_debug_impls.stderr b/src/test/ui/missing_debug_impls.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/missing_debug_impls.stderr rename to src/test/ui/missing_debug_impls.stderr diff --git a/src/test/ui/compile-fail-migration/mod_file_aux.rs b/src/test/ui/mod/mod_file_aux.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mod_file_aux.rs rename to src/test/ui/mod/mod_file_aux.rs diff --git a/src/test/ui/compile-fail-migration/mod_file_correct_spans.rs b/src/test/ui/mod/mod_file_correct_spans.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mod_file_correct_spans.rs rename to src/test/ui/mod/mod_file_correct_spans.rs diff --git a/src/test/ui/compile-fail-migration/mod_file_correct_spans.stderr b/src/test/ui/mod/mod_file_correct_spans.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mod_file_correct_spans.stderr rename to src/test/ui/mod/mod_file_correct_spans.stderr diff --git a/src/test/ui/compile-fail-migration/mod_file_disambig.rs b/src/test/ui/mod/mod_file_disambig.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mod_file_disambig.rs rename to src/test/ui/mod/mod_file_disambig.rs diff --git a/src/test/ui/compile-fail-migration/mod_file_disambig.stderr b/src/test/ui/mod/mod_file_disambig.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mod_file_disambig.stderr rename to src/test/ui/mod/mod_file_disambig.stderr diff --git a/src/test/ui/compile-fail-migration/mod_file_disambig_aux.rs b/src/test/ui/mod/mod_file_disambig_aux.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mod_file_disambig_aux.rs rename to src/test/ui/mod/mod_file_disambig_aux.rs diff --git a/src/test/ui/compile-fail-migration/mod_file_disambig_aux/mod.rs b/src/test/ui/mod/mod_file_disambig_aux/mod.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mod_file_disambig_aux/mod.rs rename to src/test/ui/mod/mod_file_disambig_aux/mod.rs diff --git a/src/test/ui/compile-fail-migration/module-macro_use-arguments.rs b/src/test/ui/module-macro_use-arguments.rs similarity index 100% rename from src/test/ui/compile-fail-migration/module-macro_use-arguments.rs rename to src/test/ui/module-macro_use-arguments.rs diff --git a/src/test/ui/compile-fail-migration/module-macro_use-arguments.stderr b/src/test/ui/module-macro_use-arguments.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/module-macro_use-arguments.stderr rename to src/test/ui/module-macro_use-arguments.stderr diff --git a/src/test/ui/compile-fail-migration/move-guard-same-consts.rs b/src/test/ui/moves/move-guard-same-consts.rs similarity index 100% rename from src/test/ui/compile-fail-migration/move-guard-same-consts.rs rename to src/test/ui/moves/move-guard-same-consts.rs diff --git a/src/test/ui/compile-fail-migration/move-guard-same-consts.stderr b/src/test/ui/moves/move-guard-same-consts.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/move-guard-same-consts.stderr rename to src/test/ui/moves/move-guard-same-consts.stderr diff --git a/src/test/ui/compile-fail-migration/move-in-guard-1.rs b/src/test/ui/moves/move-in-guard-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/move-in-guard-1.rs rename to src/test/ui/moves/move-in-guard-1.rs diff --git a/src/test/ui/compile-fail-migration/move-in-guard-1.stderr b/src/test/ui/moves/move-in-guard-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/move-in-guard-1.stderr rename to src/test/ui/moves/move-in-guard-1.stderr diff --git a/src/test/ui/compile-fail-migration/move-in-guard-2.rs b/src/test/ui/moves/move-in-guard-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/move-in-guard-2.rs rename to src/test/ui/moves/move-in-guard-2.rs diff --git a/src/test/ui/compile-fail-migration/move-in-guard-2.stderr b/src/test/ui/moves/move-in-guard-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/move-in-guard-2.stderr rename to src/test/ui/moves/move-in-guard-2.stderr diff --git a/src/test/ui/compile-fail-migration/move-into-dead-array-1.nll.stderr b/src/test/ui/moves/move-into-dead-array-1.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/move-into-dead-array-1.nll.stderr rename to src/test/ui/moves/move-into-dead-array-1.nll.stderr diff --git a/src/test/ui/compile-fail-migration/move-into-dead-array-1.rs b/src/test/ui/moves/move-into-dead-array-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/move-into-dead-array-1.rs rename to src/test/ui/moves/move-into-dead-array-1.rs diff --git a/src/test/ui/compile-fail-migration/move-into-dead-array-1.stderr b/src/test/ui/moves/move-into-dead-array-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/move-into-dead-array-1.stderr rename to src/test/ui/moves/move-into-dead-array-1.stderr diff --git a/src/test/ui/compile-fail-migration/move-into-dead-array-2.nll.stderr b/src/test/ui/moves/move-into-dead-array-2.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/move-into-dead-array-2.nll.stderr rename to src/test/ui/moves/move-into-dead-array-2.nll.stderr diff --git a/src/test/ui/compile-fail-migration/move-into-dead-array-2.rs b/src/test/ui/moves/move-into-dead-array-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/move-into-dead-array-2.rs rename to src/test/ui/moves/move-into-dead-array-2.rs diff --git a/src/test/ui/compile-fail-migration/move-into-dead-array-2.stderr b/src/test/ui/moves/move-into-dead-array-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/move-into-dead-array-2.stderr rename to src/test/ui/moves/move-into-dead-array-2.stderr diff --git a/src/test/ui/compile-fail-migration/move-out-of-array-1.rs b/src/test/ui/moves/move-out-of-array-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/move-out-of-array-1.rs rename to src/test/ui/moves/move-out-of-array-1.rs diff --git a/src/test/ui/compile-fail-migration/move-out-of-array-1.stderr b/src/test/ui/moves/move-out-of-array-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/move-out-of-array-1.stderr rename to src/test/ui/moves/move-out-of-array-1.stderr diff --git a/src/test/ui/compile-fail-migration/move-out-of-slice-1.nll.stderr b/src/test/ui/moves/move-out-of-slice-1.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/move-out-of-slice-1.nll.stderr rename to src/test/ui/moves/move-out-of-slice-1.nll.stderr diff --git a/src/test/ui/compile-fail-migration/move-out-of-slice-1.rs b/src/test/ui/moves/move-out-of-slice-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/move-out-of-slice-1.rs rename to src/test/ui/moves/move-out-of-slice-1.rs diff --git a/src/test/ui/compile-fail-migration/move-out-of-slice-1.stderr b/src/test/ui/moves/move-out-of-slice-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/move-out-of-slice-1.stderr rename to src/test/ui/moves/move-out-of-slice-1.stderr diff --git a/src/test/ui/compile-fail-migration/move-out-of-tuple-field.nll.stderr b/src/test/ui/moves/move-out-of-tuple-field.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/move-out-of-tuple-field.nll.stderr rename to src/test/ui/moves/move-out-of-tuple-field.nll.stderr diff --git a/src/test/ui/compile-fail-migration/move-out-of-tuple-field.rs b/src/test/ui/moves/move-out-of-tuple-field.rs similarity index 100% rename from src/test/ui/compile-fail-migration/move-out-of-tuple-field.rs rename to src/test/ui/moves/move-out-of-tuple-field.rs diff --git a/src/test/ui/compile-fail-migration/move-out-of-tuple-field.stderr b/src/test/ui/moves/move-out-of-tuple-field.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/move-out-of-tuple-field.stderr rename to src/test/ui/moves/move-out-of-tuple-field.stderr diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-access-to-field.nll.stderr b/src/test/ui/moves/moves-based-on-type-access-to-field.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-access-to-field.nll.stderr rename to src/test/ui/moves/moves-based-on-type-access-to-field.nll.stderr diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-access-to-field.rs b/src/test/ui/moves/moves-based-on-type-access-to-field.rs similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-access-to-field.rs rename to src/test/ui/moves/moves-based-on-type-access-to-field.rs diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-access-to-field.stderr b/src/test/ui/moves/moves-based-on-type-access-to-field.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-access-to-field.stderr rename to src/test/ui/moves/moves-based-on-type-access-to-field.stderr diff --git a/src/test/ui/moves-based-on-type-block-bad.nll.stderr b/src/test/ui/moves/moves-based-on-type-block-bad.nll.stderr similarity index 100% rename from src/test/ui/moves-based-on-type-block-bad.nll.stderr rename to src/test/ui/moves/moves-based-on-type-block-bad.nll.stderr diff --git a/src/test/ui/moves-based-on-type-block-bad.rs b/src/test/ui/moves/moves-based-on-type-block-bad.rs similarity index 100% rename from src/test/ui/moves-based-on-type-block-bad.rs rename to src/test/ui/moves/moves-based-on-type-block-bad.rs diff --git a/src/test/ui/moves-based-on-type-block-bad.stderr b/src/test/ui/moves/moves-based-on-type-block-bad.stderr similarity index 100% rename from src/test/ui/moves-based-on-type-block-bad.stderr rename to src/test/ui/moves/moves-based-on-type-block-bad.stderr diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-capture-clause-bad.nll.stderr b/src/test/ui/moves/moves-based-on-type-capture-clause-bad.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-capture-clause-bad.nll.stderr rename to src/test/ui/moves/moves-based-on-type-capture-clause-bad.nll.stderr diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-capture-clause-bad.rs b/src/test/ui/moves/moves-based-on-type-capture-clause-bad.rs similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-capture-clause-bad.rs rename to src/test/ui/moves/moves-based-on-type-capture-clause-bad.rs diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-capture-clause-bad.stderr b/src/test/ui/moves/moves-based-on-type-capture-clause-bad.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-capture-clause-bad.stderr rename to src/test/ui/moves/moves-based-on-type-capture-clause-bad.stderr diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-cyclic-types-issue-4821.nll.stderr b/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-cyclic-types-issue-4821.nll.stderr rename to src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.nll.stderr diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-cyclic-types-issue-4821.rs b/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.rs similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-cyclic-types-issue-4821.rs rename to src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.rs diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-cyclic-types-issue-4821.stderr b/src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-cyclic-types-issue-4821.stderr rename to src/test/ui/moves/moves-based-on-type-cyclic-types-issue-4821.stderr diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-distribute-copy-over-paren.nll.stderr b/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-distribute-copy-over-paren.nll.stderr rename to src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.nll.stderr diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-distribute-copy-over-paren.rs b/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.rs similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-distribute-copy-over-paren.rs rename to src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.rs diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-distribute-copy-over-paren.stderr b/src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-distribute-copy-over-paren.stderr rename to src/test/ui/moves/moves-based-on-type-distribute-copy-over-paren.stderr diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-exprs.nll.stderr b/src/test/ui/moves/moves-based-on-type-exprs.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-exprs.nll.stderr rename to src/test/ui/moves/moves-based-on-type-exprs.nll.stderr diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-exprs.rs b/src/test/ui/moves/moves-based-on-type-exprs.rs similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-exprs.rs rename to src/test/ui/moves/moves-based-on-type-exprs.rs diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-exprs.stderr b/src/test/ui/moves/moves-based-on-type-exprs.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-exprs.stderr rename to src/test/ui/moves/moves-based-on-type-exprs.stderr diff --git a/src/test/ui/moves-based-on-type-match-bindings.nll.stderr b/src/test/ui/moves/moves-based-on-type-match-bindings.nll.stderr similarity index 100% rename from src/test/ui/moves-based-on-type-match-bindings.nll.stderr rename to src/test/ui/moves/moves-based-on-type-match-bindings.nll.stderr diff --git a/src/test/ui/moves-based-on-type-match-bindings.rs b/src/test/ui/moves/moves-based-on-type-match-bindings.rs similarity index 100% rename from src/test/ui/moves-based-on-type-match-bindings.rs rename to src/test/ui/moves/moves-based-on-type-match-bindings.rs diff --git a/src/test/ui/moves-based-on-type-match-bindings.stderr b/src/test/ui/moves/moves-based-on-type-match-bindings.stderr similarity index 100% rename from src/test/ui/moves-based-on-type-match-bindings.stderr rename to src/test/ui/moves/moves-based-on-type-match-bindings.stderr diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-move-out-of-closure-env-issue-1965.nll.stderr b/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-move-out-of-closure-env-issue-1965.nll.stderr rename to src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.nll.stderr diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-move-out-of-closure-env-issue-1965.rs b/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.rs similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-move-out-of-closure-env-issue-1965.rs rename to src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.rs diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-move-out-of-closure-env-issue-1965.stderr b/src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-move-out-of-closure-env-issue-1965.stderr rename to src/test/ui/moves/moves-based-on-type-move-out-of-closure-env-issue-1965.stderr diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-no-recursive-stack-closure.nll.stderr b/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-no-recursive-stack-closure.nll.stderr rename to src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.nll.stderr diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-no-recursive-stack-closure.rs b/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.rs similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-no-recursive-stack-closure.rs rename to src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.rs diff --git a/src/test/ui/compile-fail-migration/moves-based-on-type-no-recursive-stack-closure.stderr b/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/moves-based-on-type-no-recursive-stack-closure.stderr rename to src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.stderr diff --git a/src/test/ui/moves-based-on-type-tuple.rs b/src/test/ui/moves/moves-based-on-type-tuple.rs similarity index 100% rename from src/test/ui/moves-based-on-type-tuple.rs rename to src/test/ui/moves/moves-based-on-type-tuple.rs diff --git a/src/test/ui/moves-based-on-type-tuple.stderr b/src/test/ui/moves/moves-based-on-type-tuple.stderr similarity index 100% rename from src/test/ui/moves-based-on-type-tuple.stderr rename to src/test/ui/moves/moves-based-on-type-tuple.stderr diff --git a/src/test/ui/compile-fail-migration/moves-sru-moved-field.nll.stderr b/src/test/ui/moves/moves-sru-moved-field.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/moves-sru-moved-field.nll.stderr rename to src/test/ui/moves/moves-sru-moved-field.nll.stderr diff --git a/src/test/ui/compile-fail-migration/moves-sru-moved-field.rs b/src/test/ui/moves/moves-sru-moved-field.rs similarity index 100% rename from src/test/ui/compile-fail-migration/moves-sru-moved-field.rs rename to src/test/ui/moves/moves-sru-moved-field.rs diff --git a/src/test/ui/compile-fail-migration/moves-sru-moved-field.stderr b/src/test/ui/moves/moves-sru-moved-field.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/moves-sru-moved-field.stderr rename to src/test/ui/moves/moves-sru-moved-field.stderr diff --git a/src/test/ui/compile-fail-migration/multiple-main-2.rs b/src/test/ui/multiple-main-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/multiple-main-2.rs rename to src/test/ui/multiple-main-2.rs diff --git a/src/test/ui/compile-fail-migration/multiple-main-2.stderr b/src/test/ui/multiple-main-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/multiple-main-2.stderr rename to src/test/ui/multiple-main-2.stderr diff --git a/src/test/ui/compile-fail-migration/multiple-main-3.rs b/src/test/ui/multiple-main-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/multiple-main-3.rs rename to src/test/ui/multiple-main-3.rs diff --git a/src/test/ui/compile-fail-migration/multiple-main-3.stderr b/src/test/ui/multiple-main-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/multiple-main-3.stderr rename to src/test/ui/multiple-main-3.stderr diff --git a/src/test/ui/compile-fail-migration/multiple-plugin-registrars.rs b/src/test/ui/multiple-plugin-registrars.rs similarity index 100% rename from src/test/ui/compile-fail-migration/multiple-plugin-registrars.rs rename to src/test/ui/multiple-plugin-registrars.rs diff --git a/src/test/ui/compile-fail-migration/multiple-plugin-registrars.stderr b/src/test/ui/multiple-plugin-registrars.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/multiple-plugin-registrars.stderr rename to src/test/ui/multiple-plugin-registrars.stderr diff --git a/src/test/ui/compile-fail-migration/mut-cant-alias.rs b/src/test/ui/mut/mut-cant-alias.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mut-cant-alias.rs rename to src/test/ui/mut/mut-cant-alias.rs diff --git a/src/test/ui/compile-fail-migration/mut-cant-alias.stderr b/src/test/ui/mut/mut-cant-alias.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mut-cant-alias.stderr rename to src/test/ui/mut/mut-cant-alias.stderr diff --git a/src/test/ui/compile-fail-migration/mut-cross-borrowing.rs b/src/test/ui/mut/mut-cross-borrowing.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mut-cross-borrowing.rs rename to src/test/ui/mut/mut-cross-borrowing.rs diff --git a/src/test/ui/compile-fail-migration/mut-cross-borrowing.stderr b/src/test/ui/mut/mut-cross-borrowing.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mut-cross-borrowing.stderr rename to src/test/ui/mut/mut-cross-borrowing.stderr diff --git a/src/test/ui/compile-fail-migration/mut-pattern-internal-mutability.ast.nll.stderr b/src/test/ui/mut/mut-pattern-internal-mutability.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mut-pattern-internal-mutability.ast.nll.stderr rename to src/test/ui/mut/mut-pattern-internal-mutability.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/mut-pattern-internal-mutability.ast.stderr b/src/test/ui/mut/mut-pattern-internal-mutability.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mut-pattern-internal-mutability.ast.stderr rename to src/test/ui/mut/mut-pattern-internal-mutability.ast.stderr diff --git a/src/test/ui/compile-fail-migration/mut-pattern-internal-mutability.mir.stderr b/src/test/ui/mut/mut-pattern-internal-mutability.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mut-pattern-internal-mutability.mir.stderr rename to src/test/ui/mut/mut-pattern-internal-mutability.mir.stderr diff --git a/src/test/ui/compile-fail-migration/mut-pattern-internal-mutability.rs b/src/test/ui/mut/mut-pattern-internal-mutability.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mut-pattern-internal-mutability.rs rename to src/test/ui/mut/mut-pattern-internal-mutability.rs diff --git a/src/test/ui/compile-fail-migration/mut-pattern-mismatched.rs b/src/test/ui/mut/mut-pattern-mismatched.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mut-pattern-mismatched.rs rename to src/test/ui/mut/mut-pattern-mismatched.rs diff --git a/src/test/ui/compile-fail-migration/mut-pattern-mismatched.stderr b/src/test/ui/mut/mut-pattern-mismatched.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mut-pattern-mismatched.stderr rename to src/test/ui/mut/mut-pattern-mismatched.stderr diff --git a/src/test/ui/mut-ref.rs b/src/test/ui/mut/mut-ref.rs similarity index 100% rename from src/test/ui/mut-ref.rs rename to src/test/ui/mut/mut-ref.rs diff --git a/src/test/ui/mut-ref.stderr b/src/test/ui/mut/mut-ref.stderr similarity index 100% rename from src/test/ui/mut-ref.stderr rename to src/test/ui/mut/mut-ref.stderr diff --git a/src/test/ui/compile-fail-migration/mut-suggestion.nll.stderr b/src/test/ui/mut/mut-suggestion.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mut-suggestion.nll.stderr rename to src/test/ui/mut/mut-suggestion.nll.stderr diff --git a/src/test/ui/compile-fail-migration/mut-suggestion.rs b/src/test/ui/mut/mut-suggestion.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mut-suggestion.rs rename to src/test/ui/mut/mut-suggestion.rs diff --git a/src/test/ui/compile-fail-migration/mut-suggestion.stderr b/src/test/ui/mut/mut-suggestion.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mut-suggestion.stderr rename to src/test/ui/mut/mut-suggestion.stderr diff --git a/src/test/ui/compile-fail-migration/mutable-class-fields-2.nll.stderr b/src/test/ui/mut/mutable-class-fields-2.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mutable-class-fields-2.nll.stderr rename to src/test/ui/mut/mutable-class-fields-2.nll.stderr diff --git a/src/test/ui/compile-fail-migration/mutable-class-fields-2.rs b/src/test/ui/mut/mutable-class-fields-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mutable-class-fields-2.rs rename to src/test/ui/mut/mutable-class-fields-2.rs diff --git a/src/test/ui/compile-fail-migration/mutable-class-fields-2.stderr b/src/test/ui/mut/mutable-class-fields-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mutable-class-fields-2.stderr rename to src/test/ui/mut/mutable-class-fields-2.stderr diff --git a/src/test/ui/compile-fail-migration/mutable-class-fields.ast.nll.stderr b/src/test/ui/mut/mutable-class-fields.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mutable-class-fields.ast.nll.stderr rename to src/test/ui/mut/mutable-class-fields.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/mutable-class-fields.ast.stderr b/src/test/ui/mut/mutable-class-fields.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mutable-class-fields.ast.stderr rename to src/test/ui/mut/mutable-class-fields.ast.stderr diff --git a/src/test/ui/compile-fail-migration/mutable-class-fields.mir.stderr b/src/test/ui/mut/mutable-class-fields.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mutable-class-fields.mir.stderr rename to src/test/ui/mut/mutable-class-fields.mir.stderr diff --git a/src/test/ui/compile-fail-migration/mutable-class-fields.rs b/src/test/ui/mut/mutable-class-fields.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mutable-class-fields.rs rename to src/test/ui/mut/mutable-class-fields.rs diff --git a/src/test/ui/compile-fail-migration/mutable-enum-indirect.rs b/src/test/ui/mut/mutable-enum-indirect.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mutable-enum-indirect.rs rename to src/test/ui/mut/mutable-enum-indirect.rs diff --git a/src/test/ui/compile-fail-migration/mutable-enum-indirect.stderr b/src/test/ui/mut/mutable-enum-indirect.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mutable-enum-indirect.stderr rename to src/test/ui/mut/mutable-enum-indirect.stderr diff --git a/src/test/ui/compile-fail-migration/mutexguard-sync.rs b/src/test/ui/mutexguard-sync.rs similarity index 100% rename from src/test/ui/compile-fail-migration/mutexguard-sync.rs rename to src/test/ui/mutexguard-sync.rs diff --git a/src/test/ui/compile-fail-migration/mutexguard-sync.stderr b/src/test/ui/mutexguard-sync.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/mutexguard-sync.stderr rename to src/test/ui/mutexguard-sync.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/namespace-mix.rs b/src/test/ui/namespace/auxiliary/namespace-mix.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/namespace-mix.rs rename to src/test/ui/namespace/auxiliary/namespace-mix.rs diff --git a/src/test/ui/namespace/auxiliary/namespaced_enums.rs b/src/test/ui/namespace/auxiliary/namespaced_enums.rs new file mode 100644 index 00000000000..3bf39b788db --- /dev/null +++ b/src/test/ui/namespace/auxiliary/namespaced_enums.rs @@ -0,0 +1,20 @@ +// Copyright 2014 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +pub enum Foo { + A, + B(isize), + C { a: isize }, +} + +impl Foo { + pub fn foo() {} + pub fn bar(&self) {} +} diff --git a/src/test/ui/compile-fail-migration/namespace-mix.rs b/src/test/ui/namespace/namespace-mix.rs similarity index 100% rename from src/test/ui/compile-fail-migration/namespace-mix.rs rename to src/test/ui/namespace/namespace-mix.rs diff --git a/src/test/ui/compile-fail-migration/namespace-mix.stderr b/src/test/ui/namespace/namespace-mix.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/namespace-mix.stderr rename to src/test/ui/namespace/namespace-mix.stderr diff --git a/src/test/ui/compile-fail-migration/namespaced-enum-glob-import-no-impls-xcrate.rs b/src/test/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/namespaced-enum-glob-import-no-impls-xcrate.rs rename to src/test/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.rs diff --git a/src/test/ui/compile-fail-migration/namespaced-enum-glob-import-no-impls-xcrate.stderr b/src/test/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/namespaced-enum-glob-import-no-impls-xcrate.stderr rename to src/test/ui/namespace/namespaced-enum-glob-import-no-impls-xcrate.stderr diff --git a/src/test/ui/compile-fail-migration/namespaced-enum-glob-import-no-impls.rs b/src/test/ui/namespace/namespaced-enum-glob-import-no-impls.rs similarity index 100% rename from src/test/ui/compile-fail-migration/namespaced-enum-glob-import-no-impls.rs rename to src/test/ui/namespace/namespaced-enum-glob-import-no-impls.rs diff --git a/src/test/ui/compile-fail-migration/namespaced-enum-glob-import-no-impls.stderr b/src/test/ui/namespace/namespaced-enum-glob-import-no-impls.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/namespaced-enum-glob-import-no-impls.stderr rename to src/test/ui/namespace/namespaced-enum-glob-import-no-impls.stderr diff --git a/src/test/ui/compile-fail-migration/nested-cfg-attrs.rs b/src/test/ui/nested-cfg-attrs.rs similarity index 100% rename from src/test/ui/compile-fail-migration/nested-cfg-attrs.rs rename to src/test/ui/nested-cfg-attrs.rs diff --git a/src/test/ui/compile-fail-migration/nested-cfg-attrs.stderr b/src/test/ui/nested-cfg-attrs.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nested-cfg-attrs.stderr rename to src/test/ui/nested-cfg-attrs.stderr diff --git a/src/test/ui/compile-fail-migration/nested-ty-params.rs b/src/test/ui/nested-ty-params.rs similarity index 100% rename from src/test/ui/compile-fail-migration/nested-ty-params.rs rename to src/test/ui/nested-ty-params.rs diff --git a/src/test/ui/compile-fail-migration/nested-ty-params.stderr b/src/test/ui/nested-ty-params.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nested-ty-params.stderr rename to src/test/ui/nested-ty-params.stderr diff --git a/src/test/ui/compile-fail-migration/never-assign-dead-code.rs b/src/test/ui/never-assign-dead-code.rs similarity index 100% rename from src/test/ui/compile-fail-migration/never-assign-dead-code.rs rename to src/test/ui/never-assign-dead-code.rs diff --git a/src/test/ui/compile-fail-migration/never-assign-dead-code.stderr b/src/test/ui/never-assign-dead-code.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/never-assign-dead-code.stderr rename to src/test/ui/never-assign-dead-code.stderr diff --git a/src/test/ui/compile-fail-migration/never-assign-wrong-type.rs b/src/test/ui/never-assign-wrong-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/never-assign-wrong-type.rs rename to src/test/ui/never-assign-wrong-type.rs diff --git a/src/test/ui/compile-fail-migration/never-assign-wrong-type.stderr b/src/test/ui/never-assign-wrong-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/never-assign-wrong-type.stderr rename to src/test/ui/never-assign-wrong-type.stderr diff --git a/src/test/ui/compile-fail-migration/never_transmute_never.rs b/src/test/ui/never_transmute_never.rs similarity index 100% rename from src/test/ui/compile-fail-migration/never_transmute_never.rs rename to src/test/ui/never_transmute_never.rs diff --git a/src/test/ui/compile-fail-migration/nll/constant-thread-locals-issue-47053.rs b/src/test/ui/nll/constant-thread-locals-issue-47053.rs similarity index 100% rename from src/test/ui/compile-fail-migration/nll/constant-thread-locals-issue-47053.rs rename to src/test/ui/nll/constant-thread-locals-issue-47053.rs diff --git a/src/test/ui/compile-fail-migration/nll/constant-thread-locals-issue-47053.stderr b/src/test/ui/nll/constant-thread-locals-issue-47053.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nll/constant-thread-locals-issue-47053.stderr rename to src/test/ui/nll/constant-thread-locals-issue-47053.stderr diff --git a/src/test/ui/compile-fail-migration/nll/do-not-ignore-lifetime-bounds-in-copy.rs b/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.rs similarity index 100% rename from src/test/ui/compile-fail-migration/nll/do-not-ignore-lifetime-bounds-in-copy.rs rename to src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.rs diff --git a/src/test/ui/compile-fail-migration/nll/do-not-ignore-lifetime-bounds-in-copy.stderr b/src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nll/do-not-ignore-lifetime-bounds-in-copy.stderr rename to src/test/ui/nll/do-not-ignore-lifetime-bounds-in-copy.stderr diff --git a/src/test/ui/compile-fail-migration/nll/loan_ends_mid_block_pair.rs b/src/test/ui/nll/loan_ends_mid_block_pair.rs similarity index 100% rename from src/test/ui/compile-fail-migration/nll/loan_ends_mid_block_pair.rs rename to src/test/ui/nll/loan_ends_mid_block_pair.rs diff --git a/src/test/ui/compile-fail-migration/nll/loan_ends_mid_block_pair.stderr b/src/test/ui/nll/loan_ends_mid_block_pair.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nll/loan_ends_mid_block_pair.stderr rename to src/test/ui/nll/loan_ends_mid_block_pair.stderr diff --git a/src/test/ui/compile-fail-migration/nll/loan_ends_mid_block_vec.rs b/src/test/ui/nll/loan_ends_mid_block_vec.rs similarity index 100% rename from src/test/ui/compile-fail-migration/nll/loan_ends_mid_block_vec.rs rename to src/test/ui/nll/loan_ends_mid_block_vec.rs diff --git a/src/test/ui/compile-fail-migration/nll/loan_ends_mid_block_vec.stderr b/src/test/ui/nll/loan_ends_mid_block_vec.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nll/loan_ends_mid_block_vec.stderr rename to src/test/ui/nll/loan_ends_mid_block_vec.stderr diff --git a/src/test/ui/compile-fail-migration/nll/match-guards-always-borrow.ast.nll.stderr b/src/test/ui/nll/match-guards-always-borrow.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nll/match-guards-always-borrow.ast.nll.stderr rename to src/test/ui/nll/match-guards-always-borrow.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/nll/match-guards-always-borrow.ast.stderr b/src/test/ui/nll/match-guards-always-borrow.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nll/match-guards-always-borrow.ast.stderr rename to src/test/ui/nll/match-guards-always-borrow.ast.stderr diff --git a/src/test/ui/compile-fail-migration/nll/match-guards-always-borrow.mir.stderr b/src/test/ui/nll/match-guards-always-borrow.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nll/match-guards-always-borrow.mir.stderr rename to src/test/ui/nll/match-guards-always-borrow.mir.stderr diff --git a/src/test/ui/compile-fail-migration/nll/match-guards-always-borrow.rs b/src/test/ui/nll/match-guards-always-borrow.rs similarity index 100% rename from src/test/ui/compile-fail-migration/nll/match-guards-always-borrow.rs rename to src/test/ui/nll/match-guards-always-borrow.rs diff --git a/src/test/ui/compile-fail-migration/nll/reference-carried-through-struct-field.ast.nll.stderr b/src/test/ui/nll/reference-carried-through-struct-field.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nll/reference-carried-through-struct-field.ast.nll.stderr rename to src/test/ui/nll/reference-carried-through-struct-field.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/nll/reference-carried-through-struct-field.ast.stderr b/src/test/ui/nll/reference-carried-through-struct-field.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nll/reference-carried-through-struct-field.ast.stderr rename to src/test/ui/nll/reference-carried-through-struct-field.ast.stderr diff --git a/src/test/ui/compile-fail-migration/nll/reference-carried-through-struct-field.mir.stderr b/src/test/ui/nll/reference-carried-through-struct-field.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nll/reference-carried-through-struct-field.mir.stderr rename to src/test/ui/nll/reference-carried-through-struct-field.mir.stderr diff --git a/src/test/ui/compile-fail-migration/nll/reference-carried-through-struct-field.rs b/src/test/ui/nll/reference-carried-through-struct-field.rs similarity index 100% rename from src/test/ui/compile-fail-migration/nll/reference-carried-through-struct-field.rs rename to src/test/ui/nll/reference-carried-through-struct-field.rs diff --git a/src/test/ui/compile-fail-migration/nll/region-ends-after-if-condition.nll.stderr b/src/test/ui/nll/region-ends-after-if-condition.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nll/region-ends-after-if-condition.nll.stderr rename to src/test/ui/nll/region-ends-after-if-condition.nll.stderr diff --git a/src/test/ui/compile-fail-migration/nll/region-ends-after-if-condition.rs b/src/test/ui/nll/region-ends-after-if-condition.rs similarity index 100% rename from src/test/ui/compile-fail-migration/nll/region-ends-after-if-condition.rs rename to src/test/ui/nll/region-ends-after-if-condition.rs diff --git a/src/test/ui/compile-fail-migration/nll/region-ends-after-if-condition.stderr b/src/test/ui/nll/region-ends-after-if-condition.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nll/region-ends-after-if-condition.stderr rename to src/test/ui/nll/region-ends-after-if-condition.stderr diff --git a/src/test/ui/compile-fail-migration/nll/return_from_loop.rs b/src/test/ui/nll/return_from_loop.rs similarity index 100% rename from src/test/ui/compile-fail-migration/nll/return_from_loop.rs rename to src/test/ui/nll/return_from_loop.rs diff --git a/src/test/ui/compile-fail-migration/nll/return_from_loop.stderr b/src/test/ui/nll/return_from_loop.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nll/return_from_loop.stderr rename to src/test/ui/nll/return_from_loop.stderr diff --git a/src/test/ui/compile-fail-migration/nll/unused-mut-issue-50343.rs b/src/test/ui/nll/unused-mut-issue-50343.rs similarity index 100% rename from src/test/ui/compile-fail-migration/nll/unused-mut-issue-50343.rs rename to src/test/ui/nll/unused-mut-issue-50343.rs diff --git a/src/test/ui/compile-fail-migration/nll/unused-mut-issue-50343.stderr b/src/test/ui/nll/unused-mut-issue-50343.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nll/unused-mut-issue-50343.stderr rename to src/test/ui/nll/unused-mut-issue-50343.stderr diff --git a/src/test/ui/compile-fail-migration/nll/where_clauses_in_functions.rs b/src/test/ui/nll/where_clauses_in_functions.rs similarity index 100% rename from src/test/ui/compile-fail-migration/nll/where_clauses_in_functions.rs rename to src/test/ui/nll/where_clauses_in_functions.rs diff --git a/src/test/ui/compile-fail-migration/nll/where_clauses_in_functions.stderr b/src/test/ui/nll/where_clauses_in_functions.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nll/where_clauses_in_functions.stderr rename to src/test/ui/nll/where_clauses_in_functions.stderr diff --git a/src/test/ui/compile-fail-migration/nll/where_clauses_in_structs.rs b/src/test/ui/nll/where_clauses_in_structs.rs similarity index 100% rename from src/test/ui/compile-fail-migration/nll/where_clauses_in_structs.rs rename to src/test/ui/nll/where_clauses_in_structs.rs diff --git a/src/test/ui/compile-fail-migration/nll/where_clauses_in_structs.stderr b/src/test/ui/nll/where_clauses_in_structs.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nll/where_clauses_in_structs.stderr rename to src/test/ui/nll/where_clauses_in_structs.stderr diff --git a/src/test/ui/compile-fail-migration/no-capture-arc.nll.stderr b/src/test/ui/no-capture-arc.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no-capture-arc.nll.stderr rename to src/test/ui/no-capture-arc.nll.stderr diff --git a/src/test/ui/compile-fail-migration/no-capture-arc.rs b/src/test/ui/no-capture-arc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no-capture-arc.rs rename to src/test/ui/no-capture-arc.rs diff --git a/src/test/ui/compile-fail-migration/no-capture-arc.stderr b/src/test/ui/no-capture-arc.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no-capture-arc.stderr rename to src/test/ui/no-capture-arc.stderr diff --git a/src/test/ui/compile-fail-migration/no-implicit-prelude-nested.rs b/src/test/ui/no-implicit-prelude-nested.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no-implicit-prelude-nested.rs rename to src/test/ui/no-implicit-prelude-nested.rs diff --git a/src/test/ui/compile-fail-migration/no-implicit-prelude-nested.stderr b/src/test/ui/no-implicit-prelude-nested.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no-implicit-prelude-nested.stderr rename to src/test/ui/no-implicit-prelude-nested.stderr diff --git a/src/test/ui/compile-fail-migration/no-implicit-prelude.rs b/src/test/ui/no-implicit-prelude.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no-implicit-prelude.rs rename to src/test/ui/no-implicit-prelude.rs diff --git a/src/test/ui/compile-fail-migration/no-implicit-prelude.stderr b/src/test/ui/no-implicit-prelude.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no-implicit-prelude.stderr rename to src/test/ui/no-implicit-prelude.stderr diff --git a/src/test/ui/compile-fail-migration/no-link.rs b/src/test/ui/no-link.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no-link.rs rename to src/test/ui/no-link.rs diff --git a/src/test/ui/compile-fail-migration/no-link.stderr b/src/test/ui/no-link.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no-link.stderr rename to src/test/ui/no-link.stderr diff --git a/src/test/ui/compile-fail-migration/no-patterns-in-args-2.rs b/src/test/ui/no-patterns-in-args-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no-patterns-in-args-2.rs rename to src/test/ui/no-patterns-in-args-2.rs diff --git a/src/test/ui/compile-fail-migration/no-patterns-in-args-2.stderr b/src/test/ui/no-patterns-in-args-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no-patterns-in-args-2.stderr rename to src/test/ui/no-patterns-in-args-2.stderr diff --git a/src/test/ui/compile-fail-migration/no-patterns-in-args-macro.rs b/src/test/ui/no-patterns-in-args-macro.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no-patterns-in-args-macro.rs rename to src/test/ui/no-patterns-in-args-macro.rs diff --git a/src/test/ui/compile-fail-migration/no-patterns-in-args-macro.stderr b/src/test/ui/no-patterns-in-args-macro.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no-patterns-in-args-macro.stderr rename to src/test/ui/no-patterns-in-args-macro.stderr diff --git a/src/test/ui/compile-fail-migration/no-reuse-move-arc.nll.stderr b/src/test/ui/no-reuse-move-arc.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no-reuse-move-arc.nll.stderr rename to src/test/ui/no-reuse-move-arc.nll.stderr diff --git a/src/test/ui/compile-fail-migration/no-reuse-move-arc.rs b/src/test/ui/no-reuse-move-arc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no-reuse-move-arc.rs rename to src/test/ui/no-reuse-move-arc.rs diff --git a/src/test/ui/compile-fail-migration/no-reuse-move-arc.stderr b/src/test/ui/no-reuse-move-arc.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no-reuse-move-arc.stderr rename to src/test/ui/no-reuse-move-arc.stderr diff --git a/src/test/ui/compile-fail-migration/no-send-res-ports.rs b/src/test/ui/no-send-res-ports.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no-send-res-ports.rs rename to src/test/ui/no-send-res-ports.rs diff --git a/src/test/ui/compile-fail-migration/no-send-res-ports.stderr b/src/test/ui/no-send-res-ports.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no-send-res-ports.stderr rename to src/test/ui/no-send-res-ports.stderr diff --git a/src/test/ui/compile-fail-migration/no-std-inject.rs b/src/test/ui/no-std-inject.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no-std-inject.rs rename to src/test/ui/no-std-inject.rs diff --git a/src/test/ui/compile-fail-migration/no-std-inject.stderr b/src/test/ui/no-std-inject.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no-std-inject.stderr rename to src/test/ui/no-std-inject.stderr diff --git a/src/test/ui/compile-fail-migration/no-type-for-node-ice.rs b/src/test/ui/no-type-for-node-ice.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no-type-for-node-ice.rs rename to src/test/ui/no-type-for-node-ice.rs diff --git a/src/test/ui/compile-fail-migration/no-type-for-node-ice.stderr b/src/test/ui/no-type-for-node-ice.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no-type-for-node-ice.stderr rename to src/test/ui/no-type-for-node-ice.stderr diff --git a/src/test/ui/compile-fail-migration/no-warn-on-field-replace-issue-34101.rs b/src/test/ui/no-warn-on-field-replace-issue-34101.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no-warn-on-field-replace-issue-34101.rs rename to src/test/ui/no-warn-on-field-replace-issue-34101.rs diff --git a/src/test/ui/compile-fail-migration/no-warn-on-field-replace-issue-34101.stderr b/src/test/ui/no-warn-on-field-replace-issue-34101.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no-warn-on-field-replace-issue-34101.stderr rename to src/test/ui/no-warn-on-field-replace-issue-34101.stderr diff --git a/src/test/ui/compile-fail-migration/no_crate_type.rs b/src/test/ui/no_crate_type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no_crate_type.rs rename to src/test/ui/no_crate_type.rs diff --git a/src/test/ui/compile-fail-migration/no_crate_type.stderr b/src/test/ui/no_crate_type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no_crate_type.stderr rename to src/test/ui/no_crate_type.stderr diff --git a/src/test/ui/compile-fail-migration/no_owned_box_lang_item.rs b/src/test/ui/no_owned_box_lang_item.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no_owned_box_lang_item.rs rename to src/test/ui/no_owned_box_lang_item.rs diff --git a/src/test/ui/compile-fail-migration/no_owned_box_lang_item.stderr b/src/test/ui/no_owned_box_lang_item.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no_owned_box_lang_item.stderr rename to src/test/ui/no_owned_box_lang_item.stderr diff --git a/src/test/ui/compile-fail-migration/no_send-enum.rs b/src/test/ui/no_send-enum.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no_send-enum.rs rename to src/test/ui/no_send-enum.rs diff --git a/src/test/ui/compile-fail-migration/no_send-enum.stderr b/src/test/ui/no_send-enum.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no_send-enum.stderr rename to src/test/ui/no_send-enum.stderr diff --git a/src/test/ui/compile-fail-migration/no_send-rc.rs b/src/test/ui/no_send-rc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no_send-rc.rs rename to src/test/ui/no_send-rc.rs diff --git a/src/test/ui/compile-fail-migration/no_send-rc.stderr b/src/test/ui/no_send-rc.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no_send-rc.stderr rename to src/test/ui/no_send-rc.stderr diff --git a/src/test/ui/compile-fail-migration/no_send-struct.rs b/src/test/ui/no_send-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no_send-struct.rs rename to src/test/ui/no_send-struct.rs diff --git a/src/test/ui/compile-fail-migration/no_send-struct.stderr b/src/test/ui/no_send-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no_send-struct.stderr rename to src/test/ui/no_send-struct.stderr diff --git a/src/test/ui/compile-fail-migration/no_share-enum.rs b/src/test/ui/no_share-enum.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no_share-enum.rs rename to src/test/ui/no_share-enum.rs diff --git a/src/test/ui/compile-fail-migration/no_share-enum.stderr b/src/test/ui/no_share-enum.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no_share-enum.stderr rename to src/test/ui/no_share-enum.stderr diff --git a/src/test/ui/compile-fail-migration/no_share-struct.rs b/src/test/ui/no_share-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/no_share-struct.rs rename to src/test/ui/no_share-struct.rs diff --git a/src/test/ui/compile-fail-migration/no_share-struct.stderr b/src/test/ui/no_share-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/no_share-struct.stderr rename to src/test/ui/no_share-struct.stderr diff --git a/src/test/ui/compile-fail-migration/noexporttypeexe.rs b/src/test/ui/noexporttypeexe.rs similarity index 100% rename from src/test/ui/compile-fail-migration/noexporttypeexe.rs rename to src/test/ui/noexporttypeexe.rs diff --git a/src/test/ui/compile-fail-migration/noexporttypeexe.stderr b/src/test/ui/noexporttypeexe.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/noexporttypeexe.stderr rename to src/test/ui/noexporttypeexe.stderr diff --git a/src/test/ui/nolink-with-link-args.nll.stderr b/src/test/ui/nolink-with-link-args.nll.stderr new file mode 100644 index 00000000000..050c604e178 --- /dev/null +++ b/src/test/ui/nolink-with-link-args.nll.stderr @@ -0,0 +1,9 @@ +error: linking with `ld` failed: exit code: 1 + | + = note: "ld" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/nolink-with-link-args.nll/a.nolink_with_link_args0-317d481089b8c8fe83113de504472633.rs.rcgu.o" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/nolink-with-link-args.nll/a.nolink_with_link_args1-317d481089b8c8fe83113de504472633.rs.rcgu.o" "-o" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/nolink-with-link-args.nll/a" "--gc-sections" "-pie" "-zrelro" "-znow" "-O1" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/nolink-with-link-args.nll/auxiliary" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--start-group" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-lstd-41f43a30bc296e4f" "--end-group" "-Bstatic" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-ce73107aecc35a63.rlib" "-Bdynamic" "-ldl" "-lrt" "-lpthread" "-lpthread" "-lgcc_s" "-lc" "-lm" "-lrt" "-lpthread" "-lutil" "-lutil" "-Wl,-rpath,$ORIGIN/../../../stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-Wl,-rpath,/home/david/projects/rust/workdirs/rust1/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-Wl,--enable-new-dtags" "aFdEfSeVEEE" + = note: ld: unrecognized option '-Wl,-rpath,$ORIGIN/../../../stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib' + ld: use the --help option for usage information + + +error: aborting due to previous error + diff --git a/src/test/ui/compile-fail-migration/nolink-with-link-args.rs b/src/test/ui/nolink-with-link-args.rs similarity index 100% rename from src/test/ui/compile-fail-migration/nolink-with-link-args.rs rename to src/test/ui/nolink-with-link-args.rs diff --git a/src/test/ui/nolink-with-link-args.stderr b/src/test/ui/nolink-with-link-args.stderr new file mode 100644 index 00000000000..a80d1dce485 --- /dev/null +++ b/src/test/ui/nolink-with-link-args.stderr @@ -0,0 +1,9 @@ +error: linking with `ld` failed: exit code: 1 + | + = note: "ld" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/nolink-with-link-args/a.nolink_with_link_args0-317d481089b8c8fe83113de504472633.rs.rcgu.o" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/nolink-with-link-args/a.nolink_with_link_args1-317d481089b8c8fe83113de504472633.rs.rcgu.o" "-o" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/nolink-with-link-args/a" "--gc-sections" "-pie" "-zrelro" "-znow" "-O1" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/test/ui/nolink-with-link-args/auxiliary" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--start-group" "-L" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-lstd-41f43a30bc296e4f" "--end-group" "-Bstatic" "/home/david/projects/rust/workdirs/rust1/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-ce73107aecc35a63.rlib" "-Bdynamic" "-ldl" "-lrt" "-lpthread" "-lpthread" "-lgcc_s" "-lc" "-lm" "-lrt" "-lpthread" "-lutil" "-lutil" "-Wl,-rpath,$ORIGIN/../../../stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-Wl,-rpath,/home/david/projects/rust/workdirs/rust1/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-Wl,--enable-new-dtags" "aFdEfSeVEEE" + = note: ld: unrecognized option '-Wl,-rpath,$ORIGIN/../../../stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib' + ld: use the --help option for usage information + + +error: aborting due to previous error + diff --git a/src/test/ui/compile-fail-migration/non-constant-in-const-path.rs b/src/test/ui/non-constant-in-const-path.rs similarity index 100% rename from src/test/ui/compile-fail-migration/non-constant-in-const-path.rs rename to src/test/ui/non-constant-in-const-path.rs diff --git a/src/test/ui/compile-fail-migration/non-constant-in-const-path.stderr b/src/test/ui/non-constant-in-const-path.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/non-constant-in-const-path.stderr rename to src/test/ui/non-constant-in-const-path.stderr diff --git a/src/test/ui/compile-fail-migration/non-copyable-void.rs b/src/test/ui/non-copyable-void.rs similarity index 100% rename from src/test/ui/compile-fail-migration/non-copyable-void.rs rename to src/test/ui/non-copyable-void.rs diff --git a/src/test/ui/compile-fail-migration/non-copyable-void.stderr b/src/test/ui/non-copyable-void.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/non-copyable-void.stderr rename to src/test/ui/non-copyable-void.stderr diff --git a/src/test/ui/compile-fail-migration/non-exhaustive-match-nested.rs b/src/test/ui/non-exhaustive/non-exhaustive-match-nested.rs similarity index 100% rename from src/test/ui/compile-fail-migration/non-exhaustive-match-nested.rs rename to src/test/ui/non-exhaustive/non-exhaustive-match-nested.rs diff --git a/src/test/ui/compile-fail-migration/non-exhaustive-match-nested.stderr b/src/test/ui/non-exhaustive/non-exhaustive-match-nested.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/non-exhaustive-match-nested.stderr rename to src/test/ui/non-exhaustive/non-exhaustive-match-nested.stderr diff --git a/src/test/ui/compile-fail-migration/non-exhaustive-match.rs b/src/test/ui/non-exhaustive/non-exhaustive-match.rs similarity index 100% rename from src/test/ui/compile-fail-migration/non-exhaustive-match.rs rename to src/test/ui/non-exhaustive/non-exhaustive-match.rs diff --git a/src/test/ui/compile-fail-migration/non-exhaustive-match.stderr b/src/test/ui/non-exhaustive/non-exhaustive-match.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/non-exhaustive-match.stderr rename to src/test/ui/non-exhaustive/non-exhaustive-match.stderr diff --git a/src/test/ui/non-exhaustive-pattern-witness.rs b/src/test/ui/non-exhaustive/non-exhaustive-pattern-witness.rs similarity index 100% rename from src/test/ui/non-exhaustive-pattern-witness.rs rename to src/test/ui/non-exhaustive/non-exhaustive-pattern-witness.rs diff --git a/src/test/ui/non-exhaustive-pattern-witness.stderr b/src/test/ui/non-exhaustive/non-exhaustive-pattern-witness.stderr similarity index 100% rename from src/test/ui/non-exhaustive-pattern-witness.stderr rename to src/test/ui/non-exhaustive/non-exhaustive-pattern-witness.stderr diff --git a/src/test/ui/compile-fail-migration/non-interger-atomic.rs b/src/test/ui/non-interger-atomic.rs similarity index 100% rename from src/test/ui/compile-fail-migration/non-interger-atomic.rs rename to src/test/ui/non-interger-atomic.rs diff --git a/src/test/ui/compile-fail-migration/non-interger-atomic.stderr b/src/test/ui/non-interger-atomic.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/non-interger-atomic.stderr rename to src/test/ui/non-interger-atomic.stderr diff --git a/src/test/ui/compile-fail-migration/noncopyable-class.rs b/src/test/ui/noncopyable-class.rs similarity index 100% rename from src/test/ui/compile-fail-migration/noncopyable-class.rs rename to src/test/ui/noncopyable-class.rs diff --git a/src/test/ui/compile-fail-migration/noncopyable-class.stderr b/src/test/ui/noncopyable-class.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/noncopyable-class.stderr rename to src/test/ui/noncopyable-class.stderr diff --git a/src/test/ui/compile-fail-migration/nonscalar-cast.rs b/src/test/ui/nonscalar-cast.rs similarity index 100% rename from src/test/ui/compile-fail-migration/nonscalar-cast.rs rename to src/test/ui/nonscalar-cast.rs diff --git a/src/test/ui/compile-fail-migration/nonscalar-cast.stderr b/src/test/ui/nonscalar-cast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/nonscalar-cast.stderr rename to src/test/ui/nonscalar-cast.stderr diff --git a/src/test/ui/compile-fail-migration/not-clone-closure.rs b/src/test/ui/not-clone-closure.rs similarity index 100% rename from src/test/ui/compile-fail-migration/not-clone-closure.rs rename to src/test/ui/not-clone-closure.rs diff --git a/src/test/ui/compile-fail-migration/not-clone-closure.stderr b/src/test/ui/not-clone-closure.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/not-clone-closure.stderr rename to src/test/ui/not-clone-closure.stderr diff --git a/src/test/ui/compile-fail-migration/not-copy-closure.nll.stderr b/src/test/ui/not-copy-closure.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/not-copy-closure.nll.stderr rename to src/test/ui/not-copy-closure.nll.stderr diff --git a/src/test/ui/compile-fail-migration/not-copy-closure.rs b/src/test/ui/not-copy-closure.rs similarity index 100% rename from src/test/ui/compile-fail-migration/not-copy-closure.rs rename to src/test/ui/not-copy-closure.rs diff --git a/src/test/ui/compile-fail-migration/not-copy-closure.stderr b/src/test/ui/not-copy-closure.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/not-copy-closure.stderr rename to src/test/ui/not-copy-closure.stderr diff --git a/src/test/ui/compile-fail-migration/not-panic-safe-2.rs b/src/test/ui/not-panic/not-panic-safe-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/not-panic-safe-2.rs rename to src/test/ui/not-panic/not-panic-safe-2.rs diff --git a/src/test/ui/compile-fail-migration/not-panic-safe-2.stderr b/src/test/ui/not-panic/not-panic-safe-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/not-panic-safe-2.stderr rename to src/test/ui/not-panic/not-panic-safe-2.stderr diff --git a/src/test/ui/compile-fail-migration/not-panic-safe-3.rs b/src/test/ui/not-panic/not-panic-safe-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/not-panic-safe-3.rs rename to src/test/ui/not-panic/not-panic-safe-3.rs diff --git a/src/test/ui/compile-fail-migration/not-panic-safe-3.stderr b/src/test/ui/not-panic/not-panic-safe-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/not-panic-safe-3.stderr rename to src/test/ui/not-panic/not-panic-safe-3.stderr diff --git a/src/test/ui/compile-fail-migration/not-panic-safe-4.rs b/src/test/ui/not-panic/not-panic-safe-4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/not-panic-safe-4.rs rename to src/test/ui/not-panic/not-panic-safe-4.rs diff --git a/src/test/ui/compile-fail-migration/not-panic-safe-4.stderr b/src/test/ui/not-panic/not-panic-safe-4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/not-panic-safe-4.stderr rename to src/test/ui/not-panic/not-panic-safe-4.stderr diff --git a/src/test/ui/compile-fail-migration/not-panic-safe-5.rs b/src/test/ui/not-panic/not-panic-safe-5.rs similarity index 100% rename from src/test/ui/compile-fail-migration/not-panic-safe-5.rs rename to src/test/ui/not-panic/not-panic-safe-5.rs diff --git a/src/test/ui/compile-fail-migration/not-panic-safe-5.stderr b/src/test/ui/not-panic/not-panic-safe-5.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/not-panic-safe-5.stderr rename to src/test/ui/not-panic/not-panic-safe-5.stderr diff --git a/src/test/ui/compile-fail-migration/not-panic-safe-6.rs b/src/test/ui/not-panic/not-panic-safe-6.rs similarity index 100% rename from src/test/ui/compile-fail-migration/not-panic-safe-6.rs rename to src/test/ui/not-panic/not-panic-safe-6.rs diff --git a/src/test/ui/compile-fail-migration/not-panic-safe-6.stderr b/src/test/ui/not-panic/not-panic-safe-6.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/not-panic-safe-6.stderr rename to src/test/ui/not-panic/not-panic-safe-6.stderr diff --git a/src/test/ui/compile-fail-migration/not-panic-safe.rs b/src/test/ui/not-panic/not-panic-safe.rs similarity index 100% rename from src/test/ui/compile-fail-migration/not-panic-safe.rs rename to src/test/ui/not-panic/not-panic-safe.rs diff --git a/src/test/ui/compile-fail-migration/not-panic-safe.stderr b/src/test/ui/not-panic/not-panic-safe.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/not-panic-safe.stderr rename to src/test/ui/not-panic/not-panic-safe.stderr diff --git a/src/test/ui/compile-fail-migration/not-sync.rs b/src/test/ui/not-sync.rs similarity index 100% rename from src/test/ui/compile-fail-migration/not-sync.rs rename to src/test/ui/not-sync.rs diff --git a/src/test/ui/compile-fail-migration/not-sync.stderr b/src/test/ui/not-sync.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/not-sync.stderr rename to src/test/ui/not-sync.stderr diff --git a/src/test/ui/compile-fail-migration/not-utf8.bin b/src/test/ui/not-utf8.bin similarity index 100% rename from src/test/ui/compile-fail-migration/not-utf8.bin rename to src/test/ui/not-utf8.bin diff --git a/src/test/ui/compile-fail-migration/not-utf8.rs b/src/test/ui/not-utf8.rs similarity index 100% rename from src/test/ui/compile-fail-migration/not-utf8.rs rename to src/test/ui/not-utf8.rs diff --git a/src/test/ui/compile-fail-migration/not-utf8.stderr b/src/test/ui/not-utf8.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/not-utf8.stderr rename to src/test/ui/not-utf8.stderr diff --git a/src/test/ui/numeric-cast-2.rs b/src/test/ui/numeric/numeric-cast-2.rs similarity index 100% rename from src/test/ui/numeric-cast-2.rs rename to src/test/ui/numeric/numeric-cast-2.rs diff --git a/src/test/ui/numeric-cast-2.stderr b/src/test/ui/numeric/numeric-cast-2.stderr similarity index 100% rename from src/test/ui/numeric-cast-2.stderr rename to src/test/ui/numeric/numeric-cast-2.stderr diff --git a/src/test/ui/numeric-cast.rs b/src/test/ui/numeric/numeric-cast.rs similarity index 100% rename from src/test/ui/numeric-cast.rs rename to src/test/ui/numeric/numeric-cast.rs diff --git a/src/test/ui/numeric-cast.stderr b/src/test/ui/numeric/numeric-cast.stderr similarity index 100% rename from src/test/ui/numeric-cast.stderr rename to src/test/ui/numeric/numeric-cast.stderr diff --git a/src/test/ui/numeric-fields.rs b/src/test/ui/numeric/numeric-fields.rs similarity index 100% rename from src/test/ui/numeric-fields.rs rename to src/test/ui/numeric/numeric-fields.rs diff --git a/src/test/ui/numeric-fields.stderr b/src/test/ui/numeric/numeric-fields.stderr similarity index 100% rename from src/test/ui/numeric-fields.stderr rename to src/test/ui/numeric/numeric-fields.stderr diff --git a/src/test/ui/compile-fail-migration/object-does-not-impl-trait.rs b/src/test/ui/object-does-not-impl-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/object-does-not-impl-trait.rs rename to src/test/ui/object-does-not-impl-trait.rs diff --git a/src/test/ui/compile-fail-migration/object-does-not-impl-trait.stderr b/src/test/ui/object-does-not-impl-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-does-not-impl-trait.stderr rename to src/test/ui/object-does-not-impl-trait.stderr diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default-ambiguous.rs b/src/test/ui/object-lifetime/object-lifetime-default-ambiguous.rs similarity index 100% rename from src/test/ui/compile-fail-migration/object-lifetime-default-ambiguous.rs rename to src/test/ui/object-lifetime/object-lifetime-default-ambiguous.rs diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default-ambiguous.stderr b/src/test/ui/object-lifetime/object-lifetime-default-ambiguous.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-lifetime-default-ambiguous.stderr rename to src/test/ui/object-lifetime/object-lifetime-default-ambiguous.stderr diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default-elision.nll.stderr b/src/test/ui/object-lifetime/object-lifetime-default-elision.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-lifetime-default-elision.nll.stderr rename to src/test/ui/object-lifetime/object-lifetime-default-elision.nll.stderr diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default-elision.rs b/src/test/ui/object-lifetime/object-lifetime-default-elision.rs similarity index 100% rename from src/test/ui/compile-fail-migration/object-lifetime-default-elision.rs rename to src/test/ui/object-lifetime/object-lifetime-default-elision.rs diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default-elision.stderr b/src/test/ui/object-lifetime/object-lifetime-default-elision.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-lifetime-default-elision.stderr rename to src/test/ui/object-lifetime/object-lifetime-default-elision.stderr diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default-from-box-error.nll.stderr b/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-lifetime-default-from-box-error.nll.stderr rename to src/test/ui/object-lifetime/object-lifetime-default-from-box-error.nll.stderr diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default-from-box-error.rs b/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.rs similarity index 100% rename from src/test/ui/compile-fail-migration/object-lifetime-default-from-box-error.rs rename to src/test/ui/object-lifetime/object-lifetime-default-from-box-error.rs diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default-from-box-error.stderr b/src/test/ui/object-lifetime/object-lifetime-default-from-box-error.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-lifetime-default-from-box-error.stderr rename to src/test/ui/object-lifetime/object-lifetime-default-from-box-error.stderr diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default-from-rptr-box-error.nll.stderr b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-lifetime-default-from-rptr-box-error.nll.stderr rename to src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.nll.stderr diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default-from-rptr-box-error.rs b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.rs similarity index 100% rename from src/test/ui/compile-fail-migration/object-lifetime-default-from-rptr-box-error.rs rename to src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.rs diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default-from-rptr-box-error.stderr b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-lifetime-default-from-rptr-box-error.stderr rename to src/test/ui/object-lifetime/object-lifetime-default-from-rptr-box-error.stderr diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default-from-rptr-struct-error.nll.stderr b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-lifetime-default-from-rptr-struct-error.nll.stderr rename to src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.nll.stderr diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default-from-rptr-struct-error.rs b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.rs similarity index 100% rename from src/test/ui/compile-fail-migration/object-lifetime-default-from-rptr-struct-error.rs rename to src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.rs diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default-from-rptr-struct-error.stderr b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-lifetime-default-from-rptr-struct-error.stderr rename to src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.stderr diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default-mybox.nll.stderr b/src/test/ui/object-lifetime/object-lifetime-default-mybox.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-lifetime-default-mybox.nll.stderr rename to src/test/ui/object-lifetime/object-lifetime-default-mybox.nll.stderr diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default-mybox.rs b/src/test/ui/object-lifetime/object-lifetime-default-mybox.rs similarity index 100% rename from src/test/ui/compile-fail-migration/object-lifetime-default-mybox.rs rename to src/test/ui/object-lifetime/object-lifetime-default-mybox.rs diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default-mybox.stderr b/src/test/ui/object-lifetime/object-lifetime-default-mybox.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-lifetime-default-mybox.stderr rename to src/test/ui/object-lifetime/object-lifetime-default-mybox.stderr diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default.rs b/src/test/ui/object-lifetime/object-lifetime-default.rs similarity index 97% rename from src/test/ui/compile-fail-migration/object-lifetime-default.rs rename to src/test/ui/object-lifetime/object-lifetime-default.rs index 104e10f3207..746a656edb4 100644 --- a/src/test/ui/compile-fail-migration/object-lifetime-default.rs +++ b/src/test/ui/object-lifetime/object-lifetime-default.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-compare-mode-nll + #![feature(rustc_attrs)] #[rustc_object_lifetime_default] diff --git a/src/test/ui/compile-fail-migration/object-lifetime-default.stderr b/src/test/ui/object-lifetime/object-lifetime-default.stderr similarity index 73% rename from src/test/ui/compile-fail-migration/object-lifetime-default.stderr rename to src/test/ui/object-lifetime/object-lifetime-default.stderr index a7ff6cfd772..567ab72e56a 100644 --- a/src/test/ui/compile-fail-migration/object-lifetime-default.stderr +++ b/src/test/ui/object-lifetime/object-lifetime-default.stderr @@ -1,41 +1,41 @@ error: BaseDefault - --> $DIR/object-lifetime-default.rs:14:1 + --> $DIR/object-lifetime-default.rs:16:1 | LL | struct A(T); //~ ERROR BaseDefault | ^^^^^^^^^^^^^^^ error: BaseDefault - --> $DIR/object-lifetime-default.rs:17:1 + --> $DIR/object-lifetime-default.rs:19:1 | LL | struct B<'a,T>(&'a (), T); //~ ERROR BaseDefault | ^^^^^^^^^^^^^^^^^^^^^^^^^^ error: 'a - --> $DIR/object-lifetime-default.rs:20:1 + --> $DIR/object-lifetime-default.rs:22:1 | LL | struct C<'a,T:'a>(&'a T); //~ ERROR 'a | ^^^^^^^^^^^^^^^^^^^^^^^^^ error: Ambiguous - --> $DIR/object-lifetime-default.rs:23:1 + --> $DIR/object-lifetime-default.rs:25:1 | LL | struct D<'a,'b,T:'a+'b>(&'a T, &'b T); //~ ERROR Ambiguous | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: 'b - --> $DIR/object-lifetime-default.rs:26:1 + --> $DIR/object-lifetime-default.rs:28:1 | LL | struct E<'a,'b:'a,T:'b>(&'a T, &'b T); //~ ERROR 'b | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: 'a,'b - --> $DIR/object-lifetime-default.rs:29:1 + --> $DIR/object-lifetime-default.rs:31:1 | LL | struct F<'a,'b,T:'a,U:'b>(&'a T, &'b U); //~ ERROR 'a,'b | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: 'a,Ambiguous - --> $DIR/object-lifetime-default.rs:32:1 + --> $DIR/object-lifetime-default.rs:34:1 | LL | struct G<'a,'b,T:'a,U:'a+'b>(&'a T, &'b U); //~ ERROR 'a,Ambiguous | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/compile-fail-migration/object-pointer-types.rs b/src/test/ui/object-pointer-types.rs similarity index 100% rename from src/test/ui/compile-fail-migration/object-pointer-types.rs rename to src/test/ui/object-pointer-types.rs diff --git a/src/test/ui/compile-fail-migration/object-pointer-types.stderr b/src/test/ui/object-pointer-types.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-pointer-types.stderr rename to src/test/ui/object-pointer-types.stderr diff --git a/src/test/ui/object-safety-associated-consts.rs b/src/test/ui/object-safety/object-safety-associated-consts.rs similarity index 100% rename from src/test/ui/object-safety-associated-consts.rs rename to src/test/ui/object-safety/object-safety-associated-consts.rs diff --git a/src/test/ui/object-safety-associated-consts.stderr b/src/test/ui/object-safety/object-safety-associated-consts.stderr similarity index 100% rename from src/test/ui/object-safety-associated-consts.stderr rename to src/test/ui/object-safety/object-safety-associated-consts.stderr diff --git a/src/test/ui/compile-fail-migration/object-safety-by-value-self-use.nll.stderr b/src/test/ui/object-safety/object-safety-by-value-self-use.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-safety-by-value-self-use.nll.stderr rename to src/test/ui/object-safety/object-safety-by-value-self-use.nll.stderr diff --git a/src/test/ui/compile-fail-migration/object-safety-by-value-self-use.rs b/src/test/ui/object-safety/object-safety-by-value-self-use.rs similarity index 100% rename from src/test/ui/compile-fail-migration/object-safety-by-value-self-use.rs rename to src/test/ui/object-safety/object-safety-by-value-self-use.rs diff --git a/src/test/ui/compile-fail-migration/object-safety-by-value-self-use.stderr b/src/test/ui/object-safety/object-safety-by-value-self-use.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-safety-by-value-self-use.stderr rename to src/test/ui/object-safety/object-safety-by-value-self-use.stderr diff --git a/src/test/ui/compile-fail-migration/object-safety-by-value-self.rs b/src/test/ui/object-safety/object-safety-by-value-self.rs similarity index 100% rename from src/test/ui/compile-fail-migration/object-safety-by-value-self.rs rename to src/test/ui/object-safety/object-safety-by-value-self.rs diff --git a/src/test/ui/compile-fail-migration/object-safety-by-value-self.stderr b/src/test/ui/object-safety/object-safety-by-value-self.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-safety-by-value-self.stderr rename to src/test/ui/object-safety/object-safety-by-value-self.stderr diff --git a/src/test/ui/object-safety-generics.rs b/src/test/ui/object-safety/object-safety-generics.rs similarity index 100% rename from src/test/ui/object-safety-generics.rs rename to src/test/ui/object-safety/object-safety-generics.rs diff --git a/src/test/ui/object-safety-generics.stderr b/src/test/ui/object-safety/object-safety-generics.stderr similarity index 100% rename from src/test/ui/object-safety-generics.stderr rename to src/test/ui/object-safety/object-safety-generics.stderr diff --git a/src/test/ui/compile-fail-migration/object-safety-issue-22040.rs b/src/test/ui/object-safety/object-safety-issue-22040.rs similarity index 100% rename from src/test/ui/compile-fail-migration/object-safety-issue-22040.rs rename to src/test/ui/object-safety/object-safety-issue-22040.rs diff --git a/src/test/ui/compile-fail-migration/object-safety-issue-22040.stderr b/src/test/ui/object-safety/object-safety-issue-22040.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-safety-issue-22040.stderr rename to src/test/ui/object-safety/object-safety-issue-22040.stderr diff --git a/src/test/ui/object-safety-mentions-Self.rs b/src/test/ui/object-safety/object-safety-mentions-Self.rs similarity index 100% rename from src/test/ui/object-safety-mentions-Self.rs rename to src/test/ui/object-safety/object-safety-mentions-Self.rs diff --git a/src/test/ui/object-safety-mentions-Self.stderr b/src/test/ui/object-safety/object-safety-mentions-Self.stderr similarity index 100% rename from src/test/ui/object-safety-mentions-Self.stderr rename to src/test/ui/object-safety/object-safety-mentions-Self.stderr diff --git a/src/test/ui/compile-fail-migration/object-safety-no-static.rs b/src/test/ui/object-safety/object-safety-no-static.rs similarity index 100% rename from src/test/ui/compile-fail-migration/object-safety-no-static.rs rename to src/test/ui/object-safety/object-safety-no-static.rs diff --git a/src/test/ui/compile-fail-migration/object-safety-no-static.stderr b/src/test/ui/object-safety/object-safety-no-static.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-safety-no-static.stderr rename to src/test/ui/object-safety/object-safety-no-static.stderr diff --git a/src/test/ui/compile-fail-migration/object-safety-phantom-fn.rs b/src/test/ui/object-safety/object-safety-phantom-fn.rs similarity index 100% rename from src/test/ui/compile-fail-migration/object-safety-phantom-fn.rs rename to src/test/ui/object-safety/object-safety-phantom-fn.rs diff --git a/src/test/ui/compile-fail-migration/object-safety-phantom-fn.stderr b/src/test/ui/object-safety/object-safety-phantom-fn.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-safety-phantom-fn.stderr rename to src/test/ui/object-safety/object-safety-phantom-fn.stderr diff --git a/src/test/ui/compile-fail-migration/object-safety-sized-2.rs b/src/test/ui/object-safety/object-safety-sized-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/object-safety-sized-2.rs rename to src/test/ui/object-safety/object-safety-sized-2.rs diff --git a/src/test/ui/compile-fail-migration/object-safety-sized-2.stderr b/src/test/ui/object-safety/object-safety-sized-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/object-safety-sized-2.stderr rename to src/test/ui/object-safety/object-safety-sized-2.stderr diff --git a/src/test/ui/object-safety-sized.rs b/src/test/ui/object-safety/object-safety-sized.rs similarity index 100% rename from src/test/ui/object-safety-sized.rs rename to src/test/ui/object-safety/object-safety-sized.rs diff --git a/src/test/ui/object-safety-sized.stderr b/src/test/ui/object-safety/object-safety-sized.stderr similarity index 100% rename from src/test/ui/object-safety-sized.stderr rename to src/test/ui/object-safety/object-safety-sized.stderr diff --git a/src/test/ui/object-safety-supertrait-mentions-Self.rs b/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.rs similarity index 100% rename from src/test/ui/object-safety-supertrait-mentions-Self.rs rename to src/test/ui/object-safety/object-safety-supertrait-mentions-Self.rs diff --git a/src/test/ui/object-safety-supertrait-mentions-Self.stderr b/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.stderr similarity index 100% rename from src/test/ui/object-safety-supertrait-mentions-Self.stderr rename to src/test/ui/object-safety/object-safety-supertrait-mentions-Self.stderr diff --git a/src/test/ui/obsolete-in-place/bad.bad.stderr b/src/test/ui/obsolete-in-place/bad.bad.stderr deleted file mode 100644 index f870c09d6e5..00000000000 --- a/src/test/ui/obsolete-in-place/bad.bad.stderr +++ /dev/null @@ -1,18 +0,0 @@ -error: emplacement syntax is obsolete (for now, anyway) - --> $DIR/bad.rs:19:5 - | -LL | x <- y; //[bad]~ ERROR emplacement syntax is obsolete - | ^^^^^^ - | - = note: for more information, see - -error: emplacement syntax is obsolete (for now, anyway) - --> $DIR/bad.rs:20:5 - | -LL | in(foo) { bar }; //[bad]~ ERROR emplacement syntax is obsolete - | ^^^^^^^^^^^^^^^ - | - = note: for more information, see - -error: aborting due to 2 previous errors - diff --git a/src/test/ui/compile-fail-migration/occurs-check-2.rs b/src/test/ui/occurs-check-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/occurs-check-2.rs rename to src/test/ui/occurs-check-2.rs diff --git a/src/test/ui/compile-fail-migration/occurs-check-2.stderr b/src/test/ui/occurs-check-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/occurs-check-2.stderr rename to src/test/ui/occurs-check-2.stderr diff --git a/src/test/ui/compile-fail-migration/occurs-check-3.rs b/src/test/ui/occurs-check-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/occurs-check-3.rs rename to src/test/ui/occurs-check-3.rs diff --git a/src/test/ui/compile-fail-migration/occurs-check-3.stderr b/src/test/ui/occurs-check-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/occurs-check-3.stderr rename to src/test/ui/occurs-check-3.stderr diff --git a/src/test/ui/compile-fail-migration/occurs-check.rs b/src/test/ui/occurs-check.rs similarity index 100% rename from src/test/ui/compile-fail-migration/occurs-check.rs rename to src/test/ui/occurs-check.rs diff --git a/src/test/ui/compile-fail-migration/occurs-check.stderr b/src/test/ui/occurs-check.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/occurs-check.stderr rename to src/test/ui/occurs-check.stderr diff --git a/src/test/ui/compile-fail-migration/old-suffixes-are-really-forbidden.rs b/src/test/ui/old-suffixes-are-really-forbidden.rs similarity index 100% rename from src/test/ui/compile-fail-migration/old-suffixes-are-really-forbidden.rs rename to src/test/ui/old-suffixes-are-really-forbidden.rs diff --git a/src/test/ui/compile-fail-migration/old-suffixes-are-really-forbidden.stderr b/src/test/ui/old-suffixes-are-really-forbidden.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/old-suffixes-are-really-forbidden.stderr rename to src/test/ui/old-suffixes-are-really-forbidden.stderr diff --git a/src/test/ui/compile-fail-migration/once-cant-call-twice-on-heap.rs b/src/test/ui/once-cant-call-twice-on-heap.rs similarity index 100% rename from src/test/ui/compile-fail-migration/once-cant-call-twice-on-heap.rs rename to src/test/ui/once-cant-call-twice-on-heap.rs diff --git a/src/test/ui/compile-fail-migration/once-cant-call-twice-on-heap.stderr b/src/test/ui/once-cant-call-twice-on-heap.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/once-cant-call-twice-on-heap.stderr rename to src/test/ui/once-cant-call-twice-on-heap.stderr diff --git a/src/test/ui/compile-fail-migration/opt-in-copy.rs b/src/test/ui/opt-in-copy.rs similarity index 100% rename from src/test/ui/compile-fail-migration/opt-in-copy.rs rename to src/test/ui/opt-in-copy.rs diff --git a/src/test/ui/compile-fail-migration/opt-in-copy.stderr b/src/test/ui/opt-in-copy.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/opt-in-copy.stderr rename to src/test/ui/opt-in-copy.stderr diff --git a/src/test/ui/compile-fail-migration/or-patter-mismatch.rs b/src/test/ui/or-patter-mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/or-patter-mismatch.rs rename to src/test/ui/or-patter-mismatch.rs diff --git a/src/test/ui/compile-fail-migration/or-patter-mismatch.stderr b/src/test/ui/or-patter-mismatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/or-patter-mismatch.stderr rename to src/test/ui/or-patter-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/orphan-check-diagnostics.rs b/src/test/ui/orphan-check-diagnostics.rs similarity index 100% rename from src/test/ui/compile-fail-migration/orphan-check-diagnostics.rs rename to src/test/ui/orphan-check-diagnostics.rs diff --git a/src/test/ui/compile-fail-migration/orphan-check-diagnostics.stderr b/src/test/ui/orphan-check-diagnostics.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/orphan-check-diagnostics.stderr rename to src/test/ui/orphan-check-diagnostics.stderr diff --git a/src/test/ui/compile-fail-migration/osx-frameworks.rs b/src/test/ui/osx-frameworks.rs similarity index 100% rename from src/test/ui/compile-fail-migration/osx-frameworks.rs rename to src/test/ui/osx-frameworks.rs diff --git a/src/test/ui/compile-fail-migration/osx-frameworks.stderr b/src/test/ui/osx-frameworks.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/osx-frameworks.stderr rename to src/test/ui/osx-frameworks.stderr diff --git a/src/test/ui/compile-fail-migration/out-of-order-shadowing.rs b/src/test/ui/out-of-order-shadowing.rs similarity index 100% rename from src/test/ui/compile-fail-migration/out-of-order-shadowing.rs rename to src/test/ui/out-of-order-shadowing.rs diff --git a/src/test/ui/compile-fail-migration/out-of-order-shadowing.stderr b/src/test/ui/out-of-order-shadowing.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/out-of-order-shadowing.stderr rename to src/test/ui/out-of-order-shadowing.stderr diff --git a/src/test/ui/compile-fail-migration/output-type-mismatch.rs b/src/test/ui/output-type-mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/output-type-mismatch.rs rename to src/test/ui/output-type-mismatch.rs diff --git a/src/test/ui/compile-fail-migration/output-type-mismatch.stderr b/src/test/ui/output-type-mismatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/output-type-mismatch.stderr rename to src/test/ui/output-type-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/overlap-marker-trait.rs b/src/test/ui/overlap-marker-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/overlap-marker-trait.rs rename to src/test/ui/overlap-marker-trait.rs diff --git a/src/test/ui/compile-fail-migration/overlap-marker-trait.stderr b/src/test/ui/overlap-marker-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/overlap-marker-trait.stderr rename to src/test/ui/overlap-marker-trait.stderr diff --git a/src/test/ui/compile-fail-migration/overloaded-calls-nontuple.rs b/src/test/ui/overloaded-calls-nontuple.rs similarity index 100% rename from src/test/ui/compile-fail-migration/overloaded-calls-nontuple.rs rename to src/test/ui/overloaded-calls-nontuple.rs diff --git a/src/test/ui/compile-fail-migration/overloaded-calls-nontuple.stderr b/src/test/ui/overloaded-calls-nontuple.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/overloaded-calls-nontuple.stderr rename to src/test/ui/overloaded-calls-nontuple.stderr diff --git a/src/test/ui/compile-fail-migration/packed-struct-generic-transmute.rs b/src/test/ui/packed-struct/packed-struct-generic-transmute.rs similarity index 100% rename from src/test/ui/compile-fail-migration/packed-struct-generic-transmute.rs rename to src/test/ui/packed-struct/packed-struct-generic-transmute.rs diff --git a/src/test/ui/compile-fail-migration/packed-struct-generic-transmute.stderr b/src/test/ui/packed-struct/packed-struct-generic-transmute.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/packed-struct-generic-transmute.stderr rename to src/test/ui/packed-struct/packed-struct-generic-transmute.stderr diff --git a/src/test/ui/compile-fail-migration/packed-struct-transmute.rs b/src/test/ui/packed-struct/packed-struct-transmute.rs similarity index 100% rename from src/test/ui/compile-fail-migration/packed-struct-transmute.rs rename to src/test/ui/packed-struct/packed-struct-transmute.rs diff --git a/src/test/ui/compile-fail-migration/packed-struct-transmute.stderr b/src/test/ui/packed-struct/packed-struct-transmute.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/packed-struct-transmute.stderr rename to src/test/ui/packed-struct/packed-struct-transmute.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/some-panic-impl.rs b/src/test/ui/panic-implementation/auxiliary/some-panic-impl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/some-panic-impl.rs rename to src/test/ui/panic-implementation/auxiliary/some-panic-impl.rs diff --git a/src/test/ui/compile-fail-migration/panic-implementation-bad-signature-1.rs b/src/test/ui/panic-implementation/panic-implementation-bad-signature-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-bad-signature-1.rs rename to src/test/ui/panic-implementation/panic-implementation-bad-signature-1.rs diff --git a/src/test/ui/compile-fail-migration/panic-implementation-bad-signature-1.stderr b/src/test/ui/panic-implementation/panic-implementation-bad-signature-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-bad-signature-1.stderr rename to src/test/ui/panic-implementation/panic-implementation-bad-signature-1.stderr diff --git a/src/test/ui/compile-fail-migration/panic-implementation-bad-signature-2.rs b/src/test/ui/panic-implementation/panic-implementation-bad-signature-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-bad-signature-2.rs rename to src/test/ui/panic-implementation/panic-implementation-bad-signature-2.rs diff --git a/src/test/ui/compile-fail-migration/panic-implementation-bad-signature-2.stderr b/src/test/ui/panic-implementation/panic-implementation-bad-signature-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-bad-signature-2.stderr rename to src/test/ui/panic-implementation/panic-implementation-bad-signature-2.stderr diff --git a/src/test/ui/compile-fail-migration/panic-implementation-bad-signature-3.rs b/src/test/ui/panic-implementation/panic-implementation-bad-signature-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-bad-signature-3.rs rename to src/test/ui/panic-implementation/panic-implementation-bad-signature-3.rs diff --git a/src/test/ui/compile-fail-migration/panic-implementation-bad-signature-3.stderr b/src/test/ui/panic-implementation/panic-implementation-bad-signature-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-bad-signature-3.stderr rename to src/test/ui/panic-implementation/panic-implementation-bad-signature-3.stderr diff --git a/src/test/ui/compile-fail-migration/panic-implementation-bad-signature-4.rs b/src/test/ui/panic-implementation/panic-implementation-bad-signature-4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-bad-signature-4.rs rename to src/test/ui/panic-implementation/panic-implementation-bad-signature-4.rs diff --git a/src/test/ui/compile-fail-migration/panic-implementation-bad-signature-4.stderr b/src/test/ui/panic-implementation/panic-implementation-bad-signature-4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-bad-signature-4.stderr rename to src/test/ui/panic-implementation/panic-implementation-bad-signature-4.stderr diff --git a/src/test/ui/compile-fail-migration/panic-implementation-duplicate.rs b/src/test/ui/panic-implementation/panic-implementation-duplicate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-duplicate.rs rename to src/test/ui/panic-implementation/panic-implementation-duplicate.rs diff --git a/src/test/ui/compile-fail-migration/panic-implementation-duplicate.stderr b/src/test/ui/panic-implementation/panic-implementation-duplicate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-duplicate.stderr rename to src/test/ui/panic-implementation/panic-implementation-duplicate.stderr diff --git a/src/test/ui/compile-fail-migration/panic-implementation-missing.rs b/src/test/ui/panic-implementation/panic-implementation-missing.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-missing.rs rename to src/test/ui/panic-implementation/panic-implementation-missing.rs diff --git a/src/test/ui/compile-fail-migration/panic-implementation-missing.stderr b/src/test/ui/panic-implementation/panic-implementation-missing.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-missing.stderr rename to src/test/ui/panic-implementation/panic-implementation-missing.stderr diff --git a/src/test/ui/compile-fail-migration/panic-implementation-requires-panic-info.rs b/src/test/ui/panic-implementation/panic-implementation-requires-panic-info.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-requires-panic-info.rs rename to src/test/ui/panic-implementation/panic-implementation-requires-panic-info.rs diff --git a/src/test/ui/compile-fail-migration/panic-implementation-requires-panic-info.stderr b/src/test/ui/panic-implementation/panic-implementation-requires-panic-info.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-requires-panic-info.stderr rename to src/test/ui/panic-implementation/panic-implementation-requires-panic-info.stderr diff --git a/src/test/ui/compile-fail-migration/panic-implementation-std.rs b/src/test/ui/panic-implementation/panic-implementation-std.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-std.rs rename to src/test/ui/panic-implementation/panic-implementation-std.rs diff --git a/src/test/ui/compile-fail-migration/panic-implementation-std.stderr b/src/test/ui/panic-implementation/panic-implementation-std.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-std.stderr rename to src/test/ui/panic-implementation/panic-implementation-std.stderr diff --git a/src/test/ui/compile-fail-migration/panic-implementation-twice.rs b/src/test/ui/panic-implementation/panic-implementation-twice.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-twice.rs rename to src/test/ui/panic-implementation/panic-implementation-twice.rs diff --git a/src/test/ui/compile-fail-migration/panic-implementation-twice.stderr b/src/test/ui/panic-implementation/panic-implementation-twice.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-implementation-twice.stderr rename to src/test/ui/panic-implementation/panic-implementation-twice.stderr diff --git a/src/test/ui/compile-fail-migration/panic-runtime/abort-link-to-unwind-dylib.rs b/src/test/ui/panic-runtime/abort-link-to-unwind-dylib.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/abort-link-to-unwind-dylib.rs rename to src/test/ui/panic-runtime/abort-link-to-unwind-dylib.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/abort-link-to-unwind-dylib.stderr b/src/test/ui/panic-runtime/abort-link-to-unwind-dylib.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/abort-link-to-unwind-dylib.stderr rename to src/test/ui/panic-runtime/abort-link-to-unwind-dylib.stderr diff --git a/src/test/ui/compile-fail-migration/panic-runtime/auxiliary/depends.rs b/src/test/ui/panic-runtime/auxiliary/depends.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/auxiliary/depends.rs rename to src/test/ui/panic-runtime/auxiliary/depends.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/auxiliary/needs-panic-runtime.rs b/src/test/ui/panic-runtime/auxiliary/needs-panic-runtime.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/auxiliary/needs-panic-runtime.rs rename to src/test/ui/panic-runtime/auxiliary/needs-panic-runtime.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/auxiliary/panic-runtime-abort.rs b/src/test/ui/panic-runtime/auxiliary/panic-runtime-abort.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/auxiliary/panic-runtime-abort.rs rename to src/test/ui/panic-runtime/auxiliary/panic-runtime-abort.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/auxiliary/panic-runtime-lang-items.rs b/src/test/ui/panic-runtime/auxiliary/panic-runtime-lang-items.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/auxiliary/panic-runtime-lang-items.rs rename to src/test/ui/panic-runtime/auxiliary/panic-runtime-lang-items.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/auxiliary/panic-runtime-unwind.rs b/src/test/ui/panic-runtime/auxiliary/panic-runtime-unwind.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/auxiliary/panic-runtime-unwind.rs rename to src/test/ui/panic-runtime/auxiliary/panic-runtime-unwind.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/auxiliary/panic-runtime-unwind2.rs b/src/test/ui/panic-runtime/auxiliary/panic-runtime-unwind2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/auxiliary/panic-runtime-unwind2.rs rename to src/test/ui/panic-runtime/auxiliary/panic-runtime-unwind2.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/auxiliary/wants-panic-runtime-abort.rs b/src/test/ui/panic-runtime/auxiliary/wants-panic-runtime-abort.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/auxiliary/wants-panic-runtime-abort.rs rename to src/test/ui/panic-runtime/auxiliary/wants-panic-runtime-abort.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/auxiliary/wants-panic-runtime-unwind.rs b/src/test/ui/panic-runtime/auxiliary/wants-panic-runtime-unwind.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/auxiliary/wants-panic-runtime-unwind.rs rename to src/test/ui/panic-runtime/auxiliary/wants-panic-runtime-unwind.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/bad-panic-flag1.rs b/src/test/ui/panic-runtime/bad-panic-flag1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/bad-panic-flag1.rs rename to src/test/ui/panic-runtime/bad-panic-flag1.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/bad-panic-flag1.stderr b/src/test/ui/panic-runtime/bad-panic-flag1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/bad-panic-flag1.stderr rename to src/test/ui/panic-runtime/bad-panic-flag1.stderr diff --git a/src/test/ui/compile-fail-migration/panic-runtime/bad-panic-flag2.rs b/src/test/ui/panic-runtime/bad-panic-flag2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/bad-panic-flag2.rs rename to src/test/ui/panic-runtime/bad-panic-flag2.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/bad-panic-flag2.stderr b/src/test/ui/panic-runtime/bad-panic-flag2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/bad-panic-flag2.stderr rename to src/test/ui/panic-runtime/bad-panic-flag2.stderr diff --git a/src/test/ui/compile-fail-migration/panic-runtime/libtest-unwinds.rs b/src/test/ui/panic-runtime/libtest-unwinds.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/libtest-unwinds.rs rename to src/test/ui/panic-runtime/libtest-unwinds.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/libtest-unwinds.stderr b/src/test/ui/panic-runtime/libtest-unwinds.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/libtest-unwinds.stderr rename to src/test/ui/panic-runtime/libtest-unwinds.stderr diff --git a/src/test/ui/compile-fail-migration/panic-runtime/needs-gate.rs b/src/test/ui/panic-runtime/needs-gate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/needs-gate.rs rename to src/test/ui/panic-runtime/needs-gate.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/needs-gate.stderr b/src/test/ui/panic-runtime/needs-gate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/needs-gate.stderr rename to src/test/ui/panic-runtime/needs-gate.stderr diff --git a/src/test/ui/compile-fail-migration/panic-runtime/runtime-depend-on-needs-runtime.rs b/src/test/ui/panic-runtime/runtime-depend-on-needs-runtime.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/runtime-depend-on-needs-runtime.rs rename to src/test/ui/panic-runtime/runtime-depend-on-needs-runtime.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/runtime-depend-on-needs-runtime.stderr b/src/test/ui/panic-runtime/runtime-depend-on-needs-runtime.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/runtime-depend-on-needs-runtime.stderr rename to src/test/ui/panic-runtime/runtime-depend-on-needs-runtime.stderr diff --git a/src/test/ui/compile-fail-migration/panic-runtime/transitive-link-a-bunch.rs b/src/test/ui/panic-runtime/transitive-link-a-bunch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/transitive-link-a-bunch.rs rename to src/test/ui/panic-runtime/transitive-link-a-bunch.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/transitive-link-a-bunch.stderr b/src/test/ui/panic-runtime/transitive-link-a-bunch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/transitive-link-a-bunch.stderr rename to src/test/ui/panic-runtime/transitive-link-a-bunch.stderr diff --git a/src/test/ui/compile-fail-migration/panic-runtime/two-panic-runtimes.rs b/src/test/ui/panic-runtime/two-panic-runtimes.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/two-panic-runtimes.rs rename to src/test/ui/panic-runtime/two-panic-runtimes.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/two-panic-runtimes.stderr b/src/test/ui/panic-runtime/two-panic-runtimes.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/two-panic-runtimes.stderr rename to src/test/ui/panic-runtime/two-panic-runtimes.stderr diff --git a/src/test/ui/compile-fail-migration/panic-runtime/want-abort-got-unwind.rs b/src/test/ui/panic-runtime/want-abort-got-unwind.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/want-abort-got-unwind.rs rename to src/test/ui/panic-runtime/want-abort-got-unwind.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/want-abort-got-unwind.stderr b/src/test/ui/panic-runtime/want-abort-got-unwind.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/want-abort-got-unwind.stderr rename to src/test/ui/panic-runtime/want-abort-got-unwind.stderr diff --git a/src/test/ui/compile-fail-migration/panic-runtime/want-abort-got-unwind2.rs b/src/test/ui/panic-runtime/want-abort-got-unwind2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/want-abort-got-unwind2.rs rename to src/test/ui/panic-runtime/want-abort-got-unwind2.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/want-abort-got-unwind2.stderr b/src/test/ui/panic-runtime/want-abort-got-unwind2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/want-abort-got-unwind2.stderr rename to src/test/ui/panic-runtime/want-abort-got-unwind2.stderr diff --git a/src/test/ui/compile-fail-migration/panic-runtime/want-unwind-got-abort.rs b/src/test/ui/panic-runtime/want-unwind-got-abort.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/want-unwind-got-abort.rs rename to src/test/ui/panic-runtime/want-unwind-got-abort.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/want-unwind-got-abort.stderr b/src/test/ui/panic-runtime/want-unwind-got-abort.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/want-unwind-got-abort.stderr rename to src/test/ui/panic-runtime/want-unwind-got-abort.stderr diff --git a/src/test/ui/compile-fail-migration/panic-runtime/want-unwind-got-abort2.rs b/src/test/ui/panic-runtime/want-unwind-got-abort2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/want-unwind-got-abort2.rs rename to src/test/ui/panic-runtime/want-unwind-got-abort2.rs diff --git a/src/test/ui/compile-fail-migration/panic-runtime/want-unwind-got-abort2.stderr b/src/test/ui/panic-runtime/want-unwind-got-abort2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/panic-runtime/want-unwind-got-abort2.stderr rename to src/test/ui/panic-runtime/want-unwind-got-abort2.stderr diff --git a/src/test/ui/compile-fail-migration/panic_implementation-closures.rs b/src/test/ui/panic_implementation-closures.rs similarity index 100% rename from src/test/ui/compile-fail-migration/panic_implementation-closures.rs rename to src/test/ui/panic_implementation-closures.rs diff --git a/src/test/ui/compile-fail-migration/paren-span.rs b/src/test/ui/paren-span.rs similarity index 100% rename from src/test/ui/compile-fail-migration/paren-span.rs rename to src/test/ui/paren-span.rs diff --git a/src/test/ui/compile-fail-migration/paren-span.stderr b/src/test/ui/paren-span.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/paren-span.stderr rename to src/test/ui/paren-span.stderr diff --git a/src/test/ui/compile-fail-migration/parse-error-correct.rs b/src/test/ui/parse-error-correct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/parse-error-correct.rs rename to src/test/ui/parse-error-correct.rs diff --git a/src/test/ui/compile-fail-migration/parse-error-correct.stderr b/src/test/ui/parse-error-correct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/parse-error-correct.stderr rename to src/test/ui/parse-error-correct.stderr diff --git a/src/test/ui/compile-fail-migration/parser-recovery-1.rs b/src/test/ui/parser-recovery-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/parser-recovery-1.rs rename to src/test/ui/parser-recovery-1.rs diff --git a/src/test/ui/compile-fail-migration/parser-recovery-1.stderr b/src/test/ui/parser-recovery-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/parser-recovery-1.stderr rename to src/test/ui/parser-recovery-1.stderr diff --git a/src/test/ui/compile-fail-migration/parser-recovery-2.rs b/src/test/ui/parser-recovery-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/parser-recovery-2.rs rename to src/test/ui/parser-recovery-2.rs diff --git a/src/test/ui/compile-fail-migration/parser-recovery-2.stderr b/src/test/ui/parser-recovery-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/parser-recovery-2.stderr rename to src/test/ui/parser-recovery-2.stderr diff --git a/src/test/ui/compile-fail-migration/pat-shadow-in-nested-binding.rs b/src/test/ui/pattern/pat-shadow-in-nested-binding.rs similarity index 100% rename from src/test/ui/compile-fail-migration/pat-shadow-in-nested-binding.rs rename to src/test/ui/pattern/pat-shadow-in-nested-binding.rs diff --git a/src/test/ui/compile-fail-migration/pat-shadow-in-nested-binding.stderr b/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/pat-shadow-in-nested-binding.stderr rename to src/test/ui/pattern/pat-shadow-in-nested-binding.stderr diff --git a/src/test/ui/compile-fail-migration/pat-tuple-bad-type.rs b/src/test/ui/pattern/pat-tuple-bad-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/pat-tuple-bad-type.rs rename to src/test/ui/pattern/pat-tuple-bad-type.rs diff --git a/src/test/ui/compile-fail-migration/pat-tuple-bad-type.stderr b/src/test/ui/pattern/pat-tuple-bad-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/pat-tuple-bad-type.stderr rename to src/test/ui/pattern/pat-tuple-bad-type.stderr diff --git a/src/test/ui/compile-fail-migration/pat-tuple-overfield.rs b/src/test/ui/pattern/pat-tuple-overfield.rs similarity index 100% rename from src/test/ui/compile-fail-migration/pat-tuple-overfield.rs rename to src/test/ui/pattern/pat-tuple-overfield.rs diff --git a/src/test/ui/compile-fail-migration/pat-tuple-overfield.stderr b/src/test/ui/pattern/pat-tuple-overfield.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/pat-tuple-overfield.stderr rename to src/test/ui/pattern/pat-tuple-overfield.stderr diff --git a/src/test/ui/compile-fail-migration/patkind-litrange-no-expr.rs b/src/test/ui/pattern/patkind-litrange-no-expr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/patkind-litrange-no-expr.rs rename to src/test/ui/pattern/patkind-litrange-no-expr.rs diff --git a/src/test/ui/compile-fail-migration/patkind-litrange-no-expr.stderr b/src/test/ui/pattern/patkind-litrange-no-expr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/patkind-litrange-no-expr.stderr rename to src/test/ui/pattern/patkind-litrange-no-expr.stderr diff --git a/src/test/ui/compile-fail-migration/pattern-binding-disambiguation.rs b/src/test/ui/pattern/pattern-binding-disambiguation.rs similarity index 100% rename from src/test/ui/compile-fail-migration/pattern-binding-disambiguation.rs rename to src/test/ui/pattern/pattern-binding-disambiguation.rs diff --git a/src/test/ui/compile-fail-migration/pattern-binding-disambiguation.stderr b/src/test/ui/pattern/pattern-binding-disambiguation.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/pattern-binding-disambiguation.stderr rename to src/test/ui/pattern/pattern-binding-disambiguation.stderr diff --git a/src/test/ui/compile-fail-migration/pattern-bindings-after-at.rs b/src/test/ui/pattern/pattern-bindings-after-at.rs similarity index 100% rename from src/test/ui/compile-fail-migration/pattern-bindings-after-at.rs rename to src/test/ui/pattern/pattern-bindings-after-at.rs diff --git a/src/test/ui/compile-fail-migration/pattern-bindings-after-at.stderr b/src/test/ui/pattern/pattern-bindings-after-at.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/pattern-bindings-after-at.stderr rename to src/test/ui/pattern/pattern-bindings-after-at.stderr diff --git a/src/test/ui/compile-fail-migration/pattern-error-continue.rs b/src/test/ui/pattern/pattern-error-continue.rs similarity index 100% rename from src/test/ui/compile-fail-migration/pattern-error-continue.rs rename to src/test/ui/pattern/pattern-error-continue.rs diff --git a/src/test/ui/compile-fail-migration/pattern-error-continue.stderr b/src/test/ui/pattern/pattern-error-continue.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/pattern-error-continue.stderr rename to src/test/ui/pattern/pattern-error-continue.stderr diff --git a/src/test/ui/compile-fail-migration/pattern-ident-path-generics.rs b/src/test/ui/pattern/pattern-ident-path-generics.rs similarity index 100% rename from src/test/ui/compile-fail-migration/pattern-ident-path-generics.rs rename to src/test/ui/pattern/pattern-ident-path-generics.rs diff --git a/src/test/ui/compile-fail-migration/pattern-ident-path-generics.stderr b/src/test/ui/pattern/pattern-ident-path-generics.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/pattern-ident-path-generics.stderr rename to src/test/ui/pattern/pattern-ident-path-generics.stderr diff --git a/src/test/ui/compile-fail-migration/pattern-tyvar-2.rs b/src/test/ui/pattern/pattern-tyvar-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/pattern-tyvar-2.rs rename to src/test/ui/pattern/pattern-tyvar-2.rs diff --git a/src/test/ui/compile-fail-migration/pattern-tyvar-2.stderr b/src/test/ui/pattern/pattern-tyvar-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/pattern-tyvar-2.stderr rename to src/test/ui/pattern/pattern-tyvar-2.stderr diff --git a/src/test/ui/compile-fail-migration/pattern-tyvar.rs b/src/test/ui/pattern/pattern-tyvar.rs similarity index 100% rename from src/test/ui/compile-fail-migration/pattern-tyvar.rs rename to src/test/ui/pattern/pattern-tyvar.rs diff --git a/src/test/ui/compile-fail-migration/pattern-tyvar.stderr b/src/test/ui/pattern/pattern-tyvar.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/pattern-tyvar.stderr rename to src/test/ui/pattern/pattern-tyvar.stderr diff --git a/src/test/ui/compile-fail-migration/phantom-oibit.rs b/src/test/ui/phantom-oibit.rs similarity index 100% rename from src/test/ui/compile-fail-migration/phantom-oibit.rs rename to src/test/ui/phantom-oibit.rs diff --git a/src/test/ui/compile-fail-migration/phantom-oibit.stderr b/src/test/ui/phantom-oibit.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/phantom-oibit.stderr rename to src/test/ui/phantom-oibit.stderr diff --git a/src/test/ui/compile-fail-migration/platform-intrinsic-params.rs b/src/test/ui/platform-intrinsic-params.rs similarity index 100% rename from src/test/ui/compile-fail-migration/platform-intrinsic-params.rs rename to src/test/ui/platform-intrinsic-params.rs diff --git a/src/test/ui/compile-fail-migration/platform-intrinsic-params.stderr b/src/test/ui/platform-intrinsic-params.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/platform-intrinsic-params.stderr rename to src/test/ui/platform-intrinsic-params.stderr diff --git a/src/test/ui/compile-fail-migration/pptypedef.rs b/src/test/ui/pptypedef.rs similarity index 100% rename from src/test/ui/compile-fail-migration/pptypedef.rs rename to src/test/ui/pptypedef.rs diff --git a/src/test/ui/compile-fail-migration/pptypedef.stderr b/src/test/ui/pptypedef.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/pptypedef.stderr rename to src/test/ui/pptypedef.stderr diff --git a/src/test/ui/compile-fail-migration/prim-with-args.rs b/src/test/ui/prim-with-args.rs similarity index 100% rename from src/test/ui/compile-fail-migration/prim-with-args.rs rename to src/test/ui/prim-with-args.rs diff --git a/src/test/ui/compile-fail-migration/prim-with-args.stderr b/src/test/ui/prim-with-args.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/prim-with-args.stderr rename to src/test/ui/prim-with-args.stderr diff --git a/src/test/ui/compile-fail-migration/priv-in-bad-locations.rs b/src/test/ui/priv-in-bad-locations.rs similarity index 100% rename from src/test/ui/compile-fail-migration/priv-in-bad-locations.rs rename to src/test/ui/priv-in-bad-locations.rs diff --git a/src/test/ui/compile-fail-migration/priv-in-bad-locations.stderr b/src/test/ui/priv-in-bad-locations.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/priv-in-bad-locations.stderr rename to src/test/ui/priv-in-bad-locations.stderr diff --git a/src/test/ui/compile-fail-migration/privacy/associated-item-privacy-inherent.rs b/src/test/ui/privacy/associated-item-privacy-inherent.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/associated-item-privacy-inherent.rs rename to src/test/ui/privacy/associated-item-privacy-inherent.rs diff --git a/src/test/ui/compile-fail-migration/privacy/associated-item-privacy-inherent.stderr b/src/test/ui/privacy/associated-item-privacy-inherent.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/associated-item-privacy-inherent.stderr rename to src/test/ui/privacy/associated-item-privacy-inherent.stderr diff --git a/src/test/ui/compile-fail-migration/privacy/associated-item-privacy-trait.rs b/src/test/ui/privacy/associated-item-privacy-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/associated-item-privacy-trait.rs rename to src/test/ui/privacy/associated-item-privacy-trait.rs diff --git a/src/test/ui/compile-fail-migration/privacy/associated-item-privacy-trait.stderr b/src/test/ui/privacy/associated-item-privacy-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/associated-item-privacy-trait.stderr rename to src/test/ui/privacy/associated-item-privacy-trait.stderr diff --git a/src/test/ui/compile-fail-migration/privacy/associated-item-privacy-type-binding.rs b/src/test/ui/privacy/associated-item-privacy-type-binding.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/associated-item-privacy-type-binding.rs rename to src/test/ui/privacy/associated-item-privacy-type-binding.rs diff --git a/src/test/ui/compile-fail-migration/privacy/associated-item-privacy-type-binding.stderr b/src/test/ui/privacy/associated-item-privacy-type-binding.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/associated-item-privacy-type-binding.stderr rename to src/test/ui/privacy/associated-item-privacy-type-binding.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/cci_class.rs b/src/test/ui/privacy/auxiliary/cci_class.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/cci_class.rs rename to src/test/ui/privacy/auxiliary/cci_class.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/cci_class_5.rs b/src/test/ui/privacy/auxiliary/cci_class_5.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/cci_class_5.rs rename to src/test/ui/privacy/auxiliary/cci_class_5.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/privacy_tuple_struct.rs b/src/test/ui/privacy/auxiliary/privacy_tuple_struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/privacy_tuple_struct.rs rename to src/test/ui/privacy/auxiliary/privacy_tuple_struct.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/private-inferred-type.rs b/src/test/ui/privacy/auxiliary/private-inferred-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/private-inferred-type.rs rename to src/test/ui/privacy/auxiliary/private-inferred-type.rs diff --git a/src/test/ui/compile-fail-migration/privacy/legacy-ctor-visibility.rs b/src/test/ui/privacy/legacy-ctor-visibility.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/legacy-ctor-visibility.rs rename to src/test/ui/privacy/legacy-ctor-visibility.rs diff --git a/src/test/ui/compile-fail-migration/privacy/legacy-ctor-visibility.stderr b/src/test/ui/privacy/legacy-ctor-visibility.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/legacy-ctor-visibility.stderr rename to src/test/ui/privacy/legacy-ctor-visibility.stderr diff --git a/src/test/ui/compile-fail-migration/privacy-in-paths.rs b/src/test/ui/privacy/privacy-in-paths.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy-in-paths.rs rename to src/test/ui/privacy/privacy-in-paths.rs diff --git a/src/test/ui/compile-fail-migration/privacy-in-paths.stderr b/src/test/ui/privacy/privacy-in-paths.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy-in-paths.stderr rename to src/test/ui/privacy/privacy-in-paths.stderr diff --git a/src/test/ui/compile-fail-migration/privacy-ns1.rs b/src/test/ui/privacy/privacy-ns1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy-ns1.rs rename to src/test/ui/privacy/privacy-ns1.rs diff --git a/src/test/ui/compile-fail-migration/privacy-ns1.stderr b/src/test/ui/privacy/privacy-ns1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy-ns1.stderr rename to src/test/ui/privacy/privacy-ns1.stderr diff --git a/src/test/ui/compile-fail-migration/privacy-ns2.rs b/src/test/ui/privacy/privacy-ns2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy-ns2.rs rename to src/test/ui/privacy/privacy-ns2.rs diff --git a/src/test/ui/compile-fail-migration/privacy-ns2.stderr b/src/test/ui/privacy/privacy-ns2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy-ns2.stderr rename to src/test/ui/privacy/privacy-ns2.stderr diff --git a/src/test/ui/compile-fail-migration/privacy-sanity.rs b/src/test/ui/privacy/privacy-sanity.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy-sanity.rs rename to src/test/ui/privacy/privacy-sanity.rs diff --git a/src/test/ui/compile-fail-migration/privacy-sanity.stderr b/src/test/ui/privacy/privacy-sanity.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy-sanity.stderr rename to src/test/ui/privacy/privacy-sanity.stderr diff --git a/src/test/ui/compile-fail-migration/privacy-ufcs.rs b/src/test/ui/privacy/privacy-ufcs.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy-ufcs.rs rename to src/test/ui/privacy/privacy-ufcs.rs diff --git a/src/test/ui/compile-fail-migration/privacy-ufcs.stderr b/src/test/ui/privacy/privacy-ufcs.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy-ufcs.stderr rename to src/test/ui/privacy/privacy-ufcs.stderr diff --git a/src/test/ui/compile-fail-migration/privacy1.rs b/src/test/ui/privacy/privacy1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy1.rs rename to src/test/ui/privacy/privacy1.rs diff --git a/src/test/ui/compile-fail-migration/privacy1.stderr b/src/test/ui/privacy/privacy1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy1.stderr rename to src/test/ui/privacy/privacy1.stderr diff --git a/src/test/ui/compile-fail-migration/privacy2.rs b/src/test/ui/privacy/privacy2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy2.rs rename to src/test/ui/privacy/privacy2.rs diff --git a/src/test/ui/compile-fail-migration/privacy2.stderr b/src/test/ui/privacy/privacy2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy2.stderr rename to src/test/ui/privacy/privacy2.stderr diff --git a/src/test/ui/compile-fail-migration/privacy3.rs b/src/test/ui/privacy/privacy3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy3.rs rename to src/test/ui/privacy/privacy3.rs diff --git a/src/test/ui/compile-fail-migration/privacy3.stderr b/src/test/ui/privacy/privacy3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy3.stderr rename to src/test/ui/privacy/privacy3.stderr diff --git a/src/test/ui/compile-fail-migration/privacy4.rs b/src/test/ui/privacy/privacy4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy4.rs rename to src/test/ui/privacy/privacy4.rs diff --git a/src/test/ui/compile-fail-migration/privacy4.stderr b/src/test/ui/privacy/privacy4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy4.stderr rename to src/test/ui/privacy/privacy4.stderr diff --git a/src/test/ui/compile-fail-migration/privacy5.rs b/src/test/ui/privacy/privacy5.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy5.rs rename to src/test/ui/privacy/privacy5.rs diff --git a/src/test/ui/compile-fail-migration/privacy5.stderr b/src/test/ui/privacy/privacy5.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy5.stderr rename to src/test/ui/privacy/privacy5.stderr diff --git a/src/test/ui/compile-fail-migration/private-impl-method.rs b/src/test/ui/privacy/private-impl-method.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-impl-method.rs rename to src/test/ui/privacy/private-impl-method.rs diff --git a/src/test/ui/compile-fail-migration/private-impl-method.stderr b/src/test/ui/privacy/private-impl-method.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-impl-method.stderr rename to src/test/ui/privacy/private-impl-method.stderr diff --git a/src/test/ui/compile-fail-migration/private-in-public-assoc-ty.rs b/src/test/ui/privacy/private-in-public-assoc-ty.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-in-public-assoc-ty.rs rename to src/test/ui/privacy/private-in-public-assoc-ty.rs diff --git a/src/test/ui/compile-fail-migration/private-in-public-assoc-ty.stderr b/src/test/ui/privacy/private-in-public-assoc-ty.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-in-public-assoc-ty.stderr rename to src/test/ui/privacy/private-in-public-assoc-ty.stderr diff --git a/src/test/ui/compile-fail-migration/private-in-public-ill-formed.rs b/src/test/ui/privacy/private-in-public-ill-formed.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-in-public-ill-formed.rs rename to src/test/ui/privacy/private-in-public-ill-formed.rs diff --git a/src/test/ui/compile-fail-migration/private-in-public-ill-formed.stderr b/src/test/ui/privacy/private-in-public-ill-formed.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-in-public-ill-formed.stderr rename to src/test/ui/privacy/private-in-public-ill-formed.stderr diff --git a/src/test/ui/compile-fail-migration/private-in-public-lint.rs b/src/test/ui/privacy/private-in-public-lint.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-in-public-lint.rs rename to src/test/ui/privacy/private-in-public-lint.rs diff --git a/src/test/ui/compile-fail-migration/private-in-public-lint.stderr b/src/test/ui/privacy/private-in-public-lint.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-in-public-lint.stderr rename to src/test/ui/privacy/private-in-public-lint.stderr diff --git a/src/test/ui/compile-fail-migration/private-in-public-warn.rs b/src/test/ui/privacy/private-in-public-warn.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-in-public-warn.rs rename to src/test/ui/privacy/private-in-public-warn.rs diff --git a/src/test/ui/compile-fail-migration/private-in-public-warn.stderr b/src/test/ui/privacy/private-in-public-warn.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-in-public-warn.stderr rename to src/test/ui/privacy/private-in-public-warn.stderr diff --git a/src/test/ui/compile-fail-migration/private-in-public.rs b/src/test/ui/privacy/private-in-public.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-in-public.rs rename to src/test/ui/privacy/private-in-public.rs diff --git a/src/test/ui/compile-fail-migration/private-in-public.stderr b/src/test/ui/privacy/private-in-public.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-in-public.stderr rename to src/test/ui/privacy/private-in-public.stderr diff --git a/src/test/ui/compile-fail-migration/private-inferred-type-1.rs b/src/test/ui/privacy/private-inferred-type-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-inferred-type-1.rs rename to src/test/ui/privacy/private-inferred-type-1.rs diff --git a/src/test/ui/compile-fail-migration/private-inferred-type-1.stderr b/src/test/ui/privacy/private-inferred-type-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-inferred-type-1.stderr rename to src/test/ui/privacy/private-inferred-type-1.stderr diff --git a/src/test/ui/compile-fail-migration/private-inferred-type-2.rs b/src/test/ui/privacy/private-inferred-type-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-inferred-type-2.rs rename to src/test/ui/privacy/private-inferred-type-2.rs diff --git a/src/test/ui/compile-fail-migration/private-inferred-type-2.stderr b/src/test/ui/privacy/private-inferred-type-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-inferred-type-2.stderr rename to src/test/ui/privacy/private-inferred-type-2.stderr diff --git a/src/test/ui/compile-fail-migration/private-inferred-type-3.rs b/src/test/ui/privacy/private-inferred-type-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-inferred-type-3.rs rename to src/test/ui/privacy/private-inferred-type-3.rs diff --git a/src/test/ui/compile-fail-migration/private-inferred-type-3.stderr b/src/test/ui/privacy/private-inferred-type-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-inferred-type-3.stderr rename to src/test/ui/privacy/private-inferred-type-3.stderr diff --git a/src/test/ui/compile-fail-migration/private-inferred-type.rs b/src/test/ui/privacy/private-inferred-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-inferred-type.rs rename to src/test/ui/privacy/private-inferred-type.rs diff --git a/src/test/ui/compile-fail-migration/private-inferred-type.stderr b/src/test/ui/privacy/private-inferred-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-inferred-type.stderr rename to src/test/ui/privacy/private-inferred-type.stderr diff --git a/src/test/ui/compile-fail-migration/private-item-simple.rs b/src/test/ui/privacy/private-item-simple.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-item-simple.rs rename to src/test/ui/privacy/private-item-simple.rs diff --git a/src/test/ui/compile-fail-migration/private-item-simple.stderr b/src/test/ui/privacy/private-item-simple.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-item-simple.stderr rename to src/test/ui/privacy/private-item-simple.stderr diff --git a/src/test/ui/compile-fail-migration/private-method-cross-crate.rs b/src/test/ui/privacy/private-method-cross-crate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-method-cross-crate.rs rename to src/test/ui/privacy/private-method-cross-crate.rs diff --git a/src/test/ui/compile-fail-migration/private-method-cross-crate.stderr b/src/test/ui/privacy/private-method-cross-crate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-method-cross-crate.stderr rename to src/test/ui/privacy/private-method-cross-crate.stderr diff --git a/src/test/ui/compile-fail-migration/private-method-inherited.rs b/src/test/ui/privacy/private-method-inherited.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-method-inherited.rs rename to src/test/ui/privacy/private-method-inherited.rs diff --git a/src/test/ui/compile-fail-migration/private-method-inherited.stderr b/src/test/ui/privacy/private-method-inherited.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-method-inherited.stderr rename to src/test/ui/privacy/private-method-inherited.stderr diff --git a/src/test/ui/compile-fail-migration/private-method.rs b/src/test/ui/privacy/private-method.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-method.rs rename to src/test/ui/privacy/private-method.rs diff --git a/src/test/ui/compile-fail-migration/private-method.stderr b/src/test/ui/privacy/private-method.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-method.stderr rename to src/test/ui/privacy/private-method.stderr diff --git a/src/test/ui/compile-fail-migration/private-struct-field-cross-crate.rs b/src/test/ui/privacy/private-struct-field-cross-crate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-struct-field-cross-crate.rs rename to src/test/ui/privacy/private-struct-field-cross-crate.rs diff --git a/src/test/ui/compile-fail-migration/private-struct-field-cross-crate.stderr b/src/test/ui/privacy/private-struct-field-cross-crate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-struct-field-cross-crate.stderr rename to src/test/ui/privacy/private-struct-field-cross-crate.stderr diff --git a/src/test/ui/compile-fail-migration/private-struct-field-ctor.rs b/src/test/ui/privacy/private-struct-field-ctor.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-struct-field-ctor.rs rename to src/test/ui/privacy/private-struct-field-ctor.rs diff --git a/src/test/ui/compile-fail-migration/private-struct-field-ctor.stderr b/src/test/ui/privacy/private-struct-field-ctor.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-struct-field-ctor.stderr rename to src/test/ui/privacy/private-struct-field-ctor.stderr diff --git a/src/test/ui/compile-fail-migration/private-struct-field-pattern.rs b/src/test/ui/privacy/private-struct-field-pattern.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-struct-field-pattern.rs rename to src/test/ui/privacy/private-struct-field-pattern.rs diff --git a/src/test/ui/compile-fail-migration/private-struct-field-pattern.stderr b/src/test/ui/privacy/private-struct-field-pattern.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-struct-field-pattern.stderr rename to src/test/ui/privacy/private-struct-field-pattern.stderr diff --git a/src/test/ui/compile-fail-migration/private-struct-field.rs b/src/test/ui/privacy/private-struct-field.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-struct-field.rs rename to src/test/ui/privacy/private-struct-field.rs diff --git a/src/test/ui/compile-fail-migration/private-struct-field.stderr b/src/test/ui/privacy/private-struct-field.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-struct-field.stderr rename to src/test/ui/privacy/private-struct-field.stderr diff --git a/src/test/ui/compile-fail-migration/private-type-in-interface.rs b/src/test/ui/privacy/private-type-in-interface.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-type-in-interface.rs rename to src/test/ui/privacy/private-type-in-interface.rs diff --git a/src/test/ui/compile-fail-migration/private-type-in-interface.stderr b/src/test/ui/privacy/private-type-in-interface.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-type-in-interface.stderr rename to src/test/ui/privacy/private-type-in-interface.stderr diff --git a/src/test/ui/compile-fail-migration/private-variant-reexport.rs b/src/test/ui/privacy/private-variant-reexport.rs similarity index 100% rename from src/test/ui/compile-fail-migration/private-variant-reexport.rs rename to src/test/ui/privacy/private-variant-reexport.rs diff --git a/src/test/ui/compile-fail-migration/private-variant-reexport.stderr b/src/test/ui/privacy/private-variant-reexport.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/private-variant-reexport.stderr rename to src/test/ui/privacy/private-variant-reexport.stderr diff --git a/src/test/ui/compile-fail-migration/privacy/restricted/auxiliary/pub_restricted.rs b/src/test/ui/privacy/restricted/auxiliary/pub_restricted.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/restricted/auxiliary/pub_restricted.rs rename to src/test/ui/privacy/restricted/auxiliary/pub_restricted.rs diff --git a/src/test/ui/compile-fail-migration/privacy/restricted/lookup-ignores-private.rs b/src/test/ui/privacy/restricted/lookup-ignores-private.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/restricted/lookup-ignores-private.rs rename to src/test/ui/privacy/restricted/lookup-ignores-private.rs diff --git a/src/test/ui/compile-fail-migration/privacy/restricted/lookup-ignores-private.stderr b/src/test/ui/privacy/restricted/lookup-ignores-private.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/restricted/lookup-ignores-private.stderr rename to src/test/ui/privacy/restricted/lookup-ignores-private.stderr diff --git a/src/test/ui/compile-fail-migration/privacy/restricted/private-in-public.rs b/src/test/ui/privacy/restricted/private-in-public.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/restricted/private-in-public.rs rename to src/test/ui/privacy/restricted/private-in-public.rs diff --git a/src/test/ui/compile-fail-migration/privacy/restricted/private-in-public.stderr b/src/test/ui/privacy/restricted/private-in-public.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/restricted/private-in-public.stderr rename to src/test/ui/privacy/restricted/private-in-public.stderr diff --git a/src/test/ui/compile-fail-migration/privacy/restricted/struct-literal-field.rs b/src/test/ui/privacy/restricted/struct-literal-field.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/restricted/struct-literal-field.rs rename to src/test/ui/privacy/restricted/struct-literal-field.rs diff --git a/src/test/ui/compile-fail-migration/privacy/restricted/struct-literal-field.stderr b/src/test/ui/privacy/restricted/struct-literal-field.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/restricted/struct-literal-field.stderr rename to src/test/ui/privacy/restricted/struct-literal-field.stderr diff --git a/src/test/ui/compile-fail-migration/privacy/restricted/test.rs b/src/test/ui/privacy/restricted/test.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/restricted/test.rs rename to src/test/ui/privacy/restricted/test.rs diff --git a/src/test/ui/compile-fail-migration/privacy/restricted/test.stderr b/src/test/ui/privacy/restricted/test.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/restricted/test.stderr rename to src/test/ui/privacy/restricted/test.stderr diff --git a/src/test/ui/compile-fail-migration/privacy/union-field-privacy-1.rs b/src/test/ui/privacy/union-field-privacy-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/union-field-privacy-1.rs rename to src/test/ui/privacy/union-field-privacy-1.rs diff --git a/src/test/ui/compile-fail-migration/privacy/union-field-privacy-1.stderr b/src/test/ui/privacy/union-field-privacy-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/union-field-privacy-1.stderr rename to src/test/ui/privacy/union-field-privacy-1.stderr diff --git a/src/test/ui/compile-fail-migration/privacy/union-field-privacy-2.rs b/src/test/ui/privacy/union-field-privacy-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/union-field-privacy-2.rs rename to src/test/ui/privacy/union-field-privacy-2.rs diff --git a/src/test/ui/compile-fail-migration/privacy/union-field-privacy-2.stderr b/src/test/ui/privacy/union-field-privacy-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/privacy/union-field-privacy-2.stderr rename to src/test/ui/privacy/union-field-privacy-2.stderr diff --git a/src/test/ui/compile-fail-migration/ptr-coercion.rs b/src/test/ui/ptr-coercion.rs similarity index 100% rename from src/test/ui/compile-fail-migration/ptr-coercion.rs rename to src/test/ui/ptr-coercion.rs diff --git a/src/test/ui/compile-fail-migration/ptr-coercion.stderr b/src/test/ui/ptr-coercion.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/ptr-coercion.stderr rename to src/test/ui/ptr-coercion.stderr diff --git a/src/test/ui/pub-ident-fn-2.rs b/src/test/ui/pub/pub-ident-fn-2.rs similarity index 100% rename from src/test/ui/pub-ident-fn-2.rs rename to src/test/ui/pub/pub-ident-fn-2.rs diff --git a/src/test/ui/pub-ident-fn-2.stderr b/src/test/ui/pub/pub-ident-fn-2.stderr similarity index 100% rename from src/test/ui/pub-ident-fn-2.stderr rename to src/test/ui/pub/pub-ident-fn-2.stderr diff --git a/src/test/ui/pub-ident-fn-or-struct-2.rs b/src/test/ui/pub/pub-ident-fn-or-struct-2.rs similarity index 100% rename from src/test/ui/pub-ident-fn-or-struct-2.rs rename to src/test/ui/pub/pub-ident-fn-or-struct-2.rs diff --git a/src/test/ui/pub-ident-fn-or-struct-2.stderr b/src/test/ui/pub/pub-ident-fn-or-struct-2.stderr similarity index 100% rename from src/test/ui/pub-ident-fn-or-struct-2.stderr rename to src/test/ui/pub/pub-ident-fn-or-struct-2.stderr diff --git a/src/test/ui/pub-ident-fn-or-struct.rs b/src/test/ui/pub/pub-ident-fn-or-struct.rs similarity index 100% rename from src/test/ui/pub-ident-fn-or-struct.rs rename to src/test/ui/pub/pub-ident-fn-or-struct.rs diff --git a/src/test/ui/pub-ident-fn-or-struct.stderr b/src/test/ui/pub/pub-ident-fn-or-struct.stderr similarity index 100% rename from src/test/ui/pub-ident-fn-or-struct.stderr rename to src/test/ui/pub/pub-ident-fn-or-struct.stderr diff --git a/src/test/ui/pub-ident-fn.fixed b/src/test/ui/pub/pub-ident-fn.fixed similarity index 100% rename from src/test/ui/pub-ident-fn.fixed rename to src/test/ui/pub/pub-ident-fn.fixed diff --git a/src/test/ui/pub-ident-fn.rs b/src/test/ui/pub/pub-ident-fn.rs similarity index 100% rename from src/test/ui/pub-ident-fn.rs rename to src/test/ui/pub/pub-ident-fn.rs diff --git a/src/test/ui/pub-ident-fn.stderr b/src/test/ui/pub/pub-ident-fn.stderr similarity index 100% rename from src/test/ui/pub-ident-fn.stderr rename to src/test/ui/pub/pub-ident-fn.stderr diff --git a/src/test/ui/pub-ident-struct.rs b/src/test/ui/pub/pub-ident-struct.rs similarity index 100% rename from src/test/ui/pub-ident-struct.rs rename to src/test/ui/pub/pub-ident-struct.rs diff --git a/src/test/ui/pub-ident-struct.stderr b/src/test/ui/pub/pub-ident-struct.stderr similarity index 100% rename from src/test/ui/pub-ident-struct.stderr rename to src/test/ui/pub/pub-ident-struct.stderr diff --git a/src/test/ui/compile-fail-migration/pub-reexport-priv-extern-crate.rs b/src/test/ui/pub/pub-reexport-priv-extern-crate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/pub-reexport-priv-extern-crate.rs rename to src/test/ui/pub/pub-reexport-priv-extern-crate.rs diff --git a/src/test/ui/compile-fail-migration/pub-reexport-priv-extern-crate.stderr b/src/test/ui/pub/pub-reexport-priv-extern-crate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/pub-reexport-priv-extern-crate.stderr rename to src/test/ui/pub/pub-reexport-priv-extern-crate.stderr diff --git a/src/test/ui/qualified-path-params-2.rs b/src/test/ui/qualified/qualified-path-params-2.rs similarity index 100% rename from src/test/ui/qualified-path-params-2.rs rename to src/test/ui/qualified/qualified-path-params-2.rs diff --git a/src/test/ui/qualified-path-params-2.stderr b/src/test/ui/qualified/qualified-path-params-2.stderr similarity index 100% rename from src/test/ui/qualified-path-params-2.stderr rename to src/test/ui/qualified/qualified-path-params-2.stderr diff --git a/src/test/ui/compile-fail-migration/qualified-path-params.rs b/src/test/ui/qualified/qualified-path-params.rs similarity index 100% rename from src/test/ui/compile-fail-migration/qualified-path-params.rs rename to src/test/ui/qualified/qualified-path-params.rs diff --git a/src/test/ui/compile-fail-migration/qualified-path-params.stderr b/src/test/ui/qualified/qualified-path-params.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/qualified-path-params.stderr rename to src/test/ui/qualified/qualified-path-params.stderr diff --git a/src/test/ui/compile-fail-migration/question-mark-type-infer.rs b/src/test/ui/question-mark-type-infer.rs similarity index 100% rename from src/test/ui/compile-fail-migration/question-mark-type-infer.rs rename to src/test/ui/question-mark-type-infer.rs diff --git a/src/test/ui/compile-fail-migration/question-mark-type-infer.stderr b/src/test/ui/question-mark-type-infer.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/question-mark-type-infer.stderr rename to src/test/ui/question-mark-type-infer.stderr diff --git a/src/test/ui/compile-fail-migration/quote-with-interpolated.rs b/src/test/ui/quote-with-interpolated.rs similarity index 100% rename from src/test/ui/compile-fail-migration/quote-with-interpolated.rs rename to src/test/ui/quote-with-interpolated.rs diff --git a/src/test/ui/compile-fail-migration/quote-with-interpolated.stderr b/src/test/ui/quote-with-interpolated.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/quote-with-interpolated.stderr rename to src/test/ui/quote-with-interpolated.stderr diff --git a/src/test/ui/compile-fail-migration/range-1.rs b/src/test/ui/range/range-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/range-1.rs rename to src/test/ui/range/range-1.rs diff --git a/src/test/ui/compile-fail-migration/range-1.stderr b/src/test/ui/range/range-1.stderr similarity index 97% rename from src/test/ui/compile-fail-migration/range-1.stderr rename to src/test/ui/range/range-1.stderr index 7225c931fae..2e83bab4e8d 100644 --- a/src/test/ui/compile-fail-migration/range-1.stderr +++ b/src/test/ui/range/range-1.stderr @@ -19,7 +19,7 @@ LL | let range = *arr..; | ^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `[{integer}]` - = note: to learn more, visit + = note: to learn more, visit = note: required by `std::ops::RangeFrom` error: aborting due to 3 previous errors diff --git a/src/test/ui/range-inclusive-pattern-precedence.rs b/src/test/ui/range/range-inclusive-pattern-precedence.rs similarity index 100% rename from src/test/ui/range-inclusive-pattern-precedence.rs rename to src/test/ui/range/range-inclusive-pattern-precedence.rs diff --git a/src/test/ui/range-inclusive-pattern-precedence.stderr b/src/test/ui/range/range-inclusive-pattern-precedence.stderr similarity index 100% rename from src/test/ui/range-inclusive-pattern-precedence.stderr rename to src/test/ui/range/range-inclusive-pattern-precedence.stderr diff --git a/src/test/ui/compile-fail-migration/range_traits-1.rs b/src/test/ui/range/range_traits-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/range_traits-1.rs rename to src/test/ui/range/range_traits-1.rs diff --git a/src/test/ui/compile-fail-migration/range_traits-1.stderr b/src/test/ui/range/range_traits-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/range_traits-1.stderr rename to src/test/ui/range/range_traits-1.stderr diff --git a/src/test/ui/compile-fail-migration/range_traits-2.rs b/src/test/ui/range/range_traits-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/range_traits-2.rs rename to src/test/ui/range/range_traits-2.rs diff --git a/src/test/ui/compile-fail-migration/range_traits-2.stderr b/src/test/ui/range/range_traits-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/range_traits-2.stderr rename to src/test/ui/range/range_traits-2.stderr diff --git a/src/test/ui/compile-fail-migration/range_traits-3.rs b/src/test/ui/range/range_traits-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/range_traits-3.rs rename to src/test/ui/range/range_traits-3.rs diff --git a/src/test/ui/compile-fail-migration/range_traits-3.stderr b/src/test/ui/range/range_traits-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/range_traits-3.stderr rename to src/test/ui/range/range_traits-3.stderr diff --git a/src/test/ui/compile-fail-migration/range_traits-4.rs b/src/test/ui/range/range_traits-4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/range_traits-4.rs rename to src/test/ui/range/range_traits-4.rs diff --git a/src/test/ui/compile-fail-migration/range_traits-4.stderr b/src/test/ui/range/range_traits-4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/range_traits-4.stderr rename to src/test/ui/range/range_traits-4.stderr diff --git a/src/test/ui/compile-fail-migration/range_traits-5.rs b/src/test/ui/range/range_traits-5.rs similarity index 100% rename from src/test/ui/compile-fail-migration/range_traits-5.rs rename to src/test/ui/range/range_traits-5.rs diff --git a/src/test/ui/compile-fail-migration/range_traits-5.stderr b/src/test/ui/range/range_traits-5.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/range_traits-5.stderr rename to src/test/ui/range/range_traits-5.stderr diff --git a/src/test/ui/compile-fail-migration/range_traits-6.rs b/src/test/ui/range/range_traits-6.rs similarity index 100% rename from src/test/ui/compile-fail-migration/range_traits-6.rs rename to src/test/ui/range/range_traits-6.rs diff --git a/src/test/ui/compile-fail-migration/range_traits-6.stderr b/src/test/ui/range/range_traits-6.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/range_traits-6.stderr rename to src/test/ui/range/range_traits-6.stderr diff --git a/src/test/ui/compile-fail-migration/range_traits-7.rs b/src/test/ui/range/range_traits-7.rs similarity index 100% rename from src/test/ui/compile-fail-migration/range_traits-7.rs rename to src/test/ui/range/range_traits-7.rs diff --git a/src/test/ui/compile-fail-migration/range_traits-7.stderr b/src/test/ui/range/range_traits-7.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/range_traits-7.stderr rename to src/test/ui/range/range_traits-7.stderr diff --git a/src/test/ui/raw-literal-keywords.rs b/src/test/ui/raw/raw-literal-keywords.rs similarity index 100% rename from src/test/ui/raw-literal-keywords.rs rename to src/test/ui/raw/raw-literal-keywords.rs diff --git a/src/test/ui/raw-literal-keywords.stderr b/src/test/ui/raw/raw-literal-keywords.stderr similarity index 100% rename from src/test/ui/raw-literal-keywords.stderr rename to src/test/ui/raw/raw-literal-keywords.stderr diff --git a/src/test/ui/raw-literal-self.rs b/src/test/ui/raw/raw-literal-self.rs similarity index 100% rename from src/test/ui/raw-literal-self.rs rename to src/test/ui/raw/raw-literal-self.rs diff --git a/src/test/ui/raw-literal-self.stderr b/src/test/ui/raw/raw-literal-self.stderr similarity index 100% rename from src/test/ui/raw-literal-self.stderr rename to src/test/ui/raw/raw-literal-self.stderr diff --git a/src/test/ui/raw-literal-underscore.rs b/src/test/ui/raw/raw-literal-underscore.rs similarity index 100% rename from src/test/ui/raw-literal-underscore.rs rename to src/test/ui/raw/raw-literal-underscore.rs diff --git a/src/test/ui/raw-literal-underscore.stderr b/src/test/ui/raw/raw-literal-underscore.stderr similarity index 100% rename from src/test/ui/raw-literal-underscore.stderr rename to src/test/ui/raw/raw-literal-underscore.stderr diff --git a/src/test/ui/raw_string.rs b/src/test/ui/raw/raw_string.rs similarity index 100% rename from src/test/ui/raw_string.rs rename to src/test/ui/raw/raw_string.rs diff --git a/src/test/ui/raw_string.stderr b/src/test/ui/raw/raw_string.stderr similarity index 100% rename from src/test/ui/raw_string.stderr rename to src/test/ui/raw/raw_string.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/recursive_reexports.rs b/src/test/ui/recursion/auxiliary/recursive_reexports.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/recursive_reexports.rs rename to src/test/ui/recursion/auxiliary/recursive_reexports.rs diff --git a/src/test/ui/compile-fail-migration/recursion.rs b/src/test/ui/recursion/recursion.rs similarity index 100% rename from src/test/ui/compile-fail-migration/recursion.rs rename to src/test/ui/recursion/recursion.rs diff --git a/src/test/ui/compile-fail-migration/recursion.stderr b/src/test/ui/recursion/recursion.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/recursion.stderr rename to src/test/ui/recursion/recursion.stderr diff --git a/src/test/ui/compile-fail-migration/recursive-enum.rs b/src/test/ui/recursion/recursive-enum.rs similarity index 100% rename from src/test/ui/compile-fail-migration/recursive-enum.rs rename to src/test/ui/recursion/recursive-enum.rs diff --git a/src/test/ui/compile-fail-migration/recursive-enum.stderr b/src/test/ui/recursion/recursive-enum.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/recursive-enum.stderr rename to src/test/ui/recursion/recursive-enum.stderr diff --git a/src/test/ui/compile-fail-migration/recursive-reexports.rs b/src/test/ui/recursion/recursive-reexports.rs similarity index 100% rename from src/test/ui/compile-fail-migration/recursive-reexports.rs rename to src/test/ui/recursion/recursive-reexports.rs diff --git a/src/test/ui/compile-fail-migration/recursive-reexports.stderr b/src/test/ui/recursion/recursive-reexports.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/recursive-reexports.stderr rename to src/test/ui/recursion/recursive-reexports.stderr diff --git a/src/test/ui/recursive-requirements.rs b/src/test/ui/recursion/recursive-requirements.rs similarity index 100% rename from src/test/ui/recursive-requirements.rs rename to src/test/ui/recursion/recursive-requirements.rs diff --git a/src/test/ui/recursive-requirements.stderr b/src/test/ui/recursion/recursive-requirements.stderr similarity index 100% rename from src/test/ui/recursive-requirements.stderr rename to src/test/ui/recursion/recursive-requirements.stderr diff --git a/src/test/ui/compile-fail-migration/recursive-static-definition.rs b/src/test/ui/recursion/recursive-static-definition.rs similarity index 100% rename from src/test/ui/compile-fail-migration/recursive-static-definition.rs rename to src/test/ui/recursion/recursive-static-definition.rs diff --git a/src/test/ui/compile-fail-migration/recursive-static-definition.stderr b/src/test/ui/recursion/recursive-static-definition.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/recursive-static-definition.stderr rename to src/test/ui/recursion/recursive-static-definition.stderr diff --git a/src/test/ui/compile-fail-migration/recursive-types-are-not-uninhabited.rs b/src/test/ui/recursion/recursive-types-are-not-uninhabited.rs similarity index 100% rename from src/test/ui/compile-fail-migration/recursive-types-are-not-uninhabited.rs rename to src/test/ui/recursion/recursive-types-are-not-uninhabited.rs diff --git a/src/test/ui/compile-fail-migration/recursive-types-are-not-uninhabited.stderr b/src/test/ui/recursion/recursive-types-are-not-uninhabited.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/recursive-types-are-not-uninhabited.stderr rename to src/test/ui/recursion/recursive-types-are-not-uninhabited.stderr diff --git a/src/test/ui/compile-fail-migration/ref-suggestion.nll.stderr b/src/test/ui/ref-suggestion.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/ref-suggestion.nll.stderr rename to src/test/ui/ref-suggestion.nll.stderr diff --git a/src/test/ui/compile-fail-migration/ref-suggestion.rs b/src/test/ui/ref-suggestion.rs similarity index 100% rename from src/test/ui/compile-fail-migration/ref-suggestion.rs rename to src/test/ui/ref-suggestion.rs diff --git a/src/test/ui/compile-fail-migration/ref-suggestion.stderr b/src/test/ui/ref-suggestion.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/ref-suggestion.stderr rename to src/test/ui/ref-suggestion.stderr diff --git a/src/test/ui/compile-fail-migration/refutable-pattern-errors.rs b/src/test/ui/refutable-pattern-errors.rs similarity index 100% rename from src/test/ui/compile-fail-migration/refutable-pattern-errors.rs rename to src/test/ui/refutable-pattern-errors.rs diff --git a/src/test/ui/compile-fail-migration/refutable-pattern-errors.stderr b/src/test/ui/refutable-pattern-errors.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/refutable-pattern-errors.stderr rename to src/test/ui/refutable-pattern-errors.stderr diff --git a/src/test/ui/compile-fail-migration/refutable-pattern-in-fn-arg.rs b/src/test/ui/refutable-pattern-in-fn-arg.rs similarity index 100% rename from src/test/ui/compile-fail-migration/refutable-pattern-in-fn-arg.rs rename to src/test/ui/refutable-pattern-in-fn-arg.rs diff --git a/src/test/ui/compile-fail-migration/refutable-pattern-in-fn-arg.stderr b/src/test/ui/refutable-pattern-in-fn-arg.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/refutable-pattern-in-fn-arg.stderr rename to src/test/ui/refutable-pattern-in-fn-arg.stderr diff --git a/src/test/ui/compile-fail-migration/regions-fn-subtyping-return-static.rs b/src/test/ui/regions-fn-subtyping-return-static-fail.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-fn-subtyping-return-static.rs rename to src/test/ui/regions-fn-subtyping-return-static-fail.rs diff --git a/src/test/ui/compile-fail-migration/regions-fn-subtyping-return-static.stderr b/src/test/ui/regions-fn-subtyping-return-static-fail.stderr similarity index 84% rename from src/test/ui/compile-fail-migration/regions-fn-subtyping-return-static.stderr rename to src/test/ui/regions-fn-subtyping-return-static-fail.stderr index 6d487666c6f..ff4d00ae66b 100644 --- a/src/test/ui/compile-fail-migration/regions-fn-subtyping-return-static.stderr +++ b/src/test/ui/regions-fn-subtyping-return-static-fail.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/regions-fn-subtyping-return-static.rs:51:12 + --> $DIR/regions-fn-subtyping-return-static-fail.rs:51:12 | LL | want_F(bar); //~ ERROR E0308 | ^^^ expected concrete lifetime, found bound lifetime parameter 'cx @@ -8,7 +8,7 @@ LL | want_F(bar); //~ ERROR E0308 found type `for<'a> fn(&'a S) -> &S {bar::<'_>}` error[E0308]: mismatched types - --> $DIR/regions-fn-subtyping-return-static.rs:59:12 + --> $DIR/regions-fn-subtyping-return-static-fail.rs:59:12 | LL | want_G(baz); | ^^^ expected concrete lifetime, found bound lifetime parameter 'cx diff --git a/src/test/ui/compile-fail-migration/auxiliary/rbmtp_cross_crate_lib.rs b/src/test/ui/regions/auxiliary/rbmtp_cross_crate_lib.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/rbmtp_cross_crate_lib.rs rename to src/test/ui/regions/auxiliary/rbmtp_cross_crate_lib.rs diff --git a/src/test/ui/compile-fail-migration/region-borrow-params-issue-29793-big.ast.nll.stderr b/src/test/ui/regions/region-borrow-params-issue-29793-big.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-borrow-params-issue-29793-big.ast.nll.stderr rename to src/test/ui/regions/region-borrow-params-issue-29793-big.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/region-borrow-params-issue-29793-big.ast.stderr b/src/test/ui/regions/region-borrow-params-issue-29793-big.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-borrow-params-issue-29793-big.ast.stderr rename to src/test/ui/regions/region-borrow-params-issue-29793-big.ast.stderr diff --git a/src/test/ui/compile-fail-migration/region-borrow-params-issue-29793-big.mir.stderr b/src/test/ui/regions/region-borrow-params-issue-29793-big.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-borrow-params-issue-29793-big.mir.stderr rename to src/test/ui/regions/region-borrow-params-issue-29793-big.mir.stderr diff --git a/src/test/ui/compile-fail-migration/region-borrow-params-issue-29793-big.rs b/src/test/ui/regions/region-borrow-params-issue-29793-big.rs similarity index 100% rename from src/test/ui/compile-fail-migration/region-borrow-params-issue-29793-big.rs rename to src/test/ui/regions/region-borrow-params-issue-29793-big.rs diff --git a/src/test/ui/region-borrow-params-issue-29793-small.nll.stderr b/src/test/ui/regions/region-borrow-params-issue-29793-small.nll.stderr similarity index 100% rename from src/test/ui/region-borrow-params-issue-29793-small.nll.stderr rename to src/test/ui/regions/region-borrow-params-issue-29793-small.nll.stderr diff --git a/src/test/ui/region-borrow-params-issue-29793-small.rs b/src/test/ui/regions/region-borrow-params-issue-29793-small.rs similarity index 100% rename from src/test/ui/region-borrow-params-issue-29793-small.rs rename to src/test/ui/regions/region-borrow-params-issue-29793-small.rs diff --git a/src/test/ui/region-borrow-params-issue-29793-small.stderr b/src/test/ui/regions/region-borrow-params-issue-29793-small.stderr similarity index 100% rename from src/test/ui/region-borrow-params-issue-29793-small.stderr rename to src/test/ui/regions/region-borrow-params-issue-29793-small.stderr diff --git a/src/test/ui/compile-fail-migration/region-bound-extra-bound-in-inherent-impl.rs b/src/test/ui/regions/region-bound-extra-bound-in-inherent-impl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/region-bound-extra-bound-in-inherent-impl.rs rename to src/test/ui/regions/region-bound-extra-bound-in-inherent-impl.rs diff --git a/src/test/ui/compile-fail-migration/region-bound-extra-bound-in-inherent-impl.stderr b/src/test/ui/regions/region-bound-extra-bound-in-inherent-impl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-bound-extra-bound-in-inherent-impl.stderr rename to src/test/ui/regions/region-bound-extra-bound-in-inherent-impl.stderr diff --git a/src/test/ui/compile-fail-migration/region-bound-on-closure-outlives-call.nll.stderr b/src/test/ui/regions/region-bound-on-closure-outlives-call.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-bound-on-closure-outlives-call.nll.stderr rename to src/test/ui/regions/region-bound-on-closure-outlives-call.nll.stderr diff --git a/src/test/ui/compile-fail-migration/region-bound-on-closure-outlives-call.rs b/src/test/ui/regions/region-bound-on-closure-outlives-call.rs similarity index 100% rename from src/test/ui/compile-fail-migration/region-bound-on-closure-outlives-call.rs rename to src/test/ui/regions/region-bound-on-closure-outlives-call.rs diff --git a/src/test/ui/compile-fail-migration/region-bound-on-closure-outlives-call.stderr b/src/test/ui/regions/region-bound-on-closure-outlives-call.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-bound-on-closure-outlives-call.stderr rename to src/test/ui/regions/region-bound-on-closure-outlives-call.stderr diff --git a/src/test/ui/compile-fail-migration/region-bound-same-bounds-in-trait-and-impl.rs b/src/test/ui/regions/region-bound-same-bounds-in-trait-and-impl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/region-bound-same-bounds-in-trait-and-impl.rs rename to src/test/ui/regions/region-bound-same-bounds-in-trait-and-impl.rs diff --git a/src/test/ui/compile-fail-migration/region-bound-same-bounds-in-trait-and-impl.stderr b/src/test/ui/regions/region-bound-same-bounds-in-trait-and-impl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-bound-same-bounds-in-trait-and-impl.stderr rename to src/test/ui/regions/region-bound-same-bounds-in-trait-and-impl.stderr diff --git a/src/test/ui/compile-fail-migration/region-bounds-on-objects-and-type-parameters.rs b/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.rs similarity index 100% rename from src/test/ui/compile-fail-migration/region-bounds-on-objects-and-type-parameters.rs rename to src/test/ui/regions/region-bounds-on-objects-and-type-parameters.rs diff --git a/src/test/ui/compile-fail-migration/region-bounds-on-objects-and-type-parameters.stderr b/src/test/ui/regions/region-bounds-on-objects-and-type-parameters.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-bounds-on-objects-and-type-parameters.stderr rename to src/test/ui/regions/region-bounds-on-objects-and-type-parameters.stderr diff --git a/src/test/ui/compile-fail-migration/region-invariant-static-error-reporting.nll.stderr b/src/test/ui/regions/region-invariant-static-error-reporting.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-invariant-static-error-reporting.nll.stderr rename to src/test/ui/regions/region-invariant-static-error-reporting.nll.stderr diff --git a/src/test/ui/compile-fail-migration/region-invariant-static-error-reporting.rs b/src/test/ui/regions/region-invariant-static-error-reporting.rs similarity index 100% rename from src/test/ui/compile-fail-migration/region-invariant-static-error-reporting.rs rename to src/test/ui/regions/region-invariant-static-error-reporting.rs diff --git a/src/test/ui/compile-fail-migration/region-invariant-static-error-reporting.stderr b/src/test/ui/regions/region-invariant-static-error-reporting.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-invariant-static-error-reporting.stderr rename to src/test/ui/regions/region-invariant-static-error-reporting.stderr diff --git a/src/test/ui/compile-fail-migration/region-lifetime-bounds-on-fns-where-clause.nll.stderr b/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-lifetime-bounds-on-fns-where-clause.nll.stderr rename to src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.nll.stderr diff --git a/src/test/ui/compile-fail-migration/region-lifetime-bounds-on-fns-where-clause.rs b/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.rs similarity index 100% rename from src/test/ui/compile-fail-migration/region-lifetime-bounds-on-fns-where-clause.rs rename to src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.rs diff --git a/src/test/ui/compile-fail-migration/region-lifetime-bounds-on-fns-where-clause.stderr b/src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-lifetime-bounds-on-fns-where-clause.stderr rename to src/test/ui/regions/region-lifetime-bounds-on-fns-where-clause.stderr diff --git a/src/test/ui/compile-fail-migration/region-multiple-lifetime-bounds-on-fns-where-clause.nll.stderr b/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-multiple-lifetime-bounds-on-fns-where-clause.nll.stderr rename to src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.nll.stderr diff --git a/src/test/ui/compile-fail-migration/region-multiple-lifetime-bounds-on-fns-where-clause.rs b/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.rs similarity index 100% rename from src/test/ui/compile-fail-migration/region-multiple-lifetime-bounds-on-fns-where-clause.rs rename to src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.rs diff --git a/src/test/ui/compile-fail-migration/region-multiple-lifetime-bounds-on-fns-where-clause.stderr b/src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-multiple-lifetime-bounds-on-fns-where-clause.stderr rename to src/test/ui/regions/region-multiple-lifetime-bounds-on-fns-where-clause.stderr diff --git a/src/test/ui/compile-fail-migration/region-object-lifetime-1.rs b/src/test/ui/regions/region-object-lifetime-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/region-object-lifetime-1.rs rename to src/test/ui/regions/region-object-lifetime-1.rs diff --git a/src/test/ui/compile-fail-migration/region-object-lifetime-1.stderr b/src/test/ui/regions/region-object-lifetime-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-object-lifetime-1.stderr rename to src/test/ui/regions/region-object-lifetime-1.stderr diff --git a/src/test/ui/compile-fail-migration/region-object-lifetime-2.nll.stderr b/src/test/ui/regions/region-object-lifetime-2.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-object-lifetime-2.nll.stderr rename to src/test/ui/regions/region-object-lifetime-2.nll.stderr diff --git a/src/test/ui/compile-fail-migration/region-object-lifetime-2.rs b/src/test/ui/regions/region-object-lifetime-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/region-object-lifetime-2.rs rename to src/test/ui/regions/region-object-lifetime-2.rs diff --git a/src/test/ui/compile-fail-migration/region-object-lifetime-2.stderr b/src/test/ui/regions/region-object-lifetime-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-object-lifetime-2.stderr rename to src/test/ui/regions/region-object-lifetime-2.stderr diff --git a/src/test/ui/compile-fail-migration/region-object-lifetime-3.rs b/src/test/ui/regions/region-object-lifetime-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/region-object-lifetime-3.rs rename to src/test/ui/regions/region-object-lifetime-3.rs diff --git a/src/test/ui/compile-fail-migration/region-object-lifetime-3.stderr b/src/test/ui/regions/region-object-lifetime-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-object-lifetime-3.stderr rename to src/test/ui/regions/region-object-lifetime-3.stderr diff --git a/src/test/ui/compile-fail-migration/region-object-lifetime-4.nll.stderr b/src/test/ui/regions/region-object-lifetime-4.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-object-lifetime-4.nll.stderr rename to src/test/ui/regions/region-object-lifetime-4.nll.stderr diff --git a/src/test/ui/compile-fail-migration/region-object-lifetime-4.rs b/src/test/ui/regions/region-object-lifetime-4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/region-object-lifetime-4.rs rename to src/test/ui/regions/region-object-lifetime-4.rs diff --git a/src/test/ui/compile-fail-migration/region-object-lifetime-4.stderr b/src/test/ui/regions/region-object-lifetime-4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-object-lifetime-4.stderr rename to src/test/ui/regions/region-object-lifetime-4.stderr diff --git a/src/test/ui/compile-fail-migration/region-object-lifetime-5.nll.stderr b/src/test/ui/regions/region-object-lifetime-5.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-object-lifetime-5.nll.stderr rename to src/test/ui/regions/region-object-lifetime-5.nll.stderr diff --git a/src/test/ui/compile-fail-migration/region-object-lifetime-5.rs b/src/test/ui/regions/region-object-lifetime-5.rs similarity index 100% rename from src/test/ui/compile-fail-migration/region-object-lifetime-5.rs rename to src/test/ui/regions/region-object-lifetime-5.rs diff --git a/src/test/ui/compile-fail-migration/region-object-lifetime-5.stderr b/src/test/ui/regions/region-object-lifetime-5.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-object-lifetime-5.stderr rename to src/test/ui/regions/region-object-lifetime-5.stderr diff --git a/src/test/ui/compile-fail-migration/region-object-lifetime-in-coercion.nll.stderr b/src/test/ui/regions/region-object-lifetime-in-coercion.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-object-lifetime-in-coercion.nll.stderr rename to src/test/ui/regions/region-object-lifetime-in-coercion.nll.stderr diff --git a/src/test/ui/compile-fail-migration/region-object-lifetime-in-coercion.rs b/src/test/ui/regions/region-object-lifetime-in-coercion.rs similarity index 100% rename from src/test/ui/compile-fail-migration/region-object-lifetime-in-coercion.rs rename to src/test/ui/regions/region-object-lifetime-in-coercion.rs diff --git a/src/test/ui/compile-fail-migration/region-object-lifetime-in-coercion.stderr b/src/test/ui/regions/region-object-lifetime-in-coercion.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/region-object-lifetime-in-coercion.stderr rename to src/test/ui/regions/region-object-lifetime-in-coercion.stderr diff --git a/src/test/ui/compile-fail-migration/regions-addr-of-arg.nll.stderr b/src/test/ui/regions/regions-addr-of-arg.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-addr-of-arg.nll.stderr rename to src/test/ui/regions/regions-addr-of-arg.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-addr-of-arg.rs b/src/test/ui/regions/regions-addr-of-arg.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-addr-of-arg.rs rename to src/test/ui/regions/regions-addr-of-arg.rs diff --git a/src/test/ui/compile-fail-migration/regions-addr-of-arg.stderr b/src/test/ui/regions/regions-addr-of-arg.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-addr-of-arg.stderr rename to src/test/ui/regions/regions-addr-of-arg.stderr diff --git a/src/test/ui/compile-fail-migration/regions-addr-of-self.nll.stderr b/src/test/ui/regions/regions-addr-of-self.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-addr-of-self.nll.stderr rename to src/test/ui/regions/regions-addr-of-self.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-addr-of-self.rs b/src/test/ui/regions/regions-addr-of-self.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-addr-of-self.rs rename to src/test/ui/regions/regions-addr-of-self.rs diff --git a/src/test/ui/compile-fail-migration/regions-addr-of-self.stderr b/src/test/ui/regions/regions-addr-of-self.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-addr-of-self.stderr rename to src/test/ui/regions/regions-addr-of-self.stderr diff --git a/src/test/ui/compile-fail-migration/regions-addr-of-upvar-self.nll.stderr b/src/test/ui/regions/regions-addr-of-upvar-self.nll.stderr similarity index 76% rename from src/test/ui/compile-fail-migration/regions-addr-of-upvar-self.nll.stderr rename to src/test/ui/regions/regions-addr-of-upvar-self.nll.stderr index 733ac7a06ae..0ee86172368 100644 --- a/src/test/ui/compile-fail-migration/regions-addr-of-upvar-self.nll.stderr +++ b/src/test/ui/regions/regions-addr-of-upvar-self.nll.stderr @@ -7,13 +7,12 @@ LL | let p: &'static mut usize = &mut self.food; //~ ERROR cannot in error: unsatisfied lifetime constraints --> $DIR/regions-addr-of-upvar-self.rs:20:41 | -LL | let _f = || { - | __________________- -LL | | let p: &'static mut usize = &mut self.food; //~ ERROR cannot infer - | | ^^^^^^^^^^^^^^ requires that `'1` must outlive `'static` -LL | | *p = 3; -LL | | }; - | |_________- lifetime `'1` represents the closure body +LL | let _f = || { + | -- lifetime `'1` represents this closure's body +LL | let p: &'static mut usize = &mut self.food; //~ ERROR cannot infer + | ^^^^^^^^^^^^^^ requires that `'1` must outlive `'static` + | + = note: closure implements `FnMut`, so references to captured variables can't escape the closure error: unsatisfied lifetime constraints --> $DIR/regions-addr-of-upvar-self.rs:19:13 diff --git a/src/test/ui/compile-fail-migration/regions-addr-of-upvar-self.rs b/src/test/ui/regions/regions-addr-of-upvar-self.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-addr-of-upvar-self.rs rename to src/test/ui/regions/regions-addr-of-upvar-self.rs diff --git a/src/test/ui/compile-fail-migration/regions-addr-of-upvar-self.stderr b/src/test/ui/regions/regions-addr-of-upvar-self.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-addr-of-upvar-self.stderr rename to src/test/ui/regions/regions-addr-of-upvar-self.stderr diff --git a/src/test/ui/compile-fail-migration/regions-adjusted-lvalue-op.nll.stderr b/src/test/ui/regions/regions-adjusted-lvalue-op.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-adjusted-lvalue-op.nll.stderr rename to src/test/ui/regions/regions-adjusted-lvalue-op.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-adjusted-lvalue-op.rs b/src/test/ui/regions/regions-adjusted-lvalue-op.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-adjusted-lvalue-op.rs rename to src/test/ui/regions/regions-adjusted-lvalue-op.rs diff --git a/src/test/ui/compile-fail-migration/regions-adjusted-lvalue-op.stderr b/src/test/ui/regions/regions-adjusted-lvalue-op.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-adjusted-lvalue-op.stderr rename to src/test/ui/regions/regions-adjusted-lvalue-op.stderr diff --git a/src/test/ui/compile-fail-migration/regions-assoc-type-in-supertrait-outlives-container.rs b/src/test/ui/regions/regions-assoc-type-in-supertrait-outlives-container.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-assoc-type-in-supertrait-outlives-container.rs rename to src/test/ui/regions/regions-assoc-type-in-supertrait-outlives-container.rs diff --git a/src/test/ui/compile-fail-migration/regions-assoc-type-in-supertrait-outlives-container.stderr b/src/test/ui/regions/regions-assoc-type-in-supertrait-outlives-container.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-assoc-type-in-supertrait-outlives-container.stderr rename to src/test/ui/regions/regions-assoc-type-in-supertrait-outlives-container.stderr diff --git a/src/test/ui/compile-fail-migration/regions-assoc-type-region-bound-in-trait-not-met.rs b/src/test/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-assoc-type-region-bound-in-trait-not-met.rs rename to src/test/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.rs diff --git a/src/test/ui/compile-fail-migration/regions-assoc-type-region-bound-in-trait-not-met.stderr b/src/test/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-assoc-type-region-bound-in-trait-not-met.stderr rename to src/test/ui/regions/regions-assoc-type-region-bound-in-trait-not-met.stderr diff --git a/src/test/ui/compile-fail-migration/regions-assoc-type-static-bound-in-trait-not-met.rs b/src/test/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-assoc-type-static-bound-in-trait-not-met.rs rename to src/test/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.rs diff --git a/src/test/ui/compile-fail-migration/regions-assoc-type-static-bound-in-trait-not-met.stderr b/src/test/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-assoc-type-static-bound-in-trait-not-met.stderr rename to src/test/ui/regions/regions-assoc-type-static-bound-in-trait-not-met.stderr diff --git a/src/test/ui/compile-fail-migration/regions-bounded-by-trait-requiring-static.rs b/src/test/ui/regions/regions-bounded-by-trait-requiring-static.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-bounded-by-trait-requiring-static.rs rename to src/test/ui/regions/regions-bounded-by-trait-requiring-static.rs diff --git a/src/test/ui/compile-fail-migration/regions-bounded-by-trait-requiring-static.stderr b/src/test/ui/regions/regions-bounded-by-trait-requiring-static.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-bounded-by-trait-requiring-static.stderr rename to src/test/ui/regions/regions-bounded-by-trait-requiring-static.stderr diff --git a/src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters-cross-crate.nll.stderr b/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters-cross-crate.nll.stderr rename to src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters-cross-crate.rs b/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters-cross-crate.rs rename to src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.rs diff --git a/src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters-cross-crate.stderr b/src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters-cross-crate.stderr rename to src/test/ui/regions/regions-bounded-method-type-parameters-cross-crate.stderr diff --git a/src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters-trait-bound.nll.stderr b/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters-trait-bound.nll.stderr rename to src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters-trait-bound.rs b/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters-trait-bound.rs rename to src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.rs diff --git a/src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters-trait-bound.stderr b/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters-trait-bound.stderr rename to src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.stderr diff --git a/src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters.rs b/src/test/ui/regions/regions-bounded-method-type-parameters.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters.rs rename to src/test/ui/regions/regions-bounded-method-type-parameters.rs diff --git a/src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters.stderr b/src/test/ui/regions/regions-bounded-method-type-parameters.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters.stderr rename to src/test/ui/regions/regions-bounded-method-type-parameters.stderr diff --git a/src/test/ui/compile-fail-migration/regions-bounds.nll.stderr b/src/test/ui/regions/regions-bounds.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-bounds.nll.stderr rename to src/test/ui/regions/regions-bounds.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-bounds.rs b/src/test/ui/regions/regions-bounds.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-bounds.rs rename to src/test/ui/regions/regions-bounds.rs diff --git a/src/test/ui/compile-fail-migration/regions-bounds.stderr b/src/test/ui/regions/regions-bounds.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-bounds.stderr rename to src/test/ui/regions/regions-bounds.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-associated-type-into-object.nll.stderr b/src/test/ui/regions/regions-close-associated-type-into-object.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-associated-type-into-object.nll.stderr rename to src/test/ui/regions/regions-close-associated-type-into-object.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-associated-type-into-object.rs b/src/test/ui/regions/regions-close-associated-type-into-object.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-associated-type-into-object.rs rename to src/test/ui/regions/regions-close-associated-type-into-object.rs diff --git a/src/test/ui/compile-fail-migration/regions-close-associated-type-into-object.stderr b/src/test/ui/regions/regions-close-associated-type-into-object.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-associated-type-into-object.stderr rename to src/test/ui/regions/regions-close-associated-type-into-object.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-object-into-object-1.nll.stderr b/src/test/ui/regions/regions-close-object-into-object-1.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-object-into-object-1.nll.stderr rename to src/test/ui/regions/regions-close-object-into-object-1.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-object-into-object-1.rs b/src/test/ui/regions/regions-close-object-into-object-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-object-into-object-1.rs rename to src/test/ui/regions/regions-close-object-into-object-1.rs diff --git a/src/test/ui/compile-fail-migration/regions-close-object-into-object-1.stderr b/src/test/ui/regions/regions-close-object-into-object-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-object-into-object-1.stderr rename to src/test/ui/regions/regions-close-object-into-object-1.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-object-into-object-2.nll.stderr b/src/test/ui/regions/regions-close-object-into-object-2.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-object-into-object-2.nll.stderr rename to src/test/ui/regions/regions-close-object-into-object-2.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-object-into-object-2.rs b/src/test/ui/regions/regions-close-object-into-object-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-object-into-object-2.rs rename to src/test/ui/regions/regions-close-object-into-object-2.rs diff --git a/src/test/ui/compile-fail-migration/regions-close-object-into-object-2.stderr b/src/test/ui/regions/regions-close-object-into-object-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-object-into-object-2.stderr rename to src/test/ui/regions/regions-close-object-into-object-2.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-object-into-object-3.nll.stderr b/src/test/ui/regions/regions-close-object-into-object-3.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-object-into-object-3.nll.stderr rename to src/test/ui/regions/regions-close-object-into-object-3.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-object-into-object-3.rs b/src/test/ui/regions/regions-close-object-into-object-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-object-into-object-3.rs rename to src/test/ui/regions/regions-close-object-into-object-3.rs diff --git a/src/test/ui/compile-fail-migration/regions-close-object-into-object-3.stderr b/src/test/ui/regions/regions-close-object-into-object-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-object-into-object-3.stderr rename to src/test/ui/regions/regions-close-object-into-object-3.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-object-into-object-4.nll.stderr b/src/test/ui/regions/regions-close-object-into-object-4.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-object-into-object-4.nll.stderr rename to src/test/ui/regions/regions-close-object-into-object-4.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-object-into-object-4.rs b/src/test/ui/regions/regions-close-object-into-object-4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-object-into-object-4.rs rename to src/test/ui/regions/regions-close-object-into-object-4.rs diff --git a/src/test/ui/compile-fail-migration/regions-close-object-into-object-4.stderr b/src/test/ui/regions/regions-close-object-into-object-4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-object-into-object-4.stderr rename to src/test/ui/regions/regions-close-object-into-object-4.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-object-into-object-5.nll.stderr b/src/test/ui/regions/regions-close-object-into-object-5.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-object-into-object-5.nll.stderr rename to src/test/ui/regions/regions-close-object-into-object-5.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-object-into-object-5.rs b/src/test/ui/regions/regions-close-object-into-object-5.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-object-into-object-5.rs rename to src/test/ui/regions/regions-close-object-into-object-5.rs diff --git a/src/test/ui/compile-fail-migration/regions-close-object-into-object-5.stderr b/src/test/ui/regions/regions-close-object-into-object-5.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-object-into-object-5.stderr rename to src/test/ui/regions/regions-close-object-into-object-5.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-over-type-parameter-1.nll.stderr b/src/test/ui/regions/regions-close-over-type-parameter-1.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-over-type-parameter-1.nll.stderr rename to src/test/ui/regions/regions-close-over-type-parameter-1.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-over-type-parameter-1.rs b/src/test/ui/regions/regions-close-over-type-parameter-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-over-type-parameter-1.rs rename to src/test/ui/regions/regions-close-over-type-parameter-1.rs diff --git a/src/test/ui/compile-fail-migration/regions-close-over-type-parameter-1.stderr b/src/test/ui/regions/regions-close-over-type-parameter-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-over-type-parameter-1.stderr rename to src/test/ui/regions/regions-close-over-type-parameter-1.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-over-type-parameter-multiple.nll.stderr b/src/test/ui/regions/regions-close-over-type-parameter-multiple.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-over-type-parameter-multiple.nll.stderr rename to src/test/ui/regions/regions-close-over-type-parameter-multiple.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-over-type-parameter-multiple.rs b/src/test/ui/regions/regions-close-over-type-parameter-multiple.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-over-type-parameter-multiple.rs rename to src/test/ui/regions/regions-close-over-type-parameter-multiple.rs diff --git a/src/test/ui/compile-fail-migration/regions-close-over-type-parameter-multiple.stderr b/src/test/ui/regions/regions-close-over-type-parameter-multiple.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-over-type-parameter-multiple.stderr rename to src/test/ui/regions/regions-close-over-type-parameter-multiple.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-param-into-object.nll.stderr b/src/test/ui/regions/regions-close-param-into-object.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-param-into-object.nll.stderr rename to src/test/ui/regions/regions-close-param-into-object.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-close-param-into-object.rs b/src/test/ui/regions/regions-close-param-into-object.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-param-into-object.rs rename to src/test/ui/regions/regions-close-param-into-object.rs diff --git a/src/test/ui/compile-fail-migration/regions-close-param-into-object.stderr b/src/test/ui/regions/regions-close-param-into-object.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-close-param-into-object.stderr rename to src/test/ui/regions/regions-close-param-into-object.stderr diff --git a/src/test/ui/compile-fail-migration/regions-creating-enums.nll.stderr b/src/test/ui/regions/regions-creating-enums.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-creating-enums.nll.stderr rename to src/test/ui/regions/regions-creating-enums.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-creating-enums.rs b/src/test/ui/regions/regions-creating-enums.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-creating-enums.rs rename to src/test/ui/regions/regions-creating-enums.rs diff --git a/src/test/ui/compile-fail-migration/regions-creating-enums.stderr b/src/test/ui/regions/regions-creating-enums.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-creating-enums.stderr rename to src/test/ui/regions/regions-creating-enums.stderr diff --git a/src/test/ui/compile-fail-migration/regions-creating-enums3.nll.stderr b/src/test/ui/regions/regions-creating-enums3.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-creating-enums3.nll.stderr rename to src/test/ui/regions/regions-creating-enums3.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-creating-enums3.rs b/src/test/ui/regions/regions-creating-enums3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-creating-enums3.rs rename to src/test/ui/regions/regions-creating-enums3.rs diff --git a/src/test/ui/compile-fail-migration/regions-creating-enums3.stderr b/src/test/ui/regions/regions-creating-enums3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-creating-enums3.stderr rename to src/test/ui/regions/regions-creating-enums3.stderr diff --git a/src/test/ui/compile-fail-migration/regions-creating-enums4.nll.stderr b/src/test/ui/regions/regions-creating-enums4.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-creating-enums4.nll.stderr rename to src/test/ui/regions/regions-creating-enums4.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-creating-enums4.rs b/src/test/ui/regions/regions-creating-enums4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-creating-enums4.rs rename to src/test/ui/regions/regions-creating-enums4.rs diff --git a/src/test/ui/compile-fail-migration/regions-creating-enums4.stderr b/src/test/ui/regions/regions-creating-enums4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-creating-enums4.stderr rename to src/test/ui/regions/regions-creating-enums4.stderr diff --git a/src/test/ui/compile-fail-migration/regions-early-bound-error-method.nll.stderr b/src/test/ui/regions/regions-early-bound-error-method.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-early-bound-error-method.nll.stderr rename to src/test/ui/regions/regions-early-bound-error-method.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-early-bound-error-method.rs b/src/test/ui/regions/regions-early-bound-error-method.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-early-bound-error-method.rs rename to src/test/ui/regions/regions-early-bound-error-method.rs diff --git a/src/test/ui/compile-fail-migration/regions-early-bound-error-method.stderr b/src/test/ui/regions/regions-early-bound-error-method.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-early-bound-error-method.stderr rename to src/test/ui/regions/regions-early-bound-error-method.stderr diff --git a/src/test/ui/compile-fail-migration/regions-early-bound-error.nll.stderr b/src/test/ui/regions/regions-early-bound-error.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-early-bound-error.nll.stderr rename to src/test/ui/regions/regions-early-bound-error.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-early-bound-error.rs b/src/test/ui/regions/regions-early-bound-error.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-early-bound-error.rs rename to src/test/ui/regions/regions-early-bound-error.rs diff --git a/src/test/ui/compile-fail-migration/regions-early-bound-error.stderr b/src/test/ui/regions/regions-early-bound-error.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-early-bound-error.stderr rename to src/test/ui/regions/regions-early-bound-error.stderr diff --git a/src/test/ui/compile-fail-migration/regions-enum-not-wf.rs b/src/test/ui/regions/regions-enum-not-wf.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-enum-not-wf.rs rename to src/test/ui/regions/regions-enum-not-wf.rs diff --git a/src/test/ui/compile-fail-migration/regions-enum-not-wf.stderr b/src/test/ui/regions/regions-enum-not-wf.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-enum-not-wf.stderr rename to src/test/ui/regions/regions-enum-not-wf.stderr diff --git a/src/test/ui/compile-fail-migration/regions-escape-method.nll.stderr b/src/test/ui/regions/regions-escape-method.nll.stderr similarity index 64% rename from src/test/ui/compile-fail-migration/regions-escape-method.nll.stderr rename to src/test/ui/regions/regions-escape-method.nll.stderr index d0811206e4a..aedb93032bd 100644 --- a/src/test/ui/compile-fail-migration/regions-escape-method.nll.stderr +++ b/src/test/ui/regions/regions-escape-method.nll.stderr @@ -8,11 +8,10 @@ error: unsatisfied lifetime constraints --> $DIR/regions-escape-method.rs:25:13 | LL | s.f(|p| p) //~ ERROR cannot infer - | ----^ - | || | - | || return requires that `'1` must outlive `'2` - | |has type `&'1 i32` - | lifetime `'2` appears in return type + | -- ^ return requires that `'1` must outlive `'2` + | || + | |return type of closure is &'2 i32 + | has type `&'1 i32` error: aborting due to previous error diff --git a/src/test/ui/compile-fail-migration/regions-escape-method.rs b/src/test/ui/regions/regions-escape-method.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-escape-method.rs rename to src/test/ui/regions/regions-escape-method.rs diff --git a/src/test/ui/compile-fail-migration/regions-escape-method.stderr b/src/test/ui/regions/regions-escape-method.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-escape-method.stderr rename to src/test/ui/regions/regions-escape-method.stderr diff --git a/src/test/ui/compile-fail-migration/regions-escape-via-trait-or-not.nll.stderr b/src/test/ui/regions/regions-escape-via-trait-or-not.nll.stderr similarity index 64% rename from src/test/ui/compile-fail-migration/regions-escape-via-trait-or-not.nll.stderr rename to src/test/ui/regions/regions-escape-via-trait-or-not.nll.stderr index 7ff49fd413c..e2a05a141a8 100644 --- a/src/test/ui/compile-fail-migration/regions-escape-via-trait-or-not.nll.stderr +++ b/src/test/ui/regions/regions-escape-via-trait-or-not.nll.stderr @@ -8,11 +8,10 @@ error: unsatisfied lifetime constraints --> $DIR/regions-escape-via-trait-or-not.rs:28:14 | LL | with(|o| o) //~ ERROR cannot infer - | ----^ - | || | - | || return requires that `'1` must outlive `'2` - | |has type `&'1 isize` - | lifetime `'2` appears in return type + | -- ^ return requires that `'1` must outlive `'2` + | || + | |return type of closure is &'2 isize + | has type `&'1 isize` error: aborting due to previous error diff --git a/src/test/ui/compile-fail-migration/regions-escape-via-trait-or-not.rs b/src/test/ui/regions/regions-escape-via-trait-or-not.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-escape-via-trait-or-not.rs rename to src/test/ui/regions/regions-escape-via-trait-or-not.rs diff --git a/src/test/ui/compile-fail-migration/regions-escape-via-trait-or-not.stderr b/src/test/ui/regions/regions-escape-via-trait-or-not.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-escape-via-trait-or-not.stderr rename to src/test/ui/regions/regions-escape-via-trait-or-not.stderr diff --git a/src/test/ui/regions-fn-subtyping-return-static.rs b/src/test/ui/regions/regions-fn-subtyping-return-static.rs similarity index 100% rename from src/test/ui/regions-fn-subtyping-return-static.rs rename to src/test/ui/regions/regions-fn-subtyping-return-static.rs diff --git a/src/test/ui/regions-fn-subtyping-return-static.stderr b/src/test/ui/regions/regions-fn-subtyping-return-static.stderr similarity index 100% rename from src/test/ui/regions-fn-subtyping-return-static.stderr rename to src/test/ui/regions/regions-fn-subtyping-return-static.stderr diff --git a/src/test/ui/compile-fail-migration/regions-free-region-ordering-callee-4.rs b/src/test/ui/regions/regions-free-region-ordering-callee-4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-free-region-ordering-callee-4.rs rename to src/test/ui/regions/regions-free-region-ordering-callee-4.rs diff --git a/src/test/ui/compile-fail-migration/regions-free-region-ordering-callee-4.stderr b/src/test/ui/regions/regions-free-region-ordering-callee-4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-free-region-ordering-callee-4.stderr rename to src/test/ui/regions/regions-free-region-ordering-callee-4.stderr diff --git a/src/test/ui/compile-fail-migration/regions-free-region-ordering-callee.nll.stderr b/src/test/ui/regions/regions-free-region-ordering-callee.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-free-region-ordering-callee.nll.stderr rename to src/test/ui/regions/regions-free-region-ordering-callee.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-free-region-ordering-callee.rs b/src/test/ui/regions/regions-free-region-ordering-callee.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-free-region-ordering-callee.rs rename to src/test/ui/regions/regions-free-region-ordering-callee.rs diff --git a/src/test/ui/compile-fail-migration/regions-free-region-ordering-callee.stderr b/src/test/ui/regions/regions-free-region-ordering-callee.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-free-region-ordering-callee.stderr rename to src/test/ui/regions/regions-free-region-ordering-callee.stderr diff --git a/src/test/ui/compile-fail-migration/regions-free-region-ordering-caller.rs b/src/test/ui/regions/regions-free-region-ordering-caller.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-free-region-ordering-caller.rs rename to src/test/ui/regions/regions-free-region-ordering-caller.rs diff --git a/src/test/ui/compile-fail-migration/regions-free-region-ordering-caller.stderr b/src/test/ui/regions/regions-free-region-ordering-caller.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-free-region-ordering-caller.stderr rename to src/test/ui/regions/regions-free-region-ordering-caller.stderr diff --git a/src/test/ui/compile-fail-migration/regions-free-region-ordering-caller1.nll.stderr b/src/test/ui/regions/regions-free-region-ordering-caller1.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-free-region-ordering-caller1.nll.stderr rename to src/test/ui/regions/regions-free-region-ordering-caller1.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-free-region-ordering-caller1.rs b/src/test/ui/regions/regions-free-region-ordering-caller1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-free-region-ordering-caller1.rs rename to src/test/ui/regions/regions-free-region-ordering-caller1.rs diff --git a/src/test/ui/compile-fail-migration/regions-free-region-ordering-caller1.stderr b/src/test/ui/regions/regions-free-region-ordering-caller1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-free-region-ordering-caller1.stderr rename to src/test/ui/regions/regions-free-region-ordering-caller1.stderr diff --git a/src/test/ui/compile-fail-migration/regions-free-region-ordering-incorrect.nll.stderr b/src/test/ui/regions/regions-free-region-ordering-incorrect.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-free-region-ordering-incorrect.nll.stderr rename to src/test/ui/regions/regions-free-region-ordering-incorrect.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-free-region-ordering-incorrect.rs b/src/test/ui/regions/regions-free-region-ordering-incorrect.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-free-region-ordering-incorrect.rs rename to src/test/ui/regions/regions-free-region-ordering-incorrect.rs diff --git a/src/test/ui/compile-fail-migration/regions-free-region-ordering-incorrect.stderr b/src/test/ui/regions/regions-free-region-ordering-incorrect.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-free-region-ordering-incorrect.stderr rename to src/test/ui/regions/regions-free-region-ordering-incorrect.stderr diff --git a/src/test/ui/compile-fail-migration/regions-glb-free-free.nll.stderr b/src/test/ui/regions/regions-glb-free-free.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-glb-free-free.nll.stderr rename to src/test/ui/regions/regions-glb-free-free.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-glb-free-free.rs b/src/test/ui/regions/regions-glb-free-free.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-glb-free-free.rs rename to src/test/ui/regions/regions-glb-free-free.rs diff --git a/src/test/ui/compile-fail-migration/regions-glb-free-free.stderr b/src/test/ui/regions/regions-glb-free-free.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-glb-free-free.stderr rename to src/test/ui/regions/regions-glb-free-free.stderr diff --git a/src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-1.rs b/src/test/ui/regions/regions-implied-bounds-projection-gap-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-1.rs rename to src/test/ui/regions/regions-implied-bounds-projection-gap-1.rs diff --git a/src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-1.stderr b/src/test/ui/regions/regions-implied-bounds-projection-gap-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-1.stderr rename to src/test/ui/regions/regions-implied-bounds-projection-gap-1.stderr diff --git a/src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-2.rs b/src/test/ui/regions/regions-implied-bounds-projection-gap-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-2.rs rename to src/test/ui/regions/regions-implied-bounds-projection-gap-2.rs diff --git a/src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-2.stderr b/src/test/ui/regions/regions-implied-bounds-projection-gap-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-2.stderr rename to src/test/ui/regions/regions-implied-bounds-projection-gap-2.stderr diff --git a/src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-3.rs b/src/test/ui/regions/regions-implied-bounds-projection-gap-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-3.rs rename to src/test/ui/regions/regions-implied-bounds-projection-gap-3.rs diff --git a/src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-3.stderr b/src/test/ui/regions/regions-implied-bounds-projection-gap-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-3.stderr rename to src/test/ui/regions/regions-implied-bounds-projection-gap-3.stderr diff --git a/src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-4.rs b/src/test/ui/regions/regions-implied-bounds-projection-gap-4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-4.rs rename to src/test/ui/regions/regions-implied-bounds-projection-gap-4.rs diff --git a/src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-4.stderr b/src/test/ui/regions/regions-implied-bounds-projection-gap-4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-4.stderr rename to src/test/ui/regions/regions-implied-bounds-projection-gap-4.stderr diff --git a/src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-hr-1.rs b/src/test/ui/regions/regions-implied-bounds-projection-gap-hr-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-hr-1.rs rename to src/test/ui/regions/regions-implied-bounds-projection-gap-hr-1.rs diff --git a/src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-hr-1.stderr b/src/test/ui/regions/regions-implied-bounds-projection-gap-hr-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-implied-bounds-projection-gap-hr-1.stderr rename to src/test/ui/regions/regions-implied-bounds-projection-gap-hr-1.stderr diff --git a/src/test/ui/compile-fail-migration/regions-in-enums-anon.rs b/src/test/ui/regions/regions-in-enums-anon.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-in-enums-anon.rs rename to src/test/ui/regions/regions-in-enums-anon.rs diff --git a/src/test/ui/compile-fail-migration/regions-in-enums-anon.stderr b/src/test/ui/regions/regions-in-enums-anon.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-in-enums-anon.stderr rename to src/test/ui/regions/regions-in-enums-anon.stderr diff --git a/src/test/ui/compile-fail-migration/regions-in-enums.rs b/src/test/ui/regions/regions-in-enums.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-in-enums.rs rename to src/test/ui/regions/regions-in-enums.rs diff --git a/src/test/ui/compile-fail-migration/regions-in-enums.stderr b/src/test/ui/regions/regions-in-enums.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-in-enums.stderr rename to src/test/ui/regions/regions-in-enums.stderr diff --git a/src/test/ui/compile-fail-migration/regions-in-structs-anon.rs b/src/test/ui/regions/regions-in-structs-anon.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-in-structs-anon.rs rename to src/test/ui/regions/regions-in-structs-anon.rs diff --git a/src/test/ui/compile-fail-migration/regions-in-structs-anon.stderr b/src/test/ui/regions/regions-in-structs-anon.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-in-structs-anon.stderr rename to src/test/ui/regions/regions-in-structs-anon.stderr diff --git a/src/test/ui/compile-fail-migration/regions-in-structs.rs b/src/test/ui/regions/regions-in-structs.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-in-structs.rs rename to src/test/ui/regions/regions-in-structs.rs diff --git a/src/test/ui/compile-fail-migration/regions-in-structs.stderr b/src/test/ui/regions/regions-in-structs.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-in-structs.stderr rename to src/test/ui/regions/regions-in-structs.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-at-fn-not-param.nll.stderr b/src/test/ui/regions/regions-infer-at-fn-not-param.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-at-fn-not-param.nll.stderr rename to src/test/ui/regions/regions-infer-at-fn-not-param.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-at-fn-not-param.rs b/src/test/ui/regions/regions-infer-at-fn-not-param.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-at-fn-not-param.rs rename to src/test/ui/regions/regions-infer-at-fn-not-param.rs diff --git a/src/test/ui/compile-fail-migration/regions-infer-at-fn-not-param.stderr b/src/test/ui/regions/regions-infer-at-fn-not-param.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-at-fn-not-param.stderr rename to src/test/ui/regions/regions-infer-at-fn-not-param.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-borrow-scope-too-big.nll.stderr b/src/test/ui/regions/regions-infer-borrow-scope-too-big.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-borrow-scope-too-big.nll.stderr rename to src/test/ui/regions/regions-infer-borrow-scope-too-big.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-borrow-scope-too-big.rs b/src/test/ui/regions/regions-infer-borrow-scope-too-big.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-borrow-scope-too-big.rs rename to src/test/ui/regions/regions-infer-borrow-scope-too-big.rs diff --git a/src/test/ui/compile-fail-migration/regions-infer-borrow-scope-too-big.stderr b/src/test/ui/regions/regions-infer-borrow-scope-too-big.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-borrow-scope-too-big.stderr rename to src/test/ui/regions/regions-infer-borrow-scope-too-big.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-bound-from-trait-self.nll.stderr b/src/test/ui/regions/regions-infer-bound-from-trait-self.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-bound-from-trait-self.nll.stderr rename to src/test/ui/regions/regions-infer-bound-from-trait-self.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-bound-from-trait-self.rs b/src/test/ui/regions/regions-infer-bound-from-trait-self.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-bound-from-trait-self.rs rename to src/test/ui/regions/regions-infer-bound-from-trait-self.rs diff --git a/src/test/ui/compile-fail-migration/regions-infer-bound-from-trait-self.stderr b/src/test/ui/regions/regions-infer-bound-from-trait-self.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-bound-from-trait-self.stderr rename to src/test/ui/regions/regions-infer-bound-from-trait-self.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-bound-from-trait.nll.stderr b/src/test/ui/regions/regions-infer-bound-from-trait.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-bound-from-trait.nll.stderr rename to src/test/ui/regions/regions-infer-bound-from-trait.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-bound-from-trait.rs b/src/test/ui/regions/regions-infer-bound-from-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-bound-from-trait.rs rename to src/test/ui/regions/regions-infer-bound-from-trait.rs diff --git a/src/test/ui/compile-fail-migration/regions-infer-bound-from-trait.stderr b/src/test/ui/regions/regions-infer-bound-from-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-bound-from-trait.stderr rename to src/test/ui/regions/regions-infer-bound-from-trait.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-call-3.nll.stderr b/src/test/ui/regions/regions-infer-call-3.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-call-3.nll.stderr rename to src/test/ui/regions/regions-infer-call-3.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-call-3.rs b/src/test/ui/regions/regions-infer-call-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-call-3.rs rename to src/test/ui/regions/regions-infer-call-3.rs diff --git a/src/test/ui/compile-fail-migration/regions-infer-call-3.stderr b/src/test/ui/regions/regions-infer-call-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-call-3.stderr rename to src/test/ui/regions/regions-infer-call-3.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-contravariance-due-to-decl.rs b/src/test/ui/regions/regions-infer-contravariance-due-to-decl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-contravariance-due-to-decl.rs rename to src/test/ui/regions/regions-infer-contravariance-due-to-decl.rs diff --git a/src/test/ui/compile-fail-migration/regions-infer-contravariance-due-to-decl.stderr b/src/test/ui/regions/regions-infer-contravariance-due-to-decl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-contravariance-due-to-decl.stderr rename to src/test/ui/regions/regions-infer-contravariance-due-to-decl.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-covariance-due-to-decl.rs b/src/test/ui/regions/regions-infer-covariance-due-to-decl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-covariance-due-to-decl.rs rename to src/test/ui/regions/regions-infer-covariance-due-to-decl.rs diff --git a/src/test/ui/compile-fail-migration/regions-infer-covariance-due-to-decl.stderr b/src/test/ui/regions/regions-infer-covariance-due-to-decl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-covariance-due-to-decl.stderr rename to src/test/ui/regions/regions-infer-covariance-due-to-decl.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-decl.nll.stderr b/src/test/ui/regions/regions-infer-invariance-due-to-decl.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-decl.nll.stderr rename to src/test/ui/regions/regions-infer-invariance-due-to-decl.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-decl.rs b/src/test/ui/regions/regions-infer-invariance-due-to-decl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-decl.rs rename to src/test/ui/regions/regions-infer-invariance-due-to-decl.rs diff --git a/src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-decl.stderr b/src/test/ui/regions/regions-infer-invariance-due-to-decl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-decl.stderr rename to src/test/ui/regions/regions-infer-invariance-due-to-decl.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-mutability-3.nll.stderr b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-mutability-3.nll.stderr rename to src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-mutability-3.rs b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-mutability-3.rs rename to src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.rs diff --git a/src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-mutability-3.stderr b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-mutability-3.stderr rename to src/test/ui/regions/regions-infer-invariance-due-to-mutability-3.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-mutability-4.nll.stderr b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-mutability-4.nll.stderr rename to src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-mutability-4.rs b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-mutability-4.rs rename to src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.rs diff --git a/src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-mutability-4.stderr b/src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-invariance-due-to-mutability-4.stderr rename to src/test/ui/regions/regions-infer-invariance-due-to-mutability-4.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-not-param.nll.stderr b/src/test/ui/regions/regions-infer-not-param.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-not-param.nll.stderr rename to src/test/ui/regions/regions-infer-not-param.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-not-param.rs b/src/test/ui/regions/regions-infer-not-param.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-not-param.rs rename to src/test/ui/regions/regions-infer-not-param.rs diff --git a/src/test/ui/compile-fail-migration/regions-infer-not-param.stderr b/src/test/ui/regions/regions-infer-not-param.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-not-param.stderr rename to src/test/ui/regions/regions-infer-not-param.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-paramd-indirect.nll.stderr b/src/test/ui/regions/regions-infer-paramd-indirect.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-paramd-indirect.nll.stderr rename to src/test/ui/regions/regions-infer-paramd-indirect.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-paramd-indirect.rs b/src/test/ui/regions/regions-infer-paramd-indirect.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-paramd-indirect.rs rename to src/test/ui/regions/regions-infer-paramd-indirect.rs diff --git a/src/test/ui/compile-fail-migration/regions-infer-paramd-indirect.stderr b/src/test/ui/regions/regions-infer-paramd-indirect.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-paramd-indirect.stderr rename to src/test/ui/regions/regions-infer-paramd-indirect.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-proc-static-upvar.nll.stderr b/src/test/ui/regions/regions-infer-proc-static-upvar.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-proc-static-upvar.nll.stderr rename to src/test/ui/regions/regions-infer-proc-static-upvar.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-infer-proc-static-upvar.rs b/src/test/ui/regions/regions-infer-proc-static-upvar.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-proc-static-upvar.rs rename to src/test/ui/regions/regions-infer-proc-static-upvar.rs diff --git a/src/test/ui/compile-fail-migration/regions-infer-proc-static-upvar.stderr b/src/test/ui/regions/regions-infer-proc-static-upvar.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-infer-proc-static-upvar.stderr rename to src/test/ui/regions/regions-infer-proc-static-upvar.stderr diff --git a/src/test/ui/compile-fail-migration/regions-lifetime-bounds-on-fns.nll.stderr b/src/test/ui/regions/regions-lifetime-bounds-on-fns.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-lifetime-bounds-on-fns.nll.stderr rename to src/test/ui/regions/regions-lifetime-bounds-on-fns.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-lifetime-bounds-on-fns.rs b/src/test/ui/regions/regions-lifetime-bounds-on-fns.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-lifetime-bounds-on-fns.rs rename to src/test/ui/regions/regions-lifetime-bounds-on-fns.rs diff --git a/src/test/ui/compile-fail-migration/regions-lifetime-bounds-on-fns.stderr b/src/test/ui/regions/regions-lifetime-bounds-on-fns.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-lifetime-bounds-on-fns.stderr rename to src/test/ui/regions/regions-lifetime-bounds-on-fns.stderr diff --git a/src/test/ui/compile-fail-migration/regions-lifetime-of-struct-or-enum-variant.rs b/src/test/ui/regions/regions-lifetime-of-struct-or-enum-variant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-lifetime-of-struct-or-enum-variant.rs rename to src/test/ui/regions/regions-lifetime-of-struct-or-enum-variant.rs diff --git a/src/test/ui/compile-fail-migration/regions-lifetime-of-struct-or-enum-variant.stderr b/src/test/ui/regions/regions-lifetime-of-struct-or-enum-variant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-lifetime-of-struct-or-enum-variant.stderr rename to src/test/ui/regions/regions-lifetime-of-struct-or-enum-variant.stderr diff --git a/src/test/ui/compile-fail-migration/regions-name-duplicated.rs b/src/test/ui/regions/regions-name-duplicated.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-name-duplicated.rs rename to src/test/ui/regions/regions-name-duplicated.rs diff --git a/src/test/ui/compile-fail-migration/regions-name-duplicated.stderr b/src/test/ui/regions/regions-name-duplicated.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-name-duplicated.stderr rename to src/test/ui/regions/regions-name-duplicated.stderr diff --git a/src/test/ui/compile-fail-migration/regions-name-static.rs b/src/test/ui/regions/regions-name-static.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-name-static.rs rename to src/test/ui/regions/regions-name-static.rs diff --git a/src/test/ui/compile-fail-migration/regions-name-static.stderr b/src/test/ui/regions/regions-name-static.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-name-static.stderr rename to src/test/ui/regions/regions-name-static.stderr diff --git a/src/test/ui/compile-fail-migration/regions-name-undeclared.rs b/src/test/ui/regions/regions-name-undeclared.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-name-undeclared.rs rename to src/test/ui/regions/regions-name-undeclared.rs diff --git a/src/test/ui/compile-fail-migration/regions-name-undeclared.stderr b/src/test/ui/regions/regions-name-undeclared.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-name-undeclared.stderr rename to src/test/ui/regions/regions-name-undeclared.stderr diff --git a/src/test/ui/regions-nested-fns-2.nll.stderr b/src/test/ui/regions/regions-nested-fns-2.nll.stderr similarity index 100% rename from src/test/ui/regions-nested-fns-2.nll.stderr rename to src/test/ui/regions/regions-nested-fns-2.nll.stderr diff --git a/src/test/ui/regions-nested-fns-2.rs b/src/test/ui/regions/regions-nested-fns-2.rs similarity index 100% rename from src/test/ui/regions-nested-fns-2.rs rename to src/test/ui/regions/regions-nested-fns-2.rs diff --git a/src/test/ui/regions-nested-fns-2.stderr b/src/test/ui/regions/regions-nested-fns-2.stderr similarity index 100% rename from src/test/ui/regions-nested-fns-2.stderr rename to src/test/ui/regions/regions-nested-fns-2.stderr diff --git a/src/test/ui/compile-fail-migration/regions-nested-fns.nll.stderr b/src/test/ui/regions/regions-nested-fns.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-nested-fns.nll.stderr rename to src/test/ui/regions/regions-nested-fns.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-nested-fns.rs b/src/test/ui/regions/regions-nested-fns.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-nested-fns.rs rename to src/test/ui/regions/regions-nested-fns.rs diff --git a/src/test/ui/compile-fail-migration/regions-nested-fns.stderr b/src/test/ui/regions/regions-nested-fns.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-nested-fns.stderr rename to src/test/ui/regions/regions-nested-fns.stderr diff --git a/src/test/ui/compile-fail-migration/regions-normalize-in-where-clause-list.rs b/src/test/ui/regions/regions-normalize-in-where-clause-list.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-normalize-in-where-clause-list.rs rename to src/test/ui/regions/regions-normalize-in-where-clause-list.rs diff --git a/src/test/ui/compile-fail-migration/regions-normalize-in-where-clause-list.stderr b/src/test/ui/regions/regions-normalize-in-where-clause-list.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-normalize-in-where-clause-list.stderr rename to src/test/ui/regions/regions-normalize-in-where-clause-list.stderr diff --git a/src/test/ui/compile-fail-migration/regions-outlives-nominal-type-enum-region-rev.rs b/src/test/ui/regions/regions-outlives-nominal-type-enum-region-rev.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-nominal-type-enum-region-rev.rs rename to src/test/ui/regions/regions-outlives-nominal-type-enum-region-rev.rs diff --git a/src/test/ui/compile-fail-migration/regions-outlives-nominal-type-enum-region-rev.stderr b/src/test/ui/regions/regions-outlives-nominal-type-enum-region-rev.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-nominal-type-enum-region-rev.stderr rename to src/test/ui/regions/regions-outlives-nominal-type-enum-region-rev.stderr diff --git a/src/test/ui/compile-fail-migration/regions-outlives-nominal-type-enum-region.rs b/src/test/ui/regions/regions-outlives-nominal-type-enum-region.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-nominal-type-enum-region.rs rename to src/test/ui/regions/regions-outlives-nominal-type-enum-region.rs diff --git a/src/test/ui/compile-fail-migration/regions-outlives-nominal-type-enum-region.stderr b/src/test/ui/regions/regions-outlives-nominal-type-enum-region.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-nominal-type-enum-region.stderr rename to src/test/ui/regions/regions-outlives-nominal-type-enum-region.stderr diff --git a/src/test/ui/compile-fail-migration/regions-outlives-nominal-type-enum-type-rev.rs b/src/test/ui/regions/regions-outlives-nominal-type-enum-type-rev.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-nominal-type-enum-type-rev.rs rename to src/test/ui/regions/regions-outlives-nominal-type-enum-type-rev.rs diff --git a/src/test/ui/compile-fail-migration/regions-outlives-nominal-type-enum-type-rev.stderr b/src/test/ui/regions/regions-outlives-nominal-type-enum-type-rev.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-nominal-type-enum-type-rev.stderr rename to src/test/ui/regions/regions-outlives-nominal-type-enum-type-rev.stderr diff --git a/src/test/ui/compile-fail-migration/regions-outlives-nominal-type-enum-type.rs b/src/test/ui/regions/regions-outlives-nominal-type-enum-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-nominal-type-enum-type.rs rename to src/test/ui/regions/regions-outlives-nominal-type-enum-type.rs diff --git a/src/test/ui/compile-fail-migration/regions-outlives-nominal-type-enum-type.stderr b/src/test/ui/regions/regions-outlives-nominal-type-enum-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-nominal-type-enum-type.stderr rename to src/test/ui/regions/regions-outlives-nominal-type-enum-type.stderr diff --git a/src/test/ui/compile-fail-migration/regions-outlives-nominal-type-struct-region-rev.rs b/src/test/ui/regions/regions-outlives-nominal-type-struct-region-rev.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-nominal-type-struct-region-rev.rs rename to src/test/ui/regions/regions-outlives-nominal-type-struct-region-rev.rs diff --git a/src/test/ui/compile-fail-migration/regions-outlives-nominal-type-struct-region-rev.stderr b/src/test/ui/regions/regions-outlives-nominal-type-struct-region-rev.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-nominal-type-struct-region-rev.stderr rename to src/test/ui/regions/regions-outlives-nominal-type-struct-region-rev.stderr diff --git a/src/test/ui/compile-fail-migration/regions-outlives-nominal-type-struct-region.rs b/src/test/ui/regions/regions-outlives-nominal-type-struct-region.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-nominal-type-struct-region.rs rename to src/test/ui/regions/regions-outlives-nominal-type-struct-region.rs diff --git a/src/test/ui/compile-fail-migration/regions-outlives-nominal-type-struct-region.stderr b/src/test/ui/regions/regions-outlives-nominal-type-struct-region.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-nominal-type-struct-region.stderr rename to src/test/ui/regions/regions-outlives-nominal-type-struct-region.stderr diff --git a/src/test/ui/compile-fail-migration/regions-outlives-nominal-type-struct-type-rev.rs b/src/test/ui/regions/regions-outlives-nominal-type-struct-type-rev.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-nominal-type-struct-type-rev.rs rename to src/test/ui/regions/regions-outlives-nominal-type-struct-type-rev.rs diff --git a/src/test/ui/compile-fail-migration/regions-outlives-nominal-type-struct-type-rev.stderr b/src/test/ui/regions/regions-outlives-nominal-type-struct-type-rev.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-nominal-type-struct-type-rev.stderr rename to src/test/ui/regions/regions-outlives-nominal-type-struct-type-rev.stderr diff --git a/src/test/ui/compile-fail-migration/regions-outlives-nominal-type-struct-type.rs b/src/test/ui/regions/regions-outlives-nominal-type-struct-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-nominal-type-struct-type.rs rename to src/test/ui/regions/regions-outlives-nominal-type-struct-type.rs diff --git a/src/test/ui/compile-fail-migration/regions-outlives-nominal-type-struct-type.stderr b/src/test/ui/regions/regions-outlives-nominal-type-struct-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-nominal-type-struct-type.stderr rename to src/test/ui/regions/regions-outlives-nominal-type-struct-type.stderr diff --git a/src/test/ui/compile-fail-migration/regions-outlives-projection-container-hrtb.nll.stderr b/src/test/ui/regions/regions-outlives-projection-container-hrtb.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-projection-container-hrtb.nll.stderr rename to src/test/ui/regions/regions-outlives-projection-container-hrtb.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-outlives-projection-container-hrtb.rs b/src/test/ui/regions/regions-outlives-projection-container-hrtb.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-projection-container-hrtb.rs rename to src/test/ui/regions/regions-outlives-projection-container-hrtb.rs diff --git a/src/test/ui/compile-fail-migration/regions-outlives-projection-container-hrtb.stderr b/src/test/ui/regions/regions-outlives-projection-container-hrtb.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-projection-container-hrtb.stderr rename to src/test/ui/regions/regions-outlives-projection-container-hrtb.stderr diff --git a/src/test/ui/compile-fail-migration/regions-outlives-projection-container-wc.rs b/src/test/ui/regions/regions-outlives-projection-container-wc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-projection-container-wc.rs rename to src/test/ui/regions/regions-outlives-projection-container-wc.rs diff --git a/src/test/ui/compile-fail-migration/regions-outlives-projection-container-wc.stderr b/src/test/ui/regions/regions-outlives-projection-container-wc.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-projection-container-wc.stderr rename to src/test/ui/regions/regions-outlives-projection-container-wc.stderr diff --git a/src/test/ui/compile-fail-migration/regions-outlives-projection-container.rs b/src/test/ui/regions/regions-outlives-projection-container.rs similarity index 98% rename from src/test/ui/compile-fail-migration/regions-outlives-projection-container.rs rename to src/test/ui/regions/regions-outlives-projection-container.rs index e4b7a0f82db..180a8b05244 100644 --- a/src/test/ui/compile-fail-migration/regions-outlives-projection-container.rs +++ b/src/test/ui/regions/regions-outlives-projection-container.rs @@ -14,6 +14,8 @@ // type of a bound that appears in the where clause on a struct must // outlive the location in which the type appears. Issue #22246. +// ignore-compare-mode-nll + #![allow(dead_code)] #![feature(rustc_attrs)] diff --git a/src/test/ui/compile-fail-migration/regions-outlives-projection-container.stderr b/src/test/ui/regions/regions-outlives-projection-container.stderr similarity index 69% rename from src/test/ui/compile-fail-migration/regions-outlives-projection-container.stderr rename to src/test/ui/regions/regions-outlives-projection-container.stderr index 2a698f9bff5..4b8d445ff4a 100644 --- a/src/test/ui/compile-fail-migration/regions-outlives-projection-container.stderr +++ b/src/test/ui/regions/regions-outlives-projection-container.stderr @@ -1,67 +1,67 @@ error[E0491]: in type `&'a WithAssoc>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-projection-container.rs:50:12 + --> $DIR/regions-outlives-projection-container.rs:52:12 | LL | let _: &'a WithAssoc> = loop { }; //~ ERROR reference has a longer lifetime | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the function body at 44:15 - --> $DIR/regions-outlives-projection-container.rs:44:15 +note: the pointer is valid for the lifetime 'a as defined on the function body at 46:15 + --> $DIR/regions-outlives-projection-container.rs:46:15 | LL | fn with_assoc<'a,'b>() { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 44:18 - --> $DIR/regions-outlives-projection-container.rs:44:18 +note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 46:18 + --> $DIR/regions-outlives-projection-container.rs:46:18 | LL | fn with_assoc<'a,'b>() { | ^^ error[E0491]: in type `&'a WithoutAssoc>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-projection-container.rs:67:12 + --> $DIR/regions-outlives-projection-container.rs:69:12 | LL | let _: &'a WithoutAssoc> = loop { }; //~ ERROR reference has a longer lifetime | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the function body at 63:18 - --> $DIR/regions-outlives-projection-container.rs:63:18 +note: the pointer is valid for the lifetime 'a as defined on the function body at 65:18 + --> $DIR/regions-outlives-projection-container.rs:65:18 | LL | fn without_assoc<'a,'b>() { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 63:21 - --> $DIR/regions-outlives-projection-container.rs:63:21 +note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 65:21 + --> $DIR/regions-outlives-projection-container.rs:65:21 | LL | fn without_assoc<'a,'b>() { | ^^ error[E0491]: in type `&'a WithAssoc>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-projection-container.rs:75:12 + --> $DIR/regions-outlives-projection-container.rs:77:12 | LL | call::<&'a WithAssoc>>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the function body at 70:20 - --> $DIR/regions-outlives-projection-container.rs:70:20 +note: the pointer is valid for the lifetime 'a as defined on the function body at 72:20 + --> $DIR/regions-outlives-projection-container.rs:72:20 | LL | fn call_with_assoc<'a,'b>() { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 70:23 - --> $DIR/regions-outlives-projection-container.rs:70:23 +note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 72:23 + --> $DIR/regions-outlives-projection-container.rs:72:23 | LL | fn call_with_assoc<'a,'b>() { | ^^ error[E0491]: in type `&'a WithoutAssoc>`, reference has a longer lifetime than the data it references - --> $DIR/regions-outlives-projection-container.rs:82:12 + --> $DIR/regions-outlives-projection-container.rs:84:12 | LL | call::<&'a WithoutAssoc>>(); //~ ERROR reference has a longer lifetime | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: the pointer is valid for the lifetime 'a as defined on the function body at 79:23 - --> $DIR/regions-outlives-projection-container.rs:79:23 +note: the pointer is valid for the lifetime 'a as defined on the function body at 81:23 + --> $DIR/regions-outlives-projection-container.rs:81:23 | LL | fn call_without_assoc<'a,'b>() { | ^^ -note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 79:26 - --> $DIR/regions-outlives-projection-container.rs:79:26 +note: but the referenced data is only valid for the lifetime 'b as defined on the function body at 81:26 + --> $DIR/regions-outlives-projection-container.rs:81:26 | LL | fn call_without_assoc<'a,'b>() { | ^^ diff --git a/src/test/ui/compile-fail-migration/regions-outlives-projection-hrtype.rs b/src/test/ui/regions/regions-outlives-projection-hrtype.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-projection-hrtype.rs rename to src/test/ui/regions/regions-outlives-projection-hrtype.rs diff --git a/src/test/ui/compile-fail-migration/regions-outlives-projection-hrtype.stderr b/src/test/ui/regions/regions-outlives-projection-hrtype.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-projection-hrtype.stderr rename to src/test/ui/regions/regions-outlives-projection-hrtype.stderr diff --git a/src/test/ui/compile-fail-migration/regions-outlives-projection-trait-def.rs b/src/test/ui/regions/regions-outlives-projection-trait-def.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-projection-trait-def.rs rename to src/test/ui/regions/regions-outlives-projection-trait-def.rs diff --git a/src/test/ui/compile-fail-migration/regions-outlives-projection-trait-def.stderr b/src/test/ui/regions/regions-outlives-projection-trait-def.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-projection-trait-def.stderr rename to src/test/ui/regions/regions-outlives-projection-trait-def.stderr diff --git a/src/test/ui/compile-fail-migration/regions-outlives-scalar.rs b/src/test/ui/regions/regions-outlives-scalar.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-scalar.rs rename to src/test/ui/regions/regions-outlives-scalar.rs diff --git a/src/test/ui/compile-fail-migration/regions-outlives-scalar.stderr b/src/test/ui/regions/regions-outlives-scalar.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-outlives-scalar.stderr rename to src/test/ui/regions/regions-outlives-scalar.stderr diff --git a/src/test/ui/compile-fail-migration/regions-pattern-typing-issue-19552.nll.stderr b/src/test/ui/regions/regions-pattern-typing-issue-19552.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-pattern-typing-issue-19552.nll.stderr rename to src/test/ui/regions/regions-pattern-typing-issue-19552.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-pattern-typing-issue-19552.rs b/src/test/ui/regions/regions-pattern-typing-issue-19552.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-pattern-typing-issue-19552.rs rename to src/test/ui/regions/regions-pattern-typing-issue-19552.rs diff --git a/src/test/ui/compile-fail-migration/regions-pattern-typing-issue-19552.stderr b/src/test/ui/regions/regions-pattern-typing-issue-19552.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-pattern-typing-issue-19552.stderr rename to src/test/ui/regions/regions-pattern-typing-issue-19552.stderr diff --git a/src/test/ui/compile-fail-migration/regions-pattern-typing-issue-19997.ast.nll.stderr b/src/test/ui/regions/regions-pattern-typing-issue-19997.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-pattern-typing-issue-19997.ast.nll.stderr rename to src/test/ui/regions/regions-pattern-typing-issue-19997.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-pattern-typing-issue-19997.ast.stderr b/src/test/ui/regions/regions-pattern-typing-issue-19997.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-pattern-typing-issue-19997.ast.stderr rename to src/test/ui/regions/regions-pattern-typing-issue-19997.ast.stderr diff --git a/src/test/ui/compile-fail-migration/regions-pattern-typing-issue-19997.mir.stderr b/src/test/ui/regions/regions-pattern-typing-issue-19997.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-pattern-typing-issue-19997.mir.stderr rename to src/test/ui/regions/regions-pattern-typing-issue-19997.mir.stderr diff --git a/src/test/ui/compile-fail-migration/regions-pattern-typing-issue-19997.rs b/src/test/ui/regions/regions-pattern-typing-issue-19997.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-pattern-typing-issue-19997.rs rename to src/test/ui/regions/regions-pattern-typing-issue-19997.rs diff --git a/src/test/ui/compile-fail-migration/regions-proc-bound-capture.nll.stderr b/src/test/ui/regions/regions-proc-bound-capture.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-proc-bound-capture.nll.stderr rename to src/test/ui/regions/regions-proc-bound-capture.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-proc-bound-capture.rs b/src/test/ui/regions/regions-proc-bound-capture.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-proc-bound-capture.rs rename to src/test/ui/regions/regions-proc-bound-capture.rs diff --git a/src/test/ui/compile-fail-migration/regions-proc-bound-capture.stderr b/src/test/ui/regions/regions-proc-bound-capture.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-proc-bound-capture.stderr rename to src/test/ui/regions/regions-proc-bound-capture.stderr diff --git a/src/test/ui/compile-fail-migration/regions-reborrow-from-shorter-mut-ref-mut-ref.nll.stderr b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-reborrow-from-shorter-mut-ref-mut-ref.nll.stderr rename to src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-reborrow-from-shorter-mut-ref-mut-ref.rs b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-reborrow-from-shorter-mut-ref-mut-ref.rs rename to src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.rs diff --git a/src/test/ui/compile-fail-migration/regions-reborrow-from-shorter-mut-ref-mut-ref.stderr b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-reborrow-from-shorter-mut-ref-mut-ref.stderr rename to src/test/ui/regions/regions-reborrow-from-shorter-mut-ref-mut-ref.stderr diff --git a/src/test/ui/compile-fail-migration/regions-reborrow-from-shorter-mut-ref.nll.stderr b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-reborrow-from-shorter-mut-ref.nll.stderr rename to src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-reborrow-from-shorter-mut-ref.rs b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-reborrow-from-shorter-mut-ref.rs rename to src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.rs diff --git a/src/test/ui/compile-fail-migration/regions-reborrow-from-shorter-mut-ref.stderr b/src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-reborrow-from-shorter-mut-ref.stderr rename to src/test/ui/regions/regions-reborrow-from-shorter-mut-ref.stderr diff --git a/src/test/ui/compile-fail-migration/regions-ref-in-fn-arg.nll.stderr b/src/test/ui/regions/regions-ref-in-fn-arg.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-ref-in-fn-arg.nll.stderr rename to src/test/ui/regions/regions-ref-in-fn-arg.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-ref-in-fn-arg.rs b/src/test/ui/regions/regions-ref-in-fn-arg.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-ref-in-fn-arg.rs rename to src/test/ui/regions/regions-ref-in-fn-arg.rs diff --git a/src/test/ui/compile-fail-migration/regions-ref-in-fn-arg.stderr b/src/test/ui/regions/regions-ref-in-fn-arg.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-ref-in-fn-arg.stderr rename to src/test/ui/regions/regions-ref-in-fn-arg.stderr diff --git a/src/test/ui/compile-fail-migration/regions-ret-borrowed-1.nll.stderr b/src/test/ui/regions/regions-ret-borrowed-1.nll.stderr similarity index 60% rename from src/test/ui/compile-fail-migration/regions-ret-borrowed-1.nll.stderr rename to src/test/ui/regions/regions-ret-borrowed-1.nll.stderr index ae53ab692bd..6a184366546 100644 --- a/src/test/ui/compile-fail-migration/regions-ret-borrowed-1.nll.stderr +++ b/src/test/ui/regions/regions-ret-borrowed-1.nll.stderr @@ -8,11 +8,10 @@ error: unsatisfied lifetime constraints --> $DIR/regions-ret-borrowed-1.rs:20:14 | LL | with(|o| o) - | ----^ - | || | - | || return requires that `'1` must outlive `'2` - | |has type `&'1 isize` - | lifetime `'2` appears in return type + | -- ^ return requires that `'1` must outlive `'2` + | || + | |return type of closure is &'2 isize + | has type `&'1 isize` error: aborting due to previous error diff --git a/src/test/ui/compile-fail-migration/regions-ret-borrowed-1.rs b/src/test/ui/regions/regions-ret-borrowed-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-ret-borrowed-1.rs rename to src/test/ui/regions/regions-ret-borrowed-1.rs diff --git a/src/test/ui/compile-fail-migration/regions-ret-borrowed-1.stderr b/src/test/ui/regions/regions-ret-borrowed-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-ret-borrowed-1.stderr rename to src/test/ui/regions/regions-ret-borrowed-1.stderr diff --git a/src/test/ui/compile-fail-migration/regions-ret-borrowed.nll.stderr b/src/test/ui/regions/regions-ret-borrowed.nll.stderr similarity index 59% rename from src/test/ui/compile-fail-migration/regions-ret-borrowed.nll.stderr rename to src/test/ui/regions/regions-ret-borrowed.nll.stderr index 8d782b19723..57c81f45fd0 100644 --- a/src/test/ui/compile-fail-migration/regions-ret-borrowed.nll.stderr +++ b/src/test/ui/regions/regions-ret-borrowed.nll.stderr @@ -8,11 +8,10 @@ error: unsatisfied lifetime constraints --> $DIR/regions-ret-borrowed.rs:23:14 | LL | with(|o| o) - | ----^ - | || | - | || return requires that `'1` must outlive `'2` - | |has type `&'1 isize` - | lifetime `'2` appears in return type + | -- ^ return requires that `'1` must outlive `'2` + | || + | |return type of closure is &'2 isize + | has type `&'1 isize` error: aborting due to previous error diff --git a/src/test/ui/compile-fail-migration/regions-ret-borrowed.rs b/src/test/ui/regions/regions-ret-borrowed.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-ret-borrowed.rs rename to src/test/ui/regions/regions-ret-borrowed.rs diff --git a/src/test/ui/compile-fail-migration/regions-ret-borrowed.stderr b/src/test/ui/regions/regions-ret-borrowed.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-ret-borrowed.stderr rename to src/test/ui/regions/regions-ret-borrowed.stderr diff --git a/src/test/ui/compile-fail-migration/regions-ret.nll.stderr b/src/test/ui/regions/regions-ret.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-ret.nll.stderr rename to src/test/ui/regions/regions-ret.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-ret.rs b/src/test/ui/regions/regions-ret.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-ret.rs rename to src/test/ui/regions/regions-ret.rs diff --git a/src/test/ui/compile-fail-migration/regions-ret.stderr b/src/test/ui/regions/regions-ret.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-ret.stderr rename to src/test/ui/regions/regions-ret.stderr diff --git a/src/test/ui/compile-fail-migration/regions-return-ref-to-upvar-issue-17403.nll.stderr b/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.nll.stderr similarity index 54% rename from src/test/ui/compile-fail-migration/regions-return-ref-to-upvar-issue-17403.nll.stderr rename to src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.nll.stderr index e3b981a1bf6..eb84dca83c6 100644 --- a/src/test/ui/compile-fail-migration/regions-return-ref-to-upvar-issue-17403.nll.stderr +++ b/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.nll.stderr @@ -8,11 +8,12 @@ error: unsatisfied lifetime constraints --> $DIR/regions-return-ref-to-upvar-issue-17403.rs:17:24 | LL | let mut f = || &mut x; //~ ERROR cannot infer - | ---^^^^^^ - | | | - | | return requires that `'1` must outlive `'2` - | lifetime `'1` represents the closure body - | lifetime `'2` appears in return type + | -- ^^^^^^ return requires that `'1` must outlive `'2` + | || + | |return type of closure is &'2 mut i32 + | lifetime `'1` represents this closure's body + | + = note: closure implements `FnMut`, so references to captured variables can't escape the closure error: aborting due to previous error diff --git a/src/test/ui/compile-fail-migration/regions-return-ref-to-upvar-issue-17403.rs b/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-return-ref-to-upvar-issue-17403.rs rename to src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.rs diff --git a/src/test/ui/compile-fail-migration/regions-return-ref-to-upvar-issue-17403.stderr b/src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-return-ref-to-upvar-issue-17403.stderr rename to src/test/ui/regions/regions-return-ref-to-upvar-issue-17403.stderr diff --git a/src/test/ui/compile-fail-migration/regions-return-stack-allocated-vec.rs b/src/test/ui/regions/regions-return-stack-allocated-vec.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-return-stack-allocated-vec.rs rename to src/test/ui/regions/regions-return-stack-allocated-vec.rs diff --git a/src/test/ui/compile-fail-migration/regions-return-stack-allocated-vec.stderr b/src/test/ui/regions/regions-return-stack-allocated-vec.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-return-stack-allocated-vec.stderr rename to src/test/ui/regions/regions-return-stack-allocated-vec.stderr diff --git a/src/test/ui/compile-fail-migration/regions-static-bound.ll.nll.stderr b/src/test/ui/regions/regions-static-bound.ll.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-static-bound.ll.nll.stderr rename to src/test/ui/regions/regions-static-bound.ll.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-static-bound.ll.stderr b/src/test/ui/regions/regions-static-bound.ll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-static-bound.ll.stderr rename to src/test/ui/regions/regions-static-bound.ll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-static-bound.nll.stderr b/src/test/ui/regions/regions-static-bound.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-static-bound.nll.stderr rename to src/test/ui/regions/regions-static-bound.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-static-bound.rs b/src/test/ui/regions/regions-static-bound.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-static-bound.rs rename to src/test/ui/regions/regions-static-bound.rs diff --git a/src/test/ui/compile-fail-migration/regions-steal-closure.nll.stderr b/src/test/ui/regions/regions-steal-closure.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-steal-closure.nll.stderr rename to src/test/ui/regions/regions-steal-closure.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-steal-closure.rs b/src/test/ui/regions/regions-steal-closure.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-steal-closure.rs rename to src/test/ui/regions/regions-steal-closure.rs diff --git a/src/test/ui/compile-fail-migration/regions-steal-closure.stderr b/src/test/ui/regions/regions-steal-closure.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-steal-closure.stderr rename to src/test/ui/regions/regions-steal-closure.stderr diff --git a/src/test/ui/compile-fail-migration/regions-struct-not-wf.lexical.stderr b/src/test/ui/regions/regions-struct-not-wf.lexical.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-struct-not-wf.lexical.stderr rename to src/test/ui/regions/regions-struct-not-wf.lexical.stderr diff --git a/src/test/ui/compile-fail-migration/regions-struct-not-wf.nll.stderr b/src/test/ui/regions/regions-struct-not-wf.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-struct-not-wf.nll.stderr rename to src/test/ui/regions/regions-struct-not-wf.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-struct-not-wf.rs b/src/test/ui/regions/regions-struct-not-wf.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-struct-not-wf.rs rename to src/test/ui/regions/regions-struct-not-wf.rs diff --git a/src/test/ui/compile-fail-migration/regions-trait-1.rs b/src/test/ui/regions/regions-trait-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-trait-1.rs rename to src/test/ui/regions/regions-trait-1.rs diff --git a/src/test/ui/compile-fail-migration/regions-trait-1.stderr b/src/test/ui/regions/regions-trait-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-trait-1.stderr rename to src/test/ui/regions/regions-trait-1.stderr diff --git a/src/test/ui/compile-fail-migration/regions-trait-object-subtyping.nll.stderr b/src/test/ui/regions/regions-trait-object-subtyping.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-trait-object-subtyping.nll.stderr rename to src/test/ui/regions/regions-trait-object-subtyping.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-trait-object-subtyping.rs b/src/test/ui/regions/regions-trait-object-subtyping.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-trait-object-subtyping.rs rename to src/test/ui/regions/regions-trait-object-subtyping.rs diff --git a/src/test/ui/compile-fail-migration/regions-trait-object-subtyping.stderr b/src/test/ui/regions/regions-trait-object-subtyping.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-trait-object-subtyping.stderr rename to src/test/ui/regions/regions-trait-object-subtyping.stderr diff --git a/src/test/ui/compile-fail-migration/regions-trait-variance.nll.stderr b/src/test/ui/regions/regions-trait-variance.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-trait-variance.nll.stderr rename to src/test/ui/regions/regions-trait-variance.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-trait-variance.rs b/src/test/ui/regions/regions-trait-variance.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-trait-variance.rs rename to src/test/ui/regions/regions-trait-variance.rs diff --git a/src/test/ui/compile-fail-migration/regions-trait-variance.stderr b/src/test/ui/regions/regions-trait-variance.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-trait-variance.stderr rename to src/test/ui/regions/regions-trait-variance.stderr diff --git a/src/test/ui/compile-fail-migration/regions-undeclared.rs b/src/test/ui/regions/regions-undeclared.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-undeclared.rs rename to src/test/ui/regions/regions-undeclared.rs diff --git a/src/test/ui/compile-fail-migration/regions-undeclared.stderr b/src/test/ui/regions/regions-undeclared.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-undeclared.stderr rename to src/test/ui/regions/regions-undeclared.stderr diff --git a/src/test/ui/compile-fail-migration/regions-var-type-out-of-scope.nll.stderr b/src/test/ui/regions/regions-var-type-out-of-scope.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-var-type-out-of-scope.nll.stderr rename to src/test/ui/regions/regions-var-type-out-of-scope.nll.stderr diff --git a/src/test/ui/compile-fail-migration/regions-var-type-out-of-scope.rs b/src/test/ui/regions/regions-var-type-out-of-scope.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-var-type-out-of-scope.rs rename to src/test/ui/regions/regions-var-type-out-of-scope.rs diff --git a/src/test/ui/compile-fail-migration/regions-var-type-out-of-scope.stderr b/src/test/ui/regions/regions-var-type-out-of-scope.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-var-type-out-of-scope.stderr rename to src/test/ui/regions/regions-var-type-out-of-scope.stderr diff --git a/src/test/ui/compile-fail-migration/regions-variance-contravariant-use-covariant-in-second-position.rs b/src/test/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-variance-contravariant-use-covariant-in-second-position.rs rename to src/test/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.rs diff --git a/src/test/ui/compile-fail-migration/regions-variance-contravariant-use-covariant-in-second-position.stderr b/src/test/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-variance-contravariant-use-covariant-in-second-position.stderr rename to src/test/ui/regions/regions-variance-contravariant-use-covariant-in-second-position.stderr diff --git a/src/test/ui/compile-fail-migration/regions-variance-contravariant-use-covariant.rs b/src/test/ui/regions/regions-variance-contravariant-use-covariant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-variance-contravariant-use-covariant.rs rename to src/test/ui/regions/regions-variance-contravariant-use-covariant.rs diff --git a/src/test/ui/compile-fail-migration/regions-variance-contravariant-use-covariant.stderr b/src/test/ui/regions/regions-variance-contravariant-use-covariant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-variance-contravariant-use-covariant.stderr rename to src/test/ui/regions/regions-variance-contravariant-use-covariant.stderr diff --git a/src/test/ui/compile-fail-migration/regions-variance-covariant-use-contravariant.rs b/src/test/ui/regions/regions-variance-covariant-use-contravariant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-variance-covariant-use-contravariant.rs rename to src/test/ui/regions/regions-variance-covariant-use-contravariant.rs diff --git a/src/test/ui/compile-fail-migration/regions-variance-covariant-use-contravariant.stderr b/src/test/ui/regions/regions-variance-covariant-use-contravariant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-variance-covariant-use-contravariant.stderr rename to src/test/ui/regions/regions-variance-covariant-use-contravariant.stderr diff --git a/src/test/ui/compile-fail-migration/regions-variance-invariant-use-contravariant.rs b/src/test/ui/regions/regions-variance-invariant-use-contravariant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-variance-invariant-use-contravariant.rs rename to src/test/ui/regions/regions-variance-invariant-use-contravariant.rs diff --git a/src/test/ui/compile-fail-migration/regions-variance-invariant-use-contravariant.stderr b/src/test/ui/regions/regions-variance-invariant-use-contravariant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-variance-invariant-use-contravariant.stderr rename to src/test/ui/regions/regions-variance-invariant-use-contravariant.stderr diff --git a/src/test/ui/compile-fail-migration/regions-variance-invariant-use-covariant.rs b/src/test/ui/regions/regions-variance-invariant-use-covariant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-variance-invariant-use-covariant.rs rename to src/test/ui/regions/regions-variance-invariant-use-covariant.rs diff --git a/src/test/ui/compile-fail-migration/regions-variance-invariant-use-covariant.stderr b/src/test/ui/regions/regions-variance-invariant-use-covariant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-variance-invariant-use-covariant.stderr rename to src/test/ui/regions/regions-variance-invariant-use-covariant.stderr diff --git a/src/test/ui/compile-fail-migration/regions-wf-trait-object.rs b/src/test/ui/regions/regions-wf-trait-object.rs similarity index 100% rename from src/test/ui/compile-fail-migration/regions-wf-trait-object.rs rename to src/test/ui/regions/regions-wf-trait-object.rs diff --git a/src/test/ui/compile-fail-migration/regions-wf-trait-object.stderr b/src/test/ui/regions/regions-wf-trait-object.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/regions-wf-trait-object.stderr rename to src/test/ui/regions/regions-wf-trait-object.stderr diff --git a/src/test/ui/compile-fail-migration/reject-specialized-drops-8142.rs b/src/test/ui/reject-specialized-drops-8142.rs similarity index 100% rename from src/test/ui/compile-fail-migration/reject-specialized-drops-8142.rs rename to src/test/ui/reject-specialized-drops-8142.rs diff --git a/src/test/ui/compile-fail-migration/reject-specialized-drops-8142.stderr b/src/test/ui/reject-specialized-drops-8142.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/reject-specialized-drops-8142.stderr rename to src/test/ui/reject-specialized-drops-8142.stderr diff --git a/src/test/ui/compile-fail-migration/repeat-to-run-dtor-twice.rs b/src/test/ui/repeat-to-run-dtor-twice.rs similarity index 100% rename from src/test/ui/compile-fail-migration/repeat-to-run-dtor-twice.rs rename to src/test/ui/repeat-to-run-dtor-twice.rs diff --git a/src/test/ui/compile-fail-migration/repeat-to-run-dtor-twice.stderr b/src/test/ui/repeat-to-run-dtor-twice.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/repeat-to-run-dtor-twice.stderr rename to src/test/ui/repeat-to-run-dtor-twice.stderr diff --git a/src/test/ui/compile-fail-migration/repeat_count.rs b/src/test/ui/repeat_count.rs similarity index 100% rename from src/test/ui/compile-fail-migration/repeat_count.rs rename to src/test/ui/repeat_count.rs diff --git a/src/test/ui/compile-fail-migration/repeat_count.stderr b/src/test/ui/repeat_count.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/repeat_count.stderr rename to src/test/ui/repeat_count.stderr diff --git a/src/test/ui/repr-align-assign.fixed b/src/test/ui/repr/repr-align-assign.fixed similarity index 100% rename from src/test/ui/repr-align-assign.fixed rename to src/test/ui/repr/repr-align-assign.fixed diff --git a/src/test/ui/repr-align-assign.rs b/src/test/ui/repr/repr-align-assign.rs similarity index 100% rename from src/test/ui/repr-align-assign.rs rename to src/test/ui/repr/repr-align-assign.rs diff --git a/src/test/ui/repr-align-assign.stderr b/src/test/ui/repr/repr-align-assign.stderr similarity index 100% rename from src/test/ui/repr-align-assign.stderr rename to src/test/ui/repr/repr-align-assign.stderr diff --git a/src/test/ui/compile-fail-migration/repr-align.rs b/src/test/ui/repr/repr-align.rs similarity index 100% rename from src/test/ui/compile-fail-migration/repr-align.rs rename to src/test/ui/repr/repr-align.rs diff --git a/src/test/ui/compile-fail-migration/repr-align.stderr b/src/test/ui/repr/repr-align.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/repr-align.stderr rename to src/test/ui/repr/repr-align.stderr diff --git a/src/test/ui/compile-fail-migration/repr-packed-contains-align.rs b/src/test/ui/repr/repr-packed-contains-align.rs similarity index 100% rename from src/test/ui/compile-fail-migration/repr-packed-contains-align.rs rename to src/test/ui/repr/repr-packed-contains-align.rs diff --git a/src/test/ui/compile-fail-migration/repr-packed-contains-align.stderr b/src/test/ui/repr/repr-packed-contains-align.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/repr-packed-contains-align.stderr rename to src/test/ui/repr/repr-packed-contains-align.stderr diff --git a/src/test/ui/compile-fail-migration/repr-transparent-other-items.rs b/src/test/ui/repr/repr-transparent-other-items.rs similarity index 100% rename from src/test/ui/compile-fail-migration/repr-transparent-other-items.rs rename to src/test/ui/repr/repr-transparent-other-items.rs diff --git a/src/test/ui/compile-fail-migration/repr-transparent-other-items.stderr b/src/test/ui/repr/repr-transparent-other-items.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/repr-transparent-other-items.stderr rename to src/test/ui/repr/repr-transparent-other-items.stderr diff --git a/src/test/ui/compile-fail-migration/repr-transparent-other-reprs.rs b/src/test/ui/repr/repr-transparent-other-reprs.rs similarity index 100% rename from src/test/ui/compile-fail-migration/repr-transparent-other-reprs.rs rename to src/test/ui/repr/repr-transparent-other-reprs.rs diff --git a/src/test/ui/compile-fail-migration/repr-transparent-other-reprs.stderr b/src/test/ui/repr/repr-transparent-other-reprs.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/repr-transparent-other-reprs.stderr rename to src/test/ui/repr/repr-transparent-other-reprs.stderr diff --git a/src/test/ui/compile-fail-migration/repr-transparent.rs b/src/test/ui/repr/repr-transparent.rs similarity index 100% rename from src/test/ui/compile-fail-migration/repr-transparent.rs rename to src/test/ui/repr/repr-transparent.rs diff --git a/src/test/ui/compile-fail-migration/repr-transparent.stderr b/src/test/ui/repr/repr-transparent.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/repr-transparent.stderr rename to src/test/ui/repr/repr-transparent.stderr diff --git a/src/test/ui/compile-fail-migration/required-lang-item.rs b/src/test/ui/required-lang-item.rs similarity index 100% rename from src/test/ui/compile-fail-migration/required-lang-item.rs rename to src/test/ui/required-lang-item.rs diff --git a/src/test/ui/compile-fail-migration/required-lang-item.stderr b/src/test/ui/required-lang-item.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/required-lang-item.stderr rename to src/test/ui/required-lang-item.stderr diff --git a/src/test/ui/compile-fail-migration/reserved-attr-on-macro.rs b/src/test/ui/reserved/reserved-attr-on-macro.rs similarity index 100% rename from src/test/ui/compile-fail-migration/reserved-attr-on-macro.rs rename to src/test/ui/reserved/reserved-attr-on-macro.rs diff --git a/src/test/ui/compile-fail-migration/reserved-attr-on-macro.stderr b/src/test/ui/reserved/reserved-attr-on-macro.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/reserved-attr-on-macro.stderr rename to src/test/ui/reserved/reserved-attr-on-macro.stderr diff --git a/src/test/ui/compile-fail-migration/reserved-become.rs b/src/test/ui/reserved/reserved-become.rs similarity index 100% rename from src/test/ui/compile-fail-migration/reserved-become.rs rename to src/test/ui/reserved/reserved-become.rs diff --git a/src/test/ui/compile-fail-migration/reserved-become.stderr b/src/test/ui/reserved/reserved-become.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/reserved-become.stderr rename to src/test/ui/reserved/reserved-become.stderr diff --git a/src/test/ui/compile-fail-migration/resolve-bad-import-prefix.rs b/src/test/ui/resolve/resolve-bad-import-prefix.rs similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-bad-import-prefix.rs rename to src/test/ui/resolve/resolve-bad-import-prefix.rs diff --git a/src/test/ui/compile-fail-migration/resolve-bad-import-prefix.stderr b/src/test/ui/resolve/resolve-bad-import-prefix.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-bad-import-prefix.stderr rename to src/test/ui/resolve/resolve-bad-import-prefix.stderr diff --git a/src/test/ui/compile-fail-migration/resolve-bad-visibility.rs b/src/test/ui/resolve/resolve-bad-visibility.rs similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-bad-visibility.rs rename to src/test/ui/resolve/resolve-bad-visibility.rs diff --git a/src/test/ui/compile-fail-migration/resolve-bad-visibility.stderr b/src/test/ui/resolve/resolve-bad-visibility.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-bad-visibility.stderr rename to src/test/ui/resolve/resolve-bad-visibility.stderr diff --git a/src/test/ui/compile-fail-migration/resolve-conflict-extern-crate-vs-extern-crate.rs b/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-conflict-extern-crate-vs-extern-crate.rs rename to src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.rs diff --git a/src/test/ui/compile-fail-migration/resolve-conflict-extern-crate-vs-extern-crate.stderr b/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-conflict-extern-crate-vs-extern-crate.stderr rename to src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr diff --git a/src/test/ui/compile-fail-migration/resolve-conflict-import-vs-extern-crate.rs b/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-conflict-import-vs-extern-crate.rs rename to src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.rs diff --git a/src/test/ui/compile-fail-migration/resolve-conflict-import-vs-extern-crate.stderr b/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-conflict-import-vs-extern-crate.stderr rename to src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr diff --git a/src/test/ui/compile-fail-migration/resolve-conflict-import-vs-import.rs b/src/test/ui/resolve/resolve-conflict-import-vs-import.rs similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-conflict-import-vs-import.rs rename to src/test/ui/resolve/resolve-conflict-import-vs-import.rs diff --git a/src/test/ui/compile-fail-migration/resolve-conflict-import-vs-import.stderr b/src/test/ui/resolve/resolve-conflict-import-vs-import.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-conflict-import-vs-import.stderr rename to src/test/ui/resolve/resolve-conflict-import-vs-import.stderr diff --git a/src/test/ui/compile-fail-migration/resolve-conflict-item-vs-extern-crate.rs b/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-conflict-item-vs-extern-crate.rs rename to src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.rs diff --git a/src/test/ui/compile-fail-migration/resolve-conflict-item-vs-extern-crate.stderr b/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-conflict-item-vs-extern-crate.stderr rename to src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr diff --git a/src/test/ui/resolve-conflict-item-vs-import.rs b/src/test/ui/resolve/resolve-conflict-item-vs-import.rs similarity index 100% rename from src/test/ui/resolve-conflict-item-vs-import.rs rename to src/test/ui/resolve/resolve-conflict-item-vs-import.rs diff --git a/src/test/ui/resolve-conflict-item-vs-import.stderr b/src/test/ui/resolve/resolve-conflict-item-vs-import.stderr similarity index 100% rename from src/test/ui/resolve-conflict-item-vs-import.stderr rename to src/test/ui/resolve/resolve-conflict-item-vs-import.stderr diff --git a/src/test/ui/compile-fail-migration/resolve-conflict-type-vs-import.rs b/src/test/ui/resolve/resolve-conflict-type-vs-import.rs similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-conflict-type-vs-import.rs rename to src/test/ui/resolve/resolve-conflict-type-vs-import.rs diff --git a/src/test/ui/compile-fail-migration/resolve-conflict-type-vs-import.stderr b/src/test/ui/resolve/resolve-conflict-type-vs-import.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-conflict-type-vs-import.stderr rename to src/test/ui/resolve/resolve-conflict-type-vs-import.stderr diff --git a/src/test/ui/compile-fail-migration/resolve-inconsistent-binding-mode.rs b/src/test/ui/resolve/resolve-inconsistent-binding-mode.rs similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-inconsistent-binding-mode.rs rename to src/test/ui/resolve/resolve-inconsistent-binding-mode.rs diff --git a/src/test/ui/compile-fail-migration/resolve-inconsistent-binding-mode.stderr b/src/test/ui/resolve/resolve-inconsistent-binding-mode.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-inconsistent-binding-mode.stderr rename to src/test/ui/resolve/resolve-inconsistent-binding-mode.stderr diff --git a/src/test/ui/resolve-inconsistent-names.rs b/src/test/ui/resolve/resolve-inconsistent-names.rs similarity index 100% rename from src/test/ui/resolve-inconsistent-names.rs rename to src/test/ui/resolve/resolve-inconsistent-names.rs diff --git a/src/test/ui/resolve-inconsistent-names.stderr b/src/test/ui/resolve/resolve-inconsistent-names.stderr similarity index 100% rename from src/test/ui/resolve-inconsistent-names.stderr rename to src/test/ui/resolve/resolve-inconsistent-names.stderr diff --git a/src/test/ui/compile-fail-migration/resolve-label.rs b/src/test/ui/resolve/resolve-label.rs similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-label.rs rename to src/test/ui/resolve/resolve-label.rs diff --git a/src/test/ui/compile-fail-migration/resolve-label.stderr b/src/test/ui/resolve/resolve-label.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-label.stderr rename to src/test/ui/resolve/resolve-label.stderr diff --git a/src/test/ui/compile-fail-migration/resolve-primitive-fallback.rs b/src/test/ui/resolve/resolve-primitive-fallback.rs similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-primitive-fallback.rs rename to src/test/ui/resolve/resolve-primitive-fallback.rs diff --git a/src/test/ui/compile-fail-migration/resolve-primitive-fallback.stderr b/src/test/ui/resolve/resolve-primitive-fallback.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-primitive-fallback.stderr rename to src/test/ui/resolve/resolve-primitive-fallback.stderr diff --git a/src/test/ui/compile-fail-migration/resolve-self-in-impl-2.rs b/src/test/ui/resolve/resolve-self-in-impl-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-self-in-impl-2.rs rename to src/test/ui/resolve/resolve-self-in-impl-2.rs diff --git a/src/test/ui/compile-fail-migration/resolve-self-in-impl-2.stderr b/src/test/ui/resolve/resolve-self-in-impl-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-self-in-impl-2.stderr rename to src/test/ui/resolve/resolve-self-in-impl-2.stderr diff --git a/src/test/ui/compile-fail-migration/resolve-self-in-impl.rs b/src/test/ui/resolve/resolve-self-in-impl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-self-in-impl.rs rename to src/test/ui/resolve/resolve-self-in-impl.rs diff --git a/src/test/ui/compile-fail-migration/resolve-self-in-impl.stderr b/src/test/ui/resolve/resolve-self-in-impl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-self-in-impl.stderr rename to src/test/ui/resolve/resolve-self-in-impl.stderr diff --git a/src/test/ui/compile-fail-migration/resolve-type-param-in-item-in-trait.rs b/src/test/ui/resolve/resolve-type-param-in-item-in-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-type-param-in-item-in-trait.rs rename to src/test/ui/resolve/resolve-type-param-in-item-in-trait.rs diff --git a/src/test/ui/compile-fail-migration/resolve-type-param-in-item-in-trait.stderr b/src/test/ui/resolve/resolve-type-param-in-item-in-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-type-param-in-item-in-trait.stderr rename to src/test/ui/resolve/resolve-type-param-in-item-in-trait.stderr diff --git a/src/test/ui/compile-fail-migration/resolve-unknown-trait.rs b/src/test/ui/resolve/resolve-unknown-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-unknown-trait.rs rename to src/test/ui/resolve/resolve-unknown-trait.rs diff --git a/src/test/ui/compile-fail-migration/resolve-unknown-trait.stderr b/src/test/ui/resolve/resolve-unknown-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-unknown-trait.stderr rename to src/test/ui/resolve/resolve-unknown-trait.stderr diff --git a/src/test/ui/compile-fail-migration/resolve-variant-assoc-item.rs b/src/test/ui/resolve/resolve-variant-assoc-item.rs similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-variant-assoc-item.rs rename to src/test/ui/resolve/resolve-variant-assoc-item.rs diff --git a/src/test/ui/compile-fail-migration/resolve-variant-assoc-item.stderr b/src/test/ui/resolve/resolve-variant-assoc-item.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/resolve-variant-assoc-item.stderr rename to src/test/ui/resolve/resolve-variant-assoc-item.stderr diff --git a/src/test/ui/compile-fail-migration/resolve_self_super_hint.rs b/src/test/ui/resolve_self_super_hint.rs similarity index 100% rename from src/test/ui/compile-fail-migration/resolve_self_super_hint.rs rename to src/test/ui/resolve_self_super_hint.rs diff --git a/src/test/ui/compile-fail-migration/resolve_self_super_hint.stderr b/src/test/ui/resolve_self_super_hint.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/resolve_self_super_hint.stderr rename to src/test/ui/resolve_self_super_hint.stderr diff --git a/src/test/ui/compile-fail-migration/ret-non-nil.rs b/src/test/ui/ret-non-nil.rs similarity index 100% rename from src/test/ui/compile-fail-migration/ret-non-nil.rs rename to src/test/ui/ret-non-nil.rs diff --git a/src/test/ui/compile-fail-migration/ret-non-nil.stderr b/src/test/ui/ret-non-nil.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/ret-non-nil.stderr rename to src/test/ui/ret-non-nil.stderr diff --git a/src/test/ui/compile-fail-migration/retslot-cast.rs b/src/test/ui/retslot-cast.rs similarity index 100% rename from src/test/ui/compile-fail-migration/retslot-cast.rs rename to src/test/ui/retslot-cast.rs diff --git a/src/test/ui/compile-fail-migration/retslot-cast.stderr b/src/test/ui/retslot-cast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/retslot-cast.stderr rename to src/test/ui/retslot-cast.stderr diff --git a/src/test/ui/compile-fail-migration/return-from-diverging.rs b/src/test/ui/return/return-from-diverging.rs similarity index 100% rename from src/test/ui/compile-fail-migration/return-from-diverging.rs rename to src/test/ui/return/return-from-diverging.rs diff --git a/src/test/ui/compile-fail-migration/return-from-diverging.stderr b/src/test/ui/return/return-from-diverging.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/return-from-diverging.stderr rename to src/test/ui/return/return-from-diverging.stderr diff --git a/src/test/ui/return-match-array-const.rs b/src/test/ui/return/return-match-array-const.rs similarity index 100% rename from src/test/ui/return-match-array-const.rs rename to src/test/ui/return/return-match-array-const.rs diff --git a/src/test/ui/return-match-array-const.stderr b/src/test/ui/return/return-match-array-const.stderr similarity index 100% rename from src/test/ui/return-match-array-const.stderr rename to src/test/ui/return/return-match-array-const.stderr diff --git a/src/test/ui/return-type.rs b/src/test/ui/return/return-type.rs similarity index 100% rename from src/test/ui/return-type.rs rename to src/test/ui/return/return-type.rs diff --git a/src/test/ui/return-type.stderr b/src/test/ui/return/return-type.stderr similarity index 100% rename from src/test/ui/return-type.stderr rename to src/test/ui/return/return-type.stderr diff --git a/src/test/ui/compile-fail-migration/return-unit-from-diverging.rs b/src/test/ui/return/return-unit-from-diverging.rs similarity index 100% rename from src/test/ui/compile-fail-migration/return-unit-from-diverging.rs rename to src/test/ui/return/return-unit-from-diverging.rs diff --git a/src/test/ui/compile-fail-migration/return-unit-from-diverging.stderr b/src/test/ui/return/return-unit-from-diverging.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/return-unit-from-diverging.stderr rename to src/test/ui/return/return-unit-from-diverging.stderr diff --git a/src/test/ui/compile-fail-migration/rfc-1937-termination-trait/termination-trait-main-i32.rs b/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-1937-termination-trait/termination-trait-main-i32.rs rename to src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs diff --git a/src/test/ui/compile-fail-migration/rfc-1937-termination-trait/termination-trait-main-i32.stderr b/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-1937-termination-trait/termination-trait-main-i32.stderr rename to src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr diff --git a/src/test/ui/compile-fail-migration/rfc-1937-termination-trait/termination-trait-not-satisfied.rs b/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-1937-termination-trait/termination-trait-not-satisfied.rs rename to src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs diff --git a/src/test/ui/compile-fail-migration/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr b/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr rename to src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr diff --git a/src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/auxiliary/enums.rs b/src/test/ui/rfc-2008-non-exhaustive/auxiliary/enums.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/auxiliary/enums.rs rename to src/test/ui/rfc-2008-non-exhaustive/auxiliary/enums.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/auxiliary/structs.rs b/src/test/ui/rfc-2008-non-exhaustive/auxiliary/structs.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/auxiliary/structs.rs rename to src/test/ui/rfc-2008-non-exhaustive/auxiliary/structs.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/auxiliary/variants.rs b/src/test/ui/rfc-2008-non-exhaustive/auxiliary/variants.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/auxiliary/variants.rs rename to src/test/ui/rfc-2008-non-exhaustive/auxiliary/variants.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/enum.rs b/src/test/ui/rfc-2008-non-exhaustive/enum.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/enum.rs rename to src/test/ui/rfc-2008-non-exhaustive/enum.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/enum.stderr b/src/test/ui/rfc-2008-non-exhaustive/enum.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/enum.stderr rename to src/test/ui/rfc-2008-non-exhaustive/enum.stderr diff --git a/src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/invalid-attribute.rs b/src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/invalid-attribute.rs rename to src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/invalid-attribute.stderr b/src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/invalid-attribute.stderr rename to src/test/ui/rfc-2008-non-exhaustive/invalid-attribute.stderr diff --git a/src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/structs.rs b/src/test/ui/rfc-2008-non-exhaustive/structs.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/structs.rs rename to src/test/ui/rfc-2008-non-exhaustive/structs.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/structs.stderr b/src/test/ui/rfc-2008-non-exhaustive/structs.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/structs.stderr rename to src/test/ui/rfc-2008-non-exhaustive/structs.stderr diff --git a/src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/variants.rs b/src/test/ui/rfc-2008-non-exhaustive/variants.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/variants.rs rename to src/test/ui/rfc-2008-non-exhaustive/variants.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/variants_create.rs b/src/test/ui/rfc-2008-non-exhaustive/variants_create.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/variants_create.rs rename to src/test/ui/rfc-2008-non-exhaustive/variants_create.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/variants_create.stderr b/src/test/ui/rfc-2008-non-exhaustive/variants_create.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/variants_create.stderr rename to src/test/ui/rfc-2008-non-exhaustive/variants_create.stderr diff --git a/src/test/ui/compile-fail-migration/rfc-2126-crate-paths/crate-path-non-absolute.rs b/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-crate-paths/crate-path-non-absolute.rs rename to src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2126-crate-paths/crate-path-non-absolute.stderr b/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-crate-paths/crate-path-non-absolute.stderr rename to src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr diff --git a/src/test/ui/compile-fail-migration/rfc-2126-crate-paths/keyword-crate-as-identifier.rs b/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-crate-paths/keyword-crate-as-identifier.rs rename to src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr b/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr rename to src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs b/src/test/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs rename to src/test/ui/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/non-existent-1.rs b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/non-existent-1.rs rename to src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/non-existent-1.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/non-existent-1.stderr rename to src/test/ui/rfc-2126-extern-absolute-paths/non-existent-1.stderr diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/non-existent-2.rs b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/non-existent-2.rs rename to src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/non-existent-2.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/non-existent-2.stderr rename to src/test/ui/rfc-2126-extern-absolute-paths/non-existent-2.stderr diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/non-existent-3.rs b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/non-existent-3.rs rename to src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/non-existent-3.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/non-existent-3.stderr rename to src/test/ui/rfc-2126-extern-absolute-paths/non-existent-3.stderr diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/single-segment.rs b/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-extern-absolute-paths/single-segment.rs rename to src/test/ui/rfc-2126-extern-absolute-paths/single-segment.rs diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.stderr new file mode 100644 index 00000000000..cfb1a0ac39a --- /dev/null +++ b/src/test/ui/rfc-2126-extern-absolute-paths/single-segment.stderr @@ -0,0 +1,21 @@ +error: crate root imports need to be explicitly named: `use crate as name;` + --> $DIR/single-segment.rs:14:5 + | +LL | use crate; //~ ERROR crate root imports need to be explicitly named: `use crate as name;` + | ^^^^^ + +error: cannot glob-import all possible crates + --> $DIR/single-segment.rs:15:5 + | +LL | use *; //~ ERROR cannot glob-import all possible crates + | ^ + +error[E0423]: expected value, found module `xcrate` + --> $DIR/single-segment.rs:18:13 + | +LL | let s = ::xcrate; //~ ERROR expected value, found module `xcrate` + | ^^^^^^^^ not a value + +error: aborting due to 3 previous errors + +For more information about this error, try `rustc --explain E0423`. diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/auxiliary/xcrate.rs b/src/test/ui/rfc-2126-extern-in-paths/auxiliary/xcrate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/auxiliary/xcrate.rs rename to src/test/ui/rfc-2126-extern-in-paths/auxiliary/xcrate.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/non-existent-1.rs b/src/test/ui/rfc-2126-extern-in-paths/non-existent-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/non-existent-1.rs rename to src/test/ui/rfc-2126-extern-in-paths/non-existent-1.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/non-existent-1.stderr b/src/test/ui/rfc-2126-extern-in-paths/non-existent-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/non-existent-1.stderr rename to src/test/ui/rfc-2126-extern-in-paths/non-existent-1.stderr diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/non-existent-2.rs b/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/non-existent-2.rs rename to src/test/ui/rfc-2126-extern-in-paths/non-existent-2.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/non-existent-2.stderr b/src/test/ui/rfc-2126-extern-in-paths/non-existent-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/non-existent-2.stderr rename to src/test/ui/rfc-2126-extern-in-paths/non-existent-2.stderr diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/non-existent-3.rs b/src/test/ui/rfc-2126-extern-in-paths/non-existent-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/non-existent-3.rs rename to src/test/ui/rfc-2126-extern-in-paths/non-existent-3.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/non-existent-3.stderr b/src/test/ui/rfc-2126-extern-in-paths/non-existent-3.stderr similarity index 74% rename from src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/non-existent-3.stderr rename to src/test/ui/rfc-2126-extern-in-paths/non-existent-3.stderr index 3dc93e2a426..fbea89ae93a 100644 --- a/src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/non-existent-3.stderr +++ b/src/test/ui/rfc-2126-extern-in-paths/non-existent-3.stderr @@ -1,8 +1,8 @@ error[E0463]: can't find crate for `ycrate` - --> $DIR/non-existent-3.rs:13:5 + --> $DIR/non-existent-3.rs:13:13 | LL | use extern::ycrate; //~ ERROR can't find crate for `ycrate` - | ^^^^^^^^^^^^^^ can't find crate + | ^^^^^^ can't find crate error: aborting due to previous error diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/single-segment.rs b/src/test/ui/rfc-2126-extern-in-paths/single-segment.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/single-segment.rs rename to src/test/ui/rfc-2126-extern-in-paths/single-segment.rs diff --git a/src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/single-segment.stderr b/src/test/ui/rfc-2126-extern-in-paths/single-segment.stderr similarity index 73% rename from src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/single-segment.stderr rename to src/test/ui/rfc-2126-extern-in-paths/single-segment.stderr index 362f77effde..8b1dd89fe3c 100644 --- a/src/test/ui/compile-fail-migration/rfc-2126-extern-in-paths/single-segment.stderr +++ b/src/test/ui/rfc-2126-extern-in-paths/single-segment.stderr @@ -1,8 +1,8 @@ -error[E0432]: unresolved import `extern::*` +error: cannot glob-import all possible crates --> $DIR/single-segment.rs:17:5 | -LL | use extern::*; //~ ERROR unresolved import `extern::*` - | ^^^^^^^^^ cannot glob-import all possible crates +LL | use extern::*; //~ ERROR cannot glob-import all possible crates + | ^^^^^^^^^ error[E0432]: unresolved import `extern` --> $DIR/single-segment.rs:15:5 @@ -11,7 +11,7 @@ LL | use extern; //~ ERROR unresolved import `extern` | ^^^^^^ no `extern` in the root error[E0423]: expected value, found module `extern::xcrate` - --> $DIR/single-segment.rs:21:13 + --> $DIR/single-segment.rs:20:13 | LL | let s = extern::xcrate; //~ ERROR expected value, found module `extern::xcrate` | ^^^^^^^^^^^^^^ not a value diff --git a/src/test/ui/compile-fail-migration/rfc1445/feature-gate.no_gate.stderr b/src/test/ui/rfc1445/feature-gate.no_gate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc1445/feature-gate.no_gate.stderr rename to src/test/ui/rfc1445/feature-gate.no_gate.stderr diff --git a/src/test/ui/compile-fail-migration/rfc1445/feature-gate.rs b/src/test/ui/rfc1445/feature-gate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc1445/feature-gate.rs rename to src/test/ui/rfc1445/feature-gate.rs diff --git a/src/test/ui/compile-fail-migration/rfc1445/feature-gate.with_gate.stderr b/src/test/ui/rfc1445/feature-gate.with_gate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc1445/feature-gate.with_gate.stderr rename to src/test/ui/rfc1445/feature-gate.with_gate.stderr diff --git a/src/test/ui/compile-fail-migration/rfc1445/match-forbidden-without-eq.rs b/src/test/ui/rfc1445/match-forbidden-without-eq.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc1445/match-forbidden-without-eq.rs rename to src/test/ui/rfc1445/match-forbidden-without-eq.rs diff --git a/src/test/ui/compile-fail-migration/rfc1445/match-forbidden-without-eq.stderr b/src/test/ui/rfc1445/match-forbidden-without-eq.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc1445/match-forbidden-without-eq.stderr rename to src/test/ui/rfc1445/match-forbidden-without-eq.stderr diff --git a/src/test/ui/compile-fail-migration/rfc1445/match-requires-both-partialeq-and-eq.rs b/src/test/ui/rfc1445/match-requires-both-partialeq-and-eq.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc1445/match-requires-both-partialeq-and-eq.rs rename to src/test/ui/rfc1445/match-requires-both-partialeq-and-eq.rs diff --git a/src/test/ui/compile-fail-migration/rfc1445/match-requires-both-partialeq-and-eq.stderr b/src/test/ui/rfc1445/match-requires-both-partialeq-and-eq.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc1445/match-requires-both-partialeq-and-eq.stderr rename to src/test/ui/rfc1445/match-requires-both-partialeq-and-eq.stderr diff --git a/src/test/ui/compile-fail-migration/rfc1623.rs b/src/test/ui/rfc1623.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc1623.rs rename to src/test/ui/rfc1623.rs diff --git a/src/test/ui/compile-fail-migration/rfc1623.stderr b/src/test/ui/rfc1623.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc1623.stderr rename to src/test/ui/rfc1623.stderr diff --git a/src/test/ui/compile-fail-migration/rfc1717/missing-link-attr.rs b/src/test/ui/rfc1717/missing-link-attr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc1717/missing-link-attr.rs rename to src/test/ui/rfc1717/missing-link-attr.rs diff --git a/src/test/ui/compile-fail-migration/rfc1717/missing-link-attr.stderr b/src/test/ui/rfc1717/missing-link-attr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc1717/missing-link-attr.stderr rename to src/test/ui/rfc1717/missing-link-attr.stderr diff --git a/src/test/ui/compile-fail-migration/rfc1717/multiple-renames.rs b/src/test/ui/rfc1717/multiple-renames.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc1717/multiple-renames.rs rename to src/test/ui/rfc1717/multiple-renames.rs diff --git a/src/test/ui/compile-fail-migration/rfc1717/multiple-renames.stderr b/src/test/ui/rfc1717/multiple-renames.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc1717/multiple-renames.stderr rename to src/test/ui/rfc1717/multiple-renames.stderr diff --git a/src/test/ui/compile-fail-migration/rfc1717/rename-to-empty.rs b/src/test/ui/rfc1717/rename-to-empty.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rfc1717/rename-to-empty.rs rename to src/test/ui/rfc1717/rename-to-empty.rs diff --git a/src/test/ui/compile-fail-migration/rfc1717/rename-to-empty.stderr b/src/test/ui/rfc1717/rename-to-empty.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rfc1717/rename-to-empty.stderr rename to src/test/ui/rfc1717/rename-to-empty.stderr diff --git a/src/test/ui/compile-fail-migration/rmeta-lib-pass.rs b/src/test/ui/rmeta-lib-pass.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rmeta-lib-pass.rs rename to src/test/ui/rmeta-lib-pass.rs diff --git a/src/test/ui/compile-fail-migration/rmeta-pass.rs b/src/test/ui/rmeta-pass.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rmeta-pass.rs rename to src/test/ui/rmeta-pass.rs diff --git a/src/test/ui/compile-fail-migration/rmeta-priv-warn.rs b/src/test/ui/rmeta-priv-warn.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rmeta-priv-warn.rs rename to src/test/ui/rmeta-priv-warn.rs diff --git a/src/test/ui/compile-fail-migration/rmeta.rs b/src/test/ui/rmeta.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rmeta.rs rename to src/test/ui/rmeta.rs diff --git a/src/test/ui/compile-fail-migration/rmeta.stderr b/src/test/ui/rmeta.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rmeta.stderr rename to src/test/ui/rmeta.stderr diff --git a/src/test/ui/compile-fail-migration/rmeta_lib.rs b/src/test/ui/rmeta_lib.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rmeta_lib.rs rename to src/test/ui/rmeta_lib.rs diff --git a/src/test/ui/compile-fail-migration/rmeta_lib.stderr b/src/test/ui/rmeta_lib.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rmeta_lib.stderr rename to src/test/ui/rmeta_lib.stderr diff --git a/src/test/ui/compile-fail-migration/rmeta_meta_main.rs b/src/test/ui/rmeta_meta_main.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rmeta_meta_main.rs rename to src/test/ui/rmeta_meta_main.rs diff --git a/src/test/ui/compile-fail-migration/rmeta_meta_main.stderr b/src/test/ui/rmeta_meta_main.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rmeta_meta_main.stderr rename to src/test/ui/rmeta_meta_main.stderr diff --git a/src/test/ui/compile-fail-migration/rust-unstable-column-gated.rs b/src/test/ui/rust-unstable-column-gated.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rust-unstable-column-gated.rs rename to src/test/ui/rust-unstable-column-gated.rs diff --git a/src/test/ui/compile-fail-migration/rust-unstable-column-gated.stderr b/src/test/ui/rust-unstable-column-gated.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rust-unstable-column-gated.stderr rename to src/test/ui/rust-unstable-column-gated.stderr diff --git a/src/test/ui/compile-fail-migration/rustc-args-required-const.rs b/src/test/ui/rustc-args-required-const.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rustc-args-required-const.rs rename to src/test/ui/rustc-args-required-const.rs diff --git a/src/test/ui/compile-fail-migration/rustc-args-required-const.stderr b/src/test/ui/rustc-args-required-const.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rustc-args-required-const.stderr rename to src/test/ui/rustc-args-required-const.stderr diff --git a/src/test/ui/compile-fail-migration/rustc-args-required-const2.rs b/src/test/ui/rustc-args-required-const2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rustc-args-required-const2.rs rename to src/test/ui/rustc-args-required-const2.rs diff --git a/src/test/ui/compile-fail-migration/rustc-args-required-const2.stderr b/src/test/ui/rustc-args-required-const2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rustc-args-required-const2.stderr rename to src/test/ui/rustc-args-required-const2.stderr diff --git a/src/test/ui/compile-fail-migration/rustc-error.rs b/src/test/ui/rustc-error.rs similarity index 100% rename from src/test/ui/compile-fail-migration/rustc-error.rs rename to src/test/ui/rustc-error.rs diff --git a/src/test/ui/compile-fail-migration/rustc-error.stderr b/src/test/ui/rustc-error.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/rustc-error.stderr rename to src/test/ui/rustc-error.stderr diff --git a/src/test/ui/compile-fail-migration/safe-extern-statics-mut.rs b/src/test/ui/safe-extern-statics-mut.rs similarity index 100% rename from src/test/ui/compile-fail-migration/safe-extern-statics-mut.rs rename to src/test/ui/safe-extern-statics-mut.rs diff --git a/src/test/ui/compile-fail-migration/safe-extern-statics-mut.stderr b/src/test/ui/safe-extern-statics-mut.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/safe-extern-statics-mut.stderr rename to src/test/ui/safe-extern-statics-mut.stderr diff --git a/src/test/ui/compile-fail-migration/safe-extern-statics.rs b/src/test/ui/safe-extern-statics.rs similarity index 100% rename from src/test/ui/compile-fail-migration/safe-extern-statics.rs rename to src/test/ui/safe-extern-statics.rs diff --git a/src/test/ui/compile-fail-migration/safe-extern-statics.stderr b/src/test/ui/safe-extern-statics.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/safe-extern-statics.stderr rename to src/test/ui/safe-extern-statics.stderr diff --git a/src/test/ui/self-impl.rs b/src/test/ui/self/self-impl.rs similarity index 100% rename from src/test/ui/self-impl.rs rename to src/test/ui/self/self-impl.rs diff --git a/src/test/ui/self-impl.stderr b/src/test/ui/self/self-impl.stderr similarity index 100% rename from src/test/ui/self-impl.stderr rename to src/test/ui/self/self-impl.stderr diff --git a/src/test/ui/compile-fail-migration/self-infer.rs b/src/test/ui/self/self-infer.rs similarity index 100% rename from src/test/ui/compile-fail-migration/self-infer.rs rename to src/test/ui/self/self-infer.rs diff --git a/src/test/ui/compile-fail-migration/self-infer.stderr b/src/test/ui/self/self-infer.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/self-infer.stderr rename to src/test/ui/self/self-infer.stderr diff --git a/src/test/ui/compile-fail-migration/self-vs-path-ambiguity.rs b/src/test/ui/self/self-vs-path-ambiguity.rs similarity index 100% rename from src/test/ui/compile-fail-migration/self-vs-path-ambiguity.rs rename to src/test/ui/self/self-vs-path-ambiguity.rs diff --git a/src/test/ui/compile-fail-migration/self-vs-path-ambiguity.stderr b/src/test/ui/self/self-vs-path-ambiguity.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/self-vs-path-ambiguity.stderr rename to src/test/ui/self/self-vs-path-ambiguity.stderr diff --git a/src/test/ui/compile-fail-migration/self_type_keyword-2.rs b/src/test/ui/self/self_type_keyword-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/self_type_keyword-2.rs rename to src/test/ui/self/self_type_keyword-2.rs diff --git a/src/test/ui/compile-fail-migration/self_type_keyword-2.stderr b/src/test/ui/self/self_type_keyword-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/self_type_keyword-2.stderr rename to src/test/ui/self/self_type_keyword-2.stderr diff --git a/src/test/ui/compile-fail-migration/self_type_keyword.rs b/src/test/ui/self/self_type_keyword.rs similarity index 100% rename from src/test/ui/compile-fail-migration/self_type_keyword.rs rename to src/test/ui/self/self_type_keyword.rs diff --git a/src/test/ui/compile-fail-migration/self_type_keyword.stderr b/src/test/ui/self/self_type_keyword.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/self_type_keyword.stderr rename to src/test/ui/self/self_type_keyword.stderr diff --git a/src/test/ui/compile-fail-migration/seq-args.rs b/src/test/ui/seq-args.rs similarity index 100% rename from src/test/ui/compile-fail-migration/seq-args.rs rename to src/test/ui/seq-args.rs diff --git a/src/test/ui/compile-fail-migration/seq-args.stderr b/src/test/ui/seq-args.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/seq-args.stderr rename to src/test/ui/seq-args.stderr diff --git a/src/test/ui/shadowed-lifetime.rs b/src/test/ui/shadowed/shadowed-lifetime.rs similarity index 100% rename from src/test/ui/shadowed-lifetime.rs rename to src/test/ui/shadowed/shadowed-lifetime.rs diff --git a/src/test/ui/shadowed-lifetime.stderr b/src/test/ui/shadowed/shadowed-lifetime.stderr similarity index 100% rename from src/test/ui/shadowed-lifetime.stderr rename to src/test/ui/shadowed/shadowed-lifetime.stderr diff --git a/src/test/ui/compile-fail-migration/shadowed-trait-methods.rs b/src/test/ui/shadowed/shadowed-trait-methods.rs similarity index 100% rename from src/test/ui/compile-fail-migration/shadowed-trait-methods.rs rename to src/test/ui/shadowed/shadowed-trait-methods.rs diff --git a/src/test/ui/compile-fail-migration/shadowed-trait-methods.stderr b/src/test/ui/shadowed/shadowed-trait-methods.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/shadowed-trait-methods.stderr rename to src/test/ui/shadowed/shadowed-trait-methods.stderr diff --git a/src/test/ui/shadowed-type-parameter.rs b/src/test/ui/shadowed/shadowed-type-parameter.rs similarity index 100% rename from src/test/ui/shadowed-type-parameter.rs rename to src/test/ui/shadowed/shadowed-type-parameter.rs diff --git a/src/test/ui/shadowed-type-parameter.stderr b/src/test/ui/shadowed/shadowed-type-parameter.stderr similarity index 100% rename from src/test/ui/shadowed-type-parameter.stderr rename to src/test/ui/shadowed/shadowed-type-parameter.stderr diff --git a/src/test/ui/compile-fail-migration/shadowed-use-visibility.rs b/src/test/ui/shadowed/shadowed-use-visibility.rs similarity index 100% rename from src/test/ui/compile-fail-migration/shadowed-use-visibility.rs rename to src/test/ui/shadowed/shadowed-use-visibility.rs diff --git a/src/test/ui/compile-fail-migration/shadowed-use-visibility.stderr b/src/test/ui/shadowed/shadowed-use-visibility.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/shadowed-use-visibility.stderr rename to src/test/ui/shadowed/shadowed-use-visibility.stderr diff --git a/src/test/ui/compile-fail-migration/shadowing-in-the-same-pattern.rs b/src/test/ui/shadowed/shadowing-in-the-same-pattern.rs similarity index 100% rename from src/test/ui/compile-fail-migration/shadowing-in-the-same-pattern.rs rename to src/test/ui/shadowed/shadowing-in-the-same-pattern.rs diff --git a/src/test/ui/compile-fail-migration/shadowing-in-the-same-pattern.stderr b/src/test/ui/shadowed/shadowing-in-the-same-pattern.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/shadowing-in-the-same-pattern.stderr rename to src/test/ui/shadowed/shadowing-in-the-same-pattern.stderr diff --git a/src/test/ui/compile-fail-migration/shift-various-bad-types.rs b/src/test/ui/shift-various-bad-types.rs similarity index 100% rename from src/test/ui/compile-fail-migration/shift-various-bad-types.rs rename to src/test/ui/shift-various-bad-types.rs diff --git a/src/test/ui/compile-fail-migration/shift-various-bad-types.stderr b/src/test/ui/shift-various-bad-types.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/shift-various-bad-types.stderr rename to src/test/ui/shift-various-bad-types.stderr diff --git a/src/test/ui/compile-fail-migration/should-fail-no_gate_irrefutable_if_let_pattern.rs b/src/test/ui/should-fail-no_gate_irrefutable_if_let_pattern.rs similarity index 100% rename from src/test/ui/compile-fail-migration/should-fail-no_gate_irrefutable_if_let_pattern.rs rename to src/test/ui/should-fail-no_gate_irrefutable_if_let_pattern.rs diff --git a/src/test/ui/compile-fail-migration/should-fail-no_gate_irrefutable_if_let_pattern.stderr b/src/test/ui/should-fail-no_gate_irrefutable_if_let_pattern.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/should-fail-no_gate_irrefutable_if_let_pattern.stderr rename to src/test/ui/should-fail-no_gate_irrefutable_if_let_pattern.stderr diff --git a/src/test/ui/compile-fail-migration/should-fail-with_gate_irrefutable_pattern_deny.rs b/src/test/ui/should-fail-with_gate_irrefutable_pattern_deny.rs similarity index 100% rename from src/test/ui/compile-fail-migration/should-fail-with_gate_irrefutable_pattern_deny.rs rename to src/test/ui/should-fail-with_gate_irrefutable_pattern_deny.rs diff --git a/src/test/ui/compile-fail-migration/should-fail-with_gate_irrefutable_pattern_deny.stderr b/src/test/ui/should-fail-with_gate_irrefutable_pattern_deny.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/should-fail-with_gate_irrefutable_pattern_deny.stderr rename to src/test/ui/should-fail-with_gate_irrefutable_pattern_deny.stderr diff --git a/src/test/ui/compile-fail-migration/simd-intrinsic-declaration-type.rs b/src/test/ui/simd-intrinsic/simd-intrinsic-declaration-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/simd-intrinsic-declaration-type.rs rename to src/test/ui/simd-intrinsic/simd-intrinsic-declaration-type.rs diff --git a/src/test/ui/compile-fail-migration/simd-intrinsic-declaration-type.stderr b/src/test/ui/simd-intrinsic/simd-intrinsic-declaration-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/simd-intrinsic-declaration-type.stderr rename to src/test/ui/simd-intrinsic/simd-intrinsic-declaration-type.stderr diff --git a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-arithmetic.rs b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-arithmetic.rs similarity index 100% rename from src/test/ui/compile-fail-migration/simd-intrinsic-generic-arithmetic.rs rename to src/test/ui/simd-intrinsic/simd-intrinsic-generic-arithmetic.rs diff --git a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-arithmetic.stderr b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-arithmetic.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/simd-intrinsic-generic-arithmetic.stderr rename to src/test/ui/simd-intrinsic/simd-intrinsic-generic-arithmetic.stderr diff --git a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-cast.rs b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-cast.rs similarity index 100% rename from src/test/ui/compile-fail-migration/simd-intrinsic-generic-cast.rs rename to src/test/ui/simd-intrinsic/simd-intrinsic-generic-cast.rs diff --git a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-cast.stderr b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-cast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/simd-intrinsic-generic-cast.stderr rename to src/test/ui/simd-intrinsic/simd-intrinsic-generic-cast.stderr diff --git a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-comparison.rs b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-comparison.rs similarity index 100% rename from src/test/ui/compile-fail-migration/simd-intrinsic-generic-comparison.rs rename to src/test/ui/simd-intrinsic/simd-intrinsic-generic-comparison.rs diff --git a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-comparison.stderr b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-comparison.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/simd-intrinsic-generic-comparison.stderr rename to src/test/ui/simd-intrinsic/simd-intrinsic-generic-comparison.stderr diff --git a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-elements.rs b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-elements.rs similarity index 100% rename from src/test/ui/compile-fail-migration/simd-intrinsic-generic-elements.rs rename to src/test/ui/simd-intrinsic/simd-intrinsic-generic-elements.rs diff --git a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-elements.stderr b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-elements.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/simd-intrinsic-generic-elements.stderr rename to src/test/ui/simd-intrinsic/simd-intrinsic-generic-elements.stderr diff --git a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-reduction.rs b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-reduction.rs similarity index 100% rename from src/test/ui/compile-fail-migration/simd-intrinsic-generic-reduction.rs rename to src/test/ui/simd-intrinsic/simd-intrinsic-generic-reduction.rs diff --git a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-reduction.stderr b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-reduction.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/simd-intrinsic-generic-reduction.stderr rename to src/test/ui/simd-intrinsic/simd-intrinsic-generic-reduction.stderr diff --git a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-select.rs b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-select.rs similarity index 100% rename from src/test/ui/compile-fail-migration/simd-intrinsic-generic-select.rs rename to src/test/ui/simd-intrinsic/simd-intrinsic-generic-select.rs diff --git a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-select.stderr b/src/test/ui/simd-intrinsic/simd-intrinsic-generic-select.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/simd-intrinsic-generic-select.stderr rename to src/test/ui/simd-intrinsic/simd-intrinsic-generic-select.stderr diff --git a/src/test/ui/compile-fail-migration/simd-intrinsic-single-nominal-type.rs b/src/test/ui/simd-intrinsic/simd-intrinsic-single-nominal-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/simd-intrinsic-single-nominal-type.rs rename to src/test/ui/simd-intrinsic/simd-intrinsic-single-nominal-type.rs diff --git a/src/test/ui/compile-fail-migration/simd-intrinsic-single-nominal-type.stderr b/src/test/ui/simd-intrinsic/simd-intrinsic-single-nominal-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/simd-intrinsic-single-nominal-type.stderr rename to src/test/ui/simd-intrinsic/simd-intrinsic-single-nominal-type.stderr diff --git a/src/test/ui/compile-fail-migration/simd-type-generic-monomorphisation.rs b/src/test/ui/simd-type-generic-monomorphisation.rs similarity index 100% rename from src/test/ui/compile-fail-migration/simd-type-generic-monomorphisation.rs rename to src/test/ui/simd-type-generic-monomorphisation.rs diff --git a/src/test/ui/compile-fail-migration/simd-type-generic-monomorphisation.stderr b/src/test/ui/simd-type-generic-monomorphisation.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/simd-type-generic-monomorphisation.stderr rename to src/test/ui/simd-type-generic-monomorphisation.stderr diff --git a/src/test/ui/compile-fail-migration/simd-type.rs b/src/test/ui/simd-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/simd-type.rs rename to src/test/ui/simd-type.rs diff --git a/src/test/ui/compile-fail-migration/simd-type.stderr b/src/test/ui/simd-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/simd-type.stderr rename to src/test/ui/simd-type.stderr diff --git a/src/test/ui/compile-fail-migration/single-primitive-inherent-impl.rs b/src/test/ui/single-primitive-inherent-impl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/single-primitive-inherent-impl.rs rename to src/test/ui/single-primitive-inherent-impl.rs diff --git a/src/test/ui/compile-fail-migration/single-primitive-inherent-impl.stderr b/src/test/ui/single-primitive-inherent-impl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/single-primitive-inherent-impl.stderr rename to src/test/ui/single-primitive-inherent-impl.stderr diff --git a/src/test/ui/compile-fail-migration/sized-cycle-note.rs b/src/test/ui/sized-cycle-note.rs similarity index 100% rename from src/test/ui/compile-fail-migration/sized-cycle-note.rs rename to src/test/ui/sized-cycle-note.rs diff --git a/src/test/ui/compile-fail-migration/sized-cycle-note.stderr b/src/test/ui/sized-cycle-note.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/sized-cycle-note.stderr rename to src/test/ui/sized-cycle-note.stderr diff --git a/src/test/ui/compile-fail-migration/slice-2.rs b/src/test/ui/slice-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/slice-2.rs rename to src/test/ui/slice-2.rs diff --git a/src/test/ui/compile-fail-migration/slice-2.stderr b/src/test/ui/slice-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/slice-2.stderr rename to src/test/ui/slice-2.stderr diff --git a/src/test/ui/compile-fail-migration/slice-mut-2.nll.stderr b/src/test/ui/slice-mut-2.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/slice-mut-2.nll.stderr rename to src/test/ui/slice-mut-2.nll.stderr diff --git a/src/test/ui/compile-fail-migration/slice-mut-2.rs b/src/test/ui/slice-mut-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/slice-mut-2.rs rename to src/test/ui/slice-mut-2.rs diff --git a/src/test/ui/compile-fail-migration/slice-mut-2.stderr b/src/test/ui/slice-mut-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/slice-mut-2.stderr rename to src/test/ui/slice-mut-2.stderr diff --git a/src/test/ui/compile-fail-migration/slice-mut.rs b/src/test/ui/slice-mut.rs similarity index 100% rename from src/test/ui/compile-fail-migration/slice-mut.rs rename to src/test/ui/slice-mut.rs diff --git a/src/test/ui/compile-fail-migration/slice-mut.stderr b/src/test/ui/slice-mut.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/slice-mut.stderr rename to src/test/ui/slice-mut.stderr diff --git a/src/test/ui/compile-fail-migration/slightly-nice-generic-literal-messages.rs b/src/test/ui/slightly-nice-generic-literal-messages.rs similarity index 100% rename from src/test/ui/compile-fail-migration/slightly-nice-generic-literal-messages.rs rename to src/test/ui/slightly-nice-generic-literal-messages.rs diff --git a/src/test/ui/compile-fail-migration/slightly-nice-generic-literal-messages.stderr b/src/test/ui/slightly-nice-generic-literal-messages.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/slightly-nice-generic-literal-messages.stderr rename to src/test/ui/slightly-nice-generic-literal-messages.stderr diff --git a/src/test/ui/compile-fail-migration/specialization/README.md b/src/test/ui/specialization/README.md similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/README.md rename to src/test/ui/specialization/README.md diff --git a/src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-feature-gate-default.rs b/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.rs similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-feature-gate-default.rs rename to src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.rs diff --git a/src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-feature-gate-default.stderr b/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-feature-gate-default.stderr rename to src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.stderr diff --git a/src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-no-default.rs b/src/test/ui/specialization/defaultimpl/specialization-no-default.rs similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-no-default.rs rename to src/test/ui/specialization/defaultimpl/specialization-no-default.rs diff --git a/src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-no-default.stderr b/src/test/ui/specialization/defaultimpl/specialization-no-default.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-no-default.stderr rename to src/test/ui/specialization/defaultimpl/specialization-no-default.stderr diff --git a/src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-trait-item-not-implemented.rs b/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.rs similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-trait-item-not-implemented.rs rename to src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.rs diff --git a/src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-trait-item-not-implemented.stderr b/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-trait-item-not-implemented.stderr rename to src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented.stderr diff --git a/src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-trait-not-implemented.rs b/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.rs similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-trait-not-implemented.rs rename to src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.rs diff --git a/src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-trait-not-implemented.stderr b/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-trait-not-implemented.stderr rename to src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr diff --git a/src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-wfcheck.rs b/src/test/ui/specialization/defaultimpl/specialization-wfcheck.rs similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-wfcheck.rs rename to src/test/ui/specialization/defaultimpl/specialization-wfcheck.rs diff --git a/src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-wfcheck.stderr b/src/test/ui/specialization/defaultimpl/specialization-wfcheck.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-wfcheck.stderr rename to src/test/ui/specialization/defaultimpl/specialization-wfcheck.stderr diff --git a/src/test/ui/compile-fail-migration/specialization/defaultimpl/validation.rs b/src/test/ui/specialization/defaultimpl/validation.rs similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/defaultimpl/validation.rs rename to src/test/ui/specialization/defaultimpl/validation.rs diff --git a/src/test/ui/compile-fail-migration/specialization/defaultimpl/validation.stderr b/src/test/ui/specialization/defaultimpl/validation.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/defaultimpl/validation.stderr rename to src/test/ui/specialization/defaultimpl/validation.stderr diff --git a/src/test/ui/compile-fail-migration/specialization/issue-52050.rs b/src/test/ui/specialization/issue-52050.rs similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/issue-52050.rs rename to src/test/ui/specialization/issue-52050.rs diff --git a/src/test/ui/compile-fail-migration/specialization/issue-52050.stderr b/src/test/ui/specialization/issue-52050.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/issue-52050.stderr rename to src/test/ui/specialization/issue-52050.stderr diff --git a/src/test/ui/compile-fail-migration/specialization/specialization-default-projection.rs b/src/test/ui/specialization/specialization-default-projection.rs similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/specialization-default-projection.rs rename to src/test/ui/specialization/specialization-default-projection.rs diff --git a/src/test/ui/compile-fail-migration/specialization/specialization-default-projection.stderr b/src/test/ui/specialization/specialization-default-projection.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/specialization-default-projection.stderr rename to src/test/ui/specialization/specialization-default-projection.stderr diff --git a/src/test/ui/compile-fail-migration/specialization/specialization-default-types.rs b/src/test/ui/specialization/specialization-default-types.rs similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/specialization-default-types.rs rename to src/test/ui/specialization/specialization-default-types.rs diff --git a/src/test/ui/compile-fail-migration/specialization/specialization-default-types.stderr b/src/test/ui/specialization/specialization-default-types.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/specialization-default-types.stderr rename to src/test/ui/specialization/specialization-default-types.stderr diff --git a/src/test/ui/specialization-feature-gate-default.rs b/src/test/ui/specialization/specialization-feature-gate-default.rs similarity index 100% rename from src/test/ui/specialization-feature-gate-default.rs rename to src/test/ui/specialization/specialization-feature-gate-default.rs diff --git a/src/test/ui/specialization-feature-gate-default.stderr b/src/test/ui/specialization/specialization-feature-gate-default.stderr similarity index 100% rename from src/test/ui/specialization-feature-gate-default.stderr rename to src/test/ui/specialization/specialization-feature-gate-default.stderr diff --git a/src/test/ui/specialization-feature-gate-overlap.rs b/src/test/ui/specialization/specialization-feature-gate-overlap.rs similarity index 100% rename from src/test/ui/specialization-feature-gate-overlap.rs rename to src/test/ui/specialization/specialization-feature-gate-overlap.rs diff --git a/src/test/ui/specialization-feature-gate-overlap.stderr b/src/test/ui/specialization/specialization-feature-gate-overlap.stderr similarity index 100% rename from src/test/ui/specialization-feature-gate-overlap.stderr rename to src/test/ui/specialization/specialization-feature-gate-overlap.stderr diff --git a/src/test/ui/compile-fail-migration/specialization/specialization-no-default.rs b/src/test/ui/specialization/specialization-no-default.rs similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/specialization-no-default.rs rename to src/test/ui/specialization/specialization-no-default.rs diff --git a/src/test/ui/compile-fail-migration/specialization/specialization-no-default.stderr b/src/test/ui/specialization/specialization-no-default.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/specialization-no-default.stderr rename to src/test/ui/specialization/specialization-no-default.stderr diff --git a/src/test/ui/compile-fail-migration/specialization/specialization-overlap-negative.rs b/src/test/ui/specialization/specialization-overlap-negative.rs similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/specialization-overlap-negative.rs rename to src/test/ui/specialization/specialization-overlap-negative.rs diff --git a/src/test/ui/compile-fail-migration/specialization/specialization-overlap-negative.stderr b/src/test/ui/specialization/specialization-overlap-negative.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/specialization-overlap-negative.stderr rename to src/test/ui/specialization/specialization-overlap-negative.stderr diff --git a/src/test/ui/compile-fail-migration/specialization/specialization-overlap.rs b/src/test/ui/specialization/specialization-overlap.rs similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/specialization-overlap.rs rename to src/test/ui/specialization/specialization-overlap.rs diff --git a/src/test/ui/compile-fail-migration/specialization/specialization-overlap.stderr b/src/test/ui/specialization/specialization-overlap.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/specialization-overlap.stderr rename to src/test/ui/specialization/specialization-overlap.stderr diff --git a/src/test/ui/compile-fail-migration/specialization/specialization-polarity.rs b/src/test/ui/specialization/specialization-polarity.rs similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/specialization-polarity.rs rename to src/test/ui/specialization/specialization-polarity.rs diff --git a/src/test/ui/compile-fail-migration/specialization/specialization-polarity.stderr b/src/test/ui/specialization/specialization-polarity.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/specialization/specialization-polarity.stderr rename to src/test/ui/specialization/specialization-polarity.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/stability_attribute_issue.rs b/src/test/ui/stability-attribute/auxiliary/stability_attribute_issue.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/stability_attribute_issue.rs rename to src/test/ui/stability-attribute/auxiliary/stability_attribute_issue.rs diff --git a/src/test/ui/compile-fail-migration/stability-attribute-issue-43027.rs b/src/test/ui/stability-attribute/stability-attribute-issue-43027.rs similarity index 100% rename from src/test/ui/compile-fail-migration/stability-attribute-issue-43027.rs rename to src/test/ui/stability-attribute/stability-attribute-issue-43027.rs diff --git a/src/test/ui/compile-fail-migration/stability-attribute-issue-43027.stderr b/src/test/ui/stability-attribute/stability-attribute-issue-43027.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/stability-attribute-issue-43027.stderr rename to src/test/ui/stability-attribute/stability-attribute-issue-43027.stderr diff --git a/src/test/ui/compile-fail-migration/stability-attribute-issue.rs b/src/test/ui/stability-attribute/stability-attribute-issue.rs similarity index 100% rename from src/test/ui/compile-fail-migration/stability-attribute-issue.rs rename to src/test/ui/stability-attribute/stability-attribute-issue.rs diff --git a/src/test/ui/compile-fail-migration/stability-attribute-issue.stderr b/src/test/ui/stability-attribute/stability-attribute-issue.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/stability-attribute-issue.stderr rename to src/test/ui/stability-attribute/stability-attribute-issue.stderr diff --git a/src/test/ui/compile-fail-migration/stability-attribute-non-staged-force-unstable.rs b/src/test/ui/stability-attribute/stability-attribute-non-staged-force-unstable.rs similarity index 100% rename from src/test/ui/compile-fail-migration/stability-attribute-non-staged-force-unstable.rs rename to src/test/ui/stability-attribute/stability-attribute-non-staged-force-unstable.rs diff --git a/src/test/ui/compile-fail-migration/stability-attribute-non-staged-force-unstable.stderr b/src/test/ui/stability-attribute/stability-attribute-non-staged-force-unstable.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/stability-attribute-non-staged-force-unstable.stderr rename to src/test/ui/stability-attribute/stability-attribute-non-staged-force-unstable.stderr diff --git a/src/test/ui/compile-fail-migration/stability-attribute-non-staged.rs b/src/test/ui/stability-attribute/stability-attribute-non-staged.rs similarity index 100% rename from src/test/ui/compile-fail-migration/stability-attribute-non-staged.rs rename to src/test/ui/stability-attribute/stability-attribute-non-staged.rs diff --git a/src/test/ui/compile-fail-migration/stability-attribute-non-staged.stderr b/src/test/ui/stability-attribute/stability-attribute-non-staged.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/stability-attribute-non-staged.stderr rename to src/test/ui/stability-attribute/stability-attribute-non-staged.stderr diff --git a/src/test/ui/compile-fail-migration/stability-attribute-sanity-2.rs b/src/test/ui/stability-attribute/stability-attribute-sanity-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/stability-attribute-sanity-2.rs rename to src/test/ui/stability-attribute/stability-attribute-sanity-2.rs diff --git a/src/test/ui/compile-fail-migration/stability-attribute-sanity-2.stderr b/src/test/ui/stability-attribute/stability-attribute-sanity-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/stability-attribute-sanity-2.stderr rename to src/test/ui/stability-attribute/stability-attribute-sanity-2.stderr diff --git a/src/test/ui/compile-fail-migration/stability-attribute-sanity-3.rs b/src/test/ui/stability-attribute/stability-attribute-sanity-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/stability-attribute-sanity-3.rs rename to src/test/ui/stability-attribute/stability-attribute-sanity-3.rs diff --git a/src/test/ui/compile-fail-migration/stability-attribute-sanity-3.stderr b/src/test/ui/stability-attribute/stability-attribute-sanity-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/stability-attribute-sanity-3.stderr rename to src/test/ui/stability-attribute/stability-attribute-sanity-3.stderr diff --git a/src/test/ui/compile-fail-migration/stability-attribute-sanity.rs b/src/test/ui/stability-attribute/stability-attribute-sanity.rs similarity index 100% rename from src/test/ui/compile-fail-migration/stability-attribute-sanity.rs rename to src/test/ui/stability-attribute/stability-attribute-sanity.rs diff --git a/src/test/ui/compile-fail-migration/stability-attribute-sanity.stderr b/src/test/ui/stability-attribute/stability-attribute-sanity.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/stability-attribute-sanity.stderr rename to src/test/ui/stability-attribute/stability-attribute-sanity.stderr diff --git a/src/test/ui/compile-fail-migration/stable-features.rs b/src/test/ui/stable-features.rs similarity index 100% rename from src/test/ui/compile-fail-migration/stable-features.rs rename to src/test/ui/stable-features.rs diff --git a/src/test/ui/compile-fail-migration/stable-features.stderr b/src/test/ui/stable-features.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/stable-features.stderr rename to src/test/ui/stable-features.stderr diff --git a/src/test/ui/compile-fail-migration/static-priv-by-default.rs b/src/test/ui/static/auxiliary/static-priv-by-default.rs similarity index 100% rename from src/test/ui/compile-fail-migration/static-priv-by-default.rs rename to src/test/ui/static/auxiliary/static-priv-by-default.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/static_priv_by_default.rs b/src/test/ui/static/auxiliary/static_priv_by_default.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/static_priv_by_default.rs rename to src/test/ui/static/auxiliary/static_priv_by_default.rs diff --git a/src/test/ui/compile-fail-migration/static-closures.rs b/src/test/ui/static/static-closures.rs similarity index 100% rename from src/test/ui/compile-fail-migration/static-closures.rs rename to src/test/ui/static/static-closures.rs diff --git a/src/test/ui/compile-fail-migration/static-closures.stderr b/src/test/ui/static/static-closures.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/static-closures.stderr rename to src/test/ui/static/static-closures.stderr diff --git a/src/test/ui/compile-fail-migration/static-drop-scope.rs b/src/test/ui/static/static-drop-scope.rs similarity index 100% rename from src/test/ui/compile-fail-migration/static-drop-scope.rs rename to src/test/ui/static/static-drop-scope.rs diff --git a/src/test/ui/compile-fail-migration/static-drop-scope.stderr b/src/test/ui/static/static-drop-scope.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/static-drop-scope.stderr rename to src/test/ui/static/static-drop-scope.stderr diff --git a/src/test/ui/compile-fail-migration/static-items-cant-move.rs b/src/test/ui/static/static-items-cant-move.rs similarity index 100% rename from src/test/ui/compile-fail-migration/static-items-cant-move.rs rename to src/test/ui/static/static-items-cant-move.rs diff --git a/src/test/ui/compile-fail-migration/static-items-cant-move.stderr b/src/test/ui/static/static-items-cant-move.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/static-items-cant-move.stderr rename to src/test/ui/static/static-items-cant-move.stderr diff --git a/src/test/ui/compile-fail-migration/static-lifetime-bound.nll.stderr b/src/test/ui/static/static-lifetime-bound.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/static-lifetime-bound.nll.stderr rename to src/test/ui/static/static-lifetime-bound.nll.stderr diff --git a/src/test/ui/compile-fail-migration/static-lifetime-bound.rs b/src/test/ui/static/static-lifetime-bound.rs similarity index 100% rename from src/test/ui/compile-fail-migration/static-lifetime-bound.rs rename to src/test/ui/static/static-lifetime-bound.rs diff --git a/src/test/ui/compile-fail-migration/static-lifetime-bound.stderr b/src/test/ui/static/static-lifetime-bound.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/static-lifetime-bound.stderr rename to src/test/ui/static/static-lifetime-bound.stderr diff --git a/src/test/ui/static-lifetime.rs b/src/test/ui/static/static-lifetime.rs similarity index 100% rename from src/test/ui/static-lifetime.rs rename to src/test/ui/static/static-lifetime.rs diff --git a/src/test/ui/static-lifetime.stderr b/src/test/ui/static/static-lifetime.stderr similarity index 100% rename from src/test/ui/static-lifetime.stderr rename to src/test/ui/static/static-lifetime.stderr diff --git a/src/test/ui/compile-fail-migration/static-method-privacy.rs b/src/test/ui/static/static-method-privacy.rs similarity index 100% rename from src/test/ui/compile-fail-migration/static-method-privacy.rs rename to src/test/ui/static/static-method-privacy.rs diff --git a/src/test/ui/compile-fail-migration/static-method-privacy.stderr b/src/test/ui/static/static-method-privacy.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/static-method-privacy.stderr rename to src/test/ui/static/static-method-privacy.stderr diff --git a/src/test/ui/compile-fail-migration/static-mut-bad-types.rs b/src/test/ui/static/static-mut-bad-types.rs similarity index 100% rename from src/test/ui/compile-fail-migration/static-mut-bad-types.rs rename to src/test/ui/static/static-mut-bad-types.rs diff --git a/src/test/ui/compile-fail-migration/static-mut-bad-types.stderr b/src/test/ui/static/static-mut-bad-types.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/static-mut-bad-types.stderr rename to src/test/ui/static/static-mut-bad-types.stderr diff --git a/src/test/ui/compile-fail-migration/static-mut-foreign-requires-unsafe.rs b/src/test/ui/static/static-mut-foreign-requires-unsafe.rs similarity index 100% rename from src/test/ui/compile-fail-migration/static-mut-foreign-requires-unsafe.rs rename to src/test/ui/static/static-mut-foreign-requires-unsafe.rs diff --git a/src/test/ui/compile-fail-migration/static-mut-foreign-requires-unsafe.stderr b/src/test/ui/static/static-mut-foreign-requires-unsafe.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/static-mut-foreign-requires-unsafe.stderr rename to src/test/ui/static/static-mut-foreign-requires-unsafe.stderr diff --git a/src/test/ui/compile-fail-migration/static-mut-not-constant.rs b/src/test/ui/static/static-mut-not-constant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/static-mut-not-constant.rs rename to src/test/ui/static/static-mut-not-constant.rs diff --git a/src/test/ui/compile-fail-migration/static-mut-not-constant.stderr b/src/test/ui/static/static-mut-not-constant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/static-mut-not-constant.stderr rename to src/test/ui/static/static-mut-not-constant.stderr diff --git a/src/test/ui/compile-fail-migration/static-mut-not-pat.rs b/src/test/ui/static/static-mut-not-pat.rs similarity index 100% rename from src/test/ui/compile-fail-migration/static-mut-not-pat.rs rename to src/test/ui/static/static-mut-not-pat.rs diff --git a/src/test/ui/compile-fail-migration/static-mut-not-pat.stderr b/src/test/ui/static/static-mut-not-pat.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/static-mut-not-pat.stderr rename to src/test/ui/static/static-mut-not-pat.stderr diff --git a/src/test/ui/compile-fail-migration/static-mut-requires-unsafe.rs b/src/test/ui/static/static-mut-requires-unsafe.rs similarity index 100% rename from src/test/ui/compile-fail-migration/static-mut-requires-unsafe.rs rename to src/test/ui/static/static-mut-requires-unsafe.rs diff --git a/src/test/ui/compile-fail-migration/static-mut-requires-unsafe.stderr b/src/test/ui/static/static-mut-requires-unsafe.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/static-mut-requires-unsafe.stderr rename to src/test/ui/static/static-mut-requires-unsafe.stderr diff --git a/src/test/ui/compile-fail-migration/static-priv-by-default2.rs b/src/test/ui/static/static-priv-by-default2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/static-priv-by-default2.rs rename to src/test/ui/static/static-priv-by-default2.rs diff --git a/src/test/ui/compile-fail-migration/static-priv-by-default2.stderr b/src/test/ui/static/static-priv-by-default2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/static-priv-by-default2.stderr rename to src/test/ui/static/static-priv-by-default2.stderr diff --git a/src/test/ui/compile-fail-migration/static-reference-to-fn-1.rs b/src/test/ui/static/static-reference-to-fn-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/static-reference-to-fn-1.rs rename to src/test/ui/static/static-reference-to-fn-1.rs diff --git a/src/test/ui/compile-fail-migration/static-reference-to-fn-1.stderr b/src/test/ui/static/static-reference-to-fn-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/static-reference-to-fn-1.stderr rename to src/test/ui/static/static-reference-to-fn-1.stderr diff --git a/src/test/ui/compile-fail-migration/static-reference-to-fn-2.nll.stderr b/src/test/ui/static/static-reference-to-fn-2.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/static-reference-to-fn-2.nll.stderr rename to src/test/ui/static/static-reference-to-fn-2.nll.stderr diff --git a/src/test/ui/compile-fail-migration/static-reference-to-fn-2.rs b/src/test/ui/static/static-reference-to-fn-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/static-reference-to-fn-2.rs rename to src/test/ui/static/static-reference-to-fn-2.rs diff --git a/src/test/ui/compile-fail-migration/static-reference-to-fn-2.stderr b/src/test/ui/static/static-reference-to-fn-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/static-reference-to-fn-2.stderr rename to src/test/ui/static/static-reference-to-fn-2.stderr diff --git a/src/test/ui/compile-fail-migration/static-region-bound.rs b/src/test/ui/static/static-region-bound.rs similarity index 100% rename from src/test/ui/compile-fail-migration/static-region-bound.rs rename to src/test/ui/static/static-region-bound.rs diff --git a/src/test/ui/compile-fail-migration/static-region-bound.stderr b/src/test/ui/static/static-region-bound.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/static-region-bound.stderr rename to src/test/ui/static/static-region-bound.stderr diff --git a/src/test/ui/compile-fail-migration/static-vec-repeat-not-constant.rs b/src/test/ui/static/static-vec-repeat-not-constant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/static-vec-repeat-not-constant.rs rename to src/test/ui/static/static-vec-repeat-not-constant.rs diff --git a/src/test/ui/compile-fail-migration/static-vec-repeat-not-constant.stderr b/src/test/ui/static/static-vec-repeat-not-constant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/static-vec-repeat-not-constant.stderr rename to src/test/ui/static/static-vec-repeat-not-constant.stderr diff --git a/src/test/ui/compile-fail-migration/staticness-mismatch.rs b/src/test/ui/staticness-mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/staticness-mismatch.rs rename to src/test/ui/staticness-mismatch.rs diff --git a/src/test/ui/compile-fail-migration/staticness-mismatch.stderr b/src/test/ui/staticness-mismatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/staticness-mismatch.stderr rename to src/test/ui/staticness-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/std-uncopyable-atomics.rs b/src/test/ui/std-uncopyable-atomics.rs similarity index 100% rename from src/test/ui/compile-fail-migration/std-uncopyable-atomics.rs rename to src/test/ui/std-uncopyable-atomics.rs diff --git a/src/test/ui/compile-fail-migration/std-uncopyable-atomics.stderr b/src/test/ui/std-uncopyable-atomics.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/std-uncopyable-atomics.stderr rename to src/test/ui/std-uncopyable-atomics.stderr diff --git a/src/test/ui/compile-fail-migration/stmt_expr_attrs_no_feature.rs b/src/test/ui/stmt_expr_attrs_no_feature.rs similarity index 100% rename from src/test/ui/compile-fail-migration/stmt_expr_attrs_no_feature.rs rename to src/test/ui/stmt_expr_attrs_no_feature.rs diff --git a/src/test/ui/compile-fail-migration/stmt_expr_attrs_no_feature.stderr b/src/test/ui/stmt_expr_attrs_no_feature.stderr similarity index 87% rename from src/test/ui/compile-fail-migration/stmt_expr_attrs_no_feature.stderr rename to src/test/ui/stmt_expr_attrs_no_feature.stderr index 1168c5a8223..dc114cef2e5 100644 --- a/src/test/ui/compile-fail-migration/stmt_expr_attrs_no_feature.stderr +++ b/src/test/ui/stmt_expr_attrs_no_feature.stderr @@ -1,3 +1,11 @@ +error[E0658]: attributes on expressions are experimental. (see issue #15701) + --> $DIR/stmt_expr_attrs_no_feature.rs:23:5 + | +LL | #[attr] //~ ERROR attributes on expressions are experimental + | ^^^^^^^ + | + = help: add #![feature(stmt_expr_attributes)] to the crate attributes to enable + error[E0658]: attributes on expressions are experimental. (see issue #15701) --> $DIR/stmt_expr_attrs_no_feature.rs:104:18 | @@ -62,6 +70,6 @@ LL | 6 => #[attr] (), //~ ERROR 15701 | = help: add #![feature(stmt_expr_attributes)] to the crate attributes to enable -error: aborting due to 8 previous errors +error: aborting due to 9 previous errors For more information about this error, try `rustc --explain E0658`. diff --git a/src/test/ui/str-array-assignment.rs b/src/test/ui/str/str-array-assignment.rs similarity index 100% rename from src/test/ui/str-array-assignment.rs rename to src/test/ui/str/str-array-assignment.rs diff --git a/src/test/ui/str-array-assignment.stderr b/src/test/ui/str/str-array-assignment.stderr similarity index 100% rename from src/test/ui/str-array-assignment.stderr rename to src/test/ui/str/str-array-assignment.stderr diff --git a/src/test/ui/str-as-char.fixed b/src/test/ui/str/str-as-char.fixed similarity index 100% rename from src/test/ui/str-as-char.fixed rename to src/test/ui/str/str-as-char.fixed diff --git a/src/test/ui/str-as-char.rs b/src/test/ui/str/str-as-char.rs similarity index 100% rename from src/test/ui/str-as-char.rs rename to src/test/ui/str/str-as-char.rs diff --git a/src/test/ui/str-as-char.stderr b/src/test/ui/str/str-as-char.stderr similarity index 100% rename from src/test/ui/str-as-char.stderr rename to src/test/ui/str/str-as-char.stderr diff --git a/src/test/ui/str-concat-on-double-ref.rs b/src/test/ui/str/str-concat-on-double-ref.rs similarity index 100% rename from src/test/ui/str-concat-on-double-ref.rs rename to src/test/ui/str/str-concat-on-double-ref.rs diff --git a/src/test/ui/str-concat-on-double-ref.stderr b/src/test/ui/str/str-concat-on-double-ref.stderr similarity index 100% rename from src/test/ui/str-concat-on-double-ref.stderr rename to src/test/ui/str/str-concat-on-double-ref.stderr diff --git a/src/test/ui/compile-fail-migration/str-idx.rs b/src/test/ui/str/str-idx.rs similarity index 100% rename from src/test/ui/compile-fail-migration/str-idx.rs rename to src/test/ui/str/str-idx.rs diff --git a/src/test/ui/compile-fail-migration/str-idx.stderr b/src/test/ui/str/str-idx.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/str-idx.stderr rename to src/test/ui/str/str-idx.stderr diff --git a/src/test/ui/str-lit-type-mismatch.rs b/src/test/ui/str/str-lit-type-mismatch.rs similarity index 100% rename from src/test/ui/str-lit-type-mismatch.rs rename to src/test/ui/str/str-lit-type-mismatch.rs diff --git a/src/test/ui/str-lit-type-mismatch.stderr b/src/test/ui/str/str-lit-type-mismatch.stderr similarity index 100% rename from src/test/ui/str-lit-type-mismatch.stderr rename to src/test/ui/str/str-lit-type-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/str-mut-idx.rs b/src/test/ui/str/str-mut-idx.rs similarity index 100% rename from src/test/ui/compile-fail-migration/str-mut-idx.rs rename to src/test/ui/str/str-mut-idx.rs diff --git a/src/test/ui/compile-fail-migration/str-mut-idx.stderr b/src/test/ui/str/str-mut-idx.stderr similarity index 96% rename from src/test/ui/compile-fail-migration/str-mut-idx.stderr rename to src/test/ui/str/str-mut-idx.stderr index a80c7e57431..df21ea2b274 100644 --- a/src/test/ui/compile-fail-migration/str-mut-idx.stderr +++ b/src/test/ui/str/str-mut-idx.stderr @@ -5,7 +5,7 @@ LL | s[1..2] = bot(); | ^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `str` - = note: to learn more, visit + = note: to learn more, visit note: required by `bot` --> $DIR/str-mut-idx.rs:11:1 | @@ -19,7 +19,7 @@ LL | s[1..2] = bot(); | ^^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `str` - = note: to learn more, visit + = note: to learn more, visit = note: the left-hand-side of an assignment must have a statically known size error[E0277]: the type `str` cannot be mutably indexed by `usize` diff --git a/src/test/ui/auxiliary/struct_field_privacy.rs b/src/test/ui/structs/auxiliary/struct_field_privacy.rs similarity index 100% rename from src/test/ui/auxiliary/struct_field_privacy.rs rename to src/test/ui/structs/auxiliary/struct_field_privacy.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/struct_variant_privacy.rs b/src/test/ui/structs/auxiliary/struct_variant_privacy.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/struct_variant_privacy.rs rename to src/test/ui/structs/auxiliary/struct_variant_privacy.rs diff --git a/src/test/ui/compile-fail-migration/struct-base-wrong-type-2.rs b/src/test/ui/structs/struct-base-wrong-type-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/struct-base-wrong-type-2.rs rename to src/test/ui/structs/struct-base-wrong-type-2.rs diff --git a/src/test/ui/compile-fail-migration/struct-base-wrong-type-2.stderr b/src/test/ui/structs/struct-base-wrong-type-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/struct-base-wrong-type-2.stderr rename to src/test/ui/structs/struct-base-wrong-type-2.stderr diff --git a/src/test/ui/compile-fail-migration/struct-base-wrong-type.rs b/src/test/ui/structs/struct-base-wrong-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/struct-base-wrong-type.rs rename to src/test/ui/structs/struct-base-wrong-type.rs diff --git a/src/test/ui/compile-fail-migration/struct-base-wrong-type.stderr b/src/test/ui/structs/struct-base-wrong-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/struct-base-wrong-type.stderr rename to src/test/ui/structs/struct-base-wrong-type.stderr diff --git a/src/test/ui/struct-duplicate-comma.rs b/src/test/ui/structs/struct-duplicate-comma.rs similarity index 100% rename from src/test/ui/struct-duplicate-comma.rs rename to src/test/ui/structs/struct-duplicate-comma.rs diff --git a/src/test/ui/struct-duplicate-comma.stderr b/src/test/ui/structs/struct-duplicate-comma.stderr similarity index 100% rename from src/test/ui/struct-duplicate-comma.stderr rename to src/test/ui/structs/struct-duplicate-comma.stderr diff --git a/src/test/ui/compile-fail-migration/struct-field-cfg.rs b/src/test/ui/structs/struct-field-cfg.rs similarity index 100% rename from src/test/ui/compile-fail-migration/struct-field-cfg.rs rename to src/test/ui/structs/struct-field-cfg.rs diff --git a/src/test/ui/compile-fail-migration/struct-field-cfg.stderr b/src/test/ui/structs/struct-field-cfg.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/struct-field-cfg.stderr rename to src/test/ui/structs/struct-field-cfg.stderr diff --git a/src/test/ui/struct-field-init-syntax.rs b/src/test/ui/structs/struct-field-init-syntax.rs similarity index 100% rename from src/test/ui/struct-field-init-syntax.rs rename to src/test/ui/structs/struct-field-init-syntax.rs diff --git a/src/test/ui/struct-field-init-syntax.stderr b/src/test/ui/structs/struct-field-init-syntax.stderr similarity index 100% rename from src/test/ui/struct-field-init-syntax.stderr rename to src/test/ui/structs/struct-field-init-syntax.stderr diff --git a/src/test/ui/compile-fail-migration/struct-field-privacy.rs b/src/test/ui/structs/struct-field-privacy.rs similarity index 100% rename from src/test/ui/compile-fail-migration/struct-field-privacy.rs rename to src/test/ui/structs/struct-field-privacy.rs diff --git a/src/test/ui/compile-fail-migration/struct-field-privacy.stderr b/src/test/ui/structs/struct-field-privacy.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/struct-field-privacy.stderr rename to src/test/ui/structs/struct-field-privacy.stderr diff --git a/src/test/ui/struct-fields-decl-dupe.rs b/src/test/ui/structs/struct-fields-decl-dupe.rs similarity index 100% rename from src/test/ui/struct-fields-decl-dupe.rs rename to src/test/ui/structs/struct-fields-decl-dupe.rs diff --git a/src/test/ui/struct-fields-decl-dupe.stderr b/src/test/ui/structs/struct-fields-decl-dupe.stderr similarity index 100% rename from src/test/ui/struct-fields-decl-dupe.stderr rename to src/test/ui/structs/struct-fields-decl-dupe.stderr diff --git a/src/test/ui/compile-fail-migration/struct-fields-dupe.rs b/src/test/ui/structs/struct-fields-dupe.rs similarity index 100% rename from src/test/ui/compile-fail-migration/struct-fields-dupe.rs rename to src/test/ui/structs/struct-fields-dupe.rs diff --git a/src/test/ui/compile-fail-migration/struct-fields-dupe.stderr b/src/test/ui/structs/struct-fields-dupe.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/struct-fields-dupe.stderr rename to src/test/ui/structs/struct-fields-dupe.stderr diff --git a/src/test/ui/struct-fields-hints-no-dupe.rs b/src/test/ui/structs/struct-fields-hints-no-dupe.rs similarity index 100% rename from src/test/ui/struct-fields-hints-no-dupe.rs rename to src/test/ui/structs/struct-fields-hints-no-dupe.rs diff --git a/src/test/ui/struct-fields-hints-no-dupe.stderr b/src/test/ui/structs/struct-fields-hints-no-dupe.stderr similarity index 100% rename from src/test/ui/struct-fields-hints-no-dupe.stderr rename to src/test/ui/structs/struct-fields-hints-no-dupe.stderr diff --git a/src/test/ui/struct-fields-hints.rs b/src/test/ui/structs/struct-fields-hints.rs similarity index 100% rename from src/test/ui/struct-fields-hints.rs rename to src/test/ui/structs/struct-fields-hints.rs diff --git a/src/test/ui/struct-fields-hints.stderr b/src/test/ui/structs/struct-fields-hints.stderr similarity index 100% rename from src/test/ui/struct-fields-hints.stderr rename to src/test/ui/structs/struct-fields-hints.stderr diff --git a/src/test/ui/compile-fail-migration/struct-fields-missing.rs b/src/test/ui/structs/struct-fields-missing.rs similarity index 100% rename from src/test/ui/compile-fail-migration/struct-fields-missing.rs rename to src/test/ui/structs/struct-fields-missing.rs diff --git a/src/test/ui/compile-fail-migration/struct-fields-missing.stderr b/src/test/ui/structs/struct-fields-missing.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/struct-fields-missing.stderr rename to src/test/ui/structs/struct-fields-missing.stderr diff --git a/src/test/ui/compile-fail-migration/struct-fields-shorthand-unresolved.rs b/src/test/ui/structs/struct-fields-shorthand-unresolved.rs similarity index 100% rename from src/test/ui/compile-fail-migration/struct-fields-shorthand-unresolved.rs rename to src/test/ui/structs/struct-fields-shorthand-unresolved.rs diff --git a/src/test/ui/compile-fail-migration/struct-fields-shorthand-unresolved.stderr b/src/test/ui/structs/struct-fields-shorthand-unresolved.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/struct-fields-shorthand-unresolved.stderr rename to src/test/ui/structs/struct-fields-shorthand-unresolved.stderr diff --git a/src/test/ui/compile-fail-migration/struct-fields-shorthand.rs b/src/test/ui/structs/struct-fields-shorthand.rs similarity index 100% rename from src/test/ui/compile-fail-migration/struct-fields-shorthand.rs rename to src/test/ui/structs/struct-fields-shorthand.rs diff --git a/src/test/ui/compile-fail-migration/struct-fields-shorthand.stderr b/src/test/ui/structs/struct-fields-shorthand.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/struct-fields-shorthand.stderr rename to src/test/ui/structs/struct-fields-shorthand.stderr diff --git a/src/test/ui/struct-fields-too-many.rs b/src/test/ui/structs/struct-fields-too-many.rs similarity index 100% rename from src/test/ui/struct-fields-too-many.rs rename to src/test/ui/structs/struct-fields-too-many.rs diff --git a/src/test/ui/struct-fields-too-many.stderr b/src/test/ui/structs/struct-fields-too-many.stderr similarity index 100% rename from src/test/ui/struct-fields-too-many.stderr rename to src/test/ui/structs/struct-fields-too-many.stderr diff --git a/src/test/ui/compile-fail-migration/struct-fields-typo.rs b/src/test/ui/structs/struct-fields-typo.rs similarity index 100% rename from src/test/ui/compile-fail-migration/struct-fields-typo.rs rename to src/test/ui/structs/struct-fields-typo.rs diff --git a/src/test/ui/compile-fail-migration/struct-fields-typo.stderr b/src/test/ui/structs/struct-fields-typo.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/struct-fields-typo.stderr rename to src/test/ui/structs/struct-fields-typo.stderr diff --git a/src/test/ui/compile-fail-migration/struct-like-enum-nonexhaustive.rs b/src/test/ui/structs/struct-like-enum-nonexhaustive.rs similarity index 100% rename from src/test/ui/compile-fail-migration/struct-like-enum-nonexhaustive.rs rename to src/test/ui/structs/struct-like-enum-nonexhaustive.rs diff --git a/src/test/ui/compile-fail-migration/struct-like-enum-nonexhaustive.stderr b/src/test/ui/structs/struct-like-enum-nonexhaustive.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/struct-like-enum-nonexhaustive.stderr rename to src/test/ui/structs/struct-like-enum-nonexhaustive.stderr diff --git a/src/test/ui/struct-missing-comma.rs b/src/test/ui/structs/struct-missing-comma.rs similarity index 100% rename from src/test/ui/struct-missing-comma.rs rename to src/test/ui/structs/struct-missing-comma.rs diff --git a/src/test/ui/struct-missing-comma.stderr b/src/test/ui/structs/struct-missing-comma.stderr similarity index 100% rename from src/test/ui/struct-missing-comma.stderr rename to src/test/ui/structs/struct-missing-comma.stderr diff --git a/src/test/ui/compile-fail-migration/struct-pat-derived-error.rs b/src/test/ui/structs/struct-pat-derived-error.rs similarity index 100% rename from src/test/ui/compile-fail-migration/struct-pat-derived-error.rs rename to src/test/ui/structs/struct-pat-derived-error.rs diff --git a/src/test/ui/compile-fail-migration/struct-pat-derived-error.stderr b/src/test/ui/structs/struct-pat-derived-error.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/struct-pat-derived-error.stderr rename to src/test/ui/structs/struct-pat-derived-error.stderr diff --git a/src/test/ui/compile-fail-migration/struct-path-alias-bounds.rs b/src/test/ui/structs/struct-path-alias-bounds.rs similarity index 100% rename from src/test/ui/compile-fail-migration/struct-path-alias-bounds.rs rename to src/test/ui/structs/struct-path-alias-bounds.rs diff --git a/src/test/ui/compile-fail-migration/struct-path-alias-bounds.stderr b/src/test/ui/structs/struct-path-alias-bounds.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/struct-path-alias-bounds.stderr rename to src/test/ui/structs/struct-path-alias-bounds.stderr diff --git a/src/test/ui/compile-fail-migration/struct-path-associated-type.rs b/src/test/ui/structs/struct-path-associated-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/struct-path-associated-type.rs rename to src/test/ui/structs/struct-path-associated-type.rs diff --git a/src/test/ui/compile-fail-migration/struct-path-associated-type.stderr b/src/test/ui/structs/struct-path-associated-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/struct-path-associated-type.stderr rename to src/test/ui/structs/struct-path-associated-type.stderr diff --git a/src/test/ui/struct-path-self-type-mismatch.rs b/src/test/ui/structs/struct-path-self-type-mismatch.rs similarity index 100% rename from src/test/ui/struct-path-self-type-mismatch.rs rename to src/test/ui/structs/struct-path-self-type-mismatch.rs diff --git a/src/test/ui/struct-path-self-type-mismatch.stderr b/src/test/ui/structs/struct-path-self-type-mismatch.stderr similarity index 100% rename from src/test/ui/struct-path-self-type-mismatch.stderr rename to src/test/ui/structs/struct-path-self-type-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/struct-path-self.rs b/src/test/ui/structs/struct-path-self.rs similarity index 100% rename from src/test/ui/compile-fail-migration/struct-path-self.rs rename to src/test/ui/structs/struct-path-self.rs diff --git a/src/test/ui/compile-fail-migration/struct-path-self.stderr b/src/test/ui/structs/struct-path-self.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/struct-path-self.stderr rename to src/test/ui/structs/struct-path-self.stderr diff --git a/src/test/ui/compile-fail-migration/struct-pattern-match-useless.rs b/src/test/ui/structs/struct-pattern-match-useless.rs similarity index 100% rename from src/test/ui/compile-fail-migration/struct-pattern-match-useless.rs rename to src/test/ui/structs/struct-pattern-match-useless.rs diff --git a/src/test/ui/compile-fail-migration/struct-pattern-match-useless.stderr b/src/test/ui/structs/struct-pattern-match-useless.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/struct-pattern-match-useless.stderr rename to src/test/ui/structs/struct-pattern-match-useless.stderr diff --git a/src/test/ui/compile-fail-migration/struct-variant-privacy-xc.rs b/src/test/ui/structs/struct-variant-privacy-xc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/struct-variant-privacy-xc.rs rename to src/test/ui/structs/struct-variant-privacy-xc.rs diff --git a/src/test/ui/compile-fail-migration/struct-variant-privacy-xc.stderr b/src/test/ui/structs/struct-variant-privacy-xc.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/struct-variant-privacy-xc.stderr rename to src/test/ui/structs/struct-variant-privacy-xc.stderr diff --git a/src/test/ui/compile-fail-migration/struct-variant-privacy.rs b/src/test/ui/structs/struct-variant-privacy.rs similarity index 100% rename from src/test/ui/compile-fail-migration/struct-variant-privacy.rs rename to src/test/ui/structs/struct-variant-privacy.rs diff --git a/src/test/ui/compile-fail-migration/struct-variant-privacy.stderr b/src/test/ui/structs/struct-variant-privacy.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/struct-variant-privacy.stderr rename to src/test/ui/structs/struct-variant-privacy.stderr diff --git a/src/test/ui/compile-fail-migration/structure-constructor-type-mismatch.rs b/src/test/ui/structs/structure-constructor-type-mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/structure-constructor-type-mismatch.rs rename to src/test/ui/structs/structure-constructor-type-mismatch.rs diff --git a/src/test/ui/compile-fail-migration/structure-constructor-type-mismatch.stderr b/src/test/ui/structs/structure-constructor-type-mismatch.stderr similarity index 74% rename from src/test/ui/compile-fail-migration/structure-constructor-type-mismatch.stderr rename to src/test/ui/structs/structure-constructor-type-mismatch.stderr index 85de419bfc0..1a88bc09dd6 100644 --- a/src/test/ui/compile-fail-migration/structure-constructor-type-mismatch.stderr +++ b/src/test/ui/structs/structure-constructor-type-mismatch.stderr @@ -2,7 +2,10 @@ error[E0308]: mismatched types --> $DIR/structure-constructor-type-mismatch.rs:27:12 | LL | x: 1, - | ^ expected f32, found integral variable + | ^ + | | + | expected f32, found integral variable + | help: use a float literal: `1.0` | = note: expected type `f32` found type `{integer}` @@ -11,7 +14,10 @@ error[E0308]: mismatched types --> $DIR/structure-constructor-type-mismatch.rs:30:12 | LL | y: 2, - | ^ expected f32, found integral variable + | ^ + | | + | expected f32, found integral variable + | help: use a float literal: `2.0` | = note: expected type `f32` found type `{integer}` @@ -20,7 +26,10 @@ error[E0308]: mismatched types --> $DIR/structure-constructor-type-mismatch.rs:36:12 | LL | x: 3, - | ^ expected f32, found integral variable + | ^ + | | + | expected f32, found integral variable + | help: use a float literal: `3.0` | = note: expected type `f32` found type `{integer}` @@ -29,7 +38,10 @@ error[E0308]: mismatched types --> $DIR/structure-constructor-type-mismatch.rs:39:12 | LL | y: 4, - | ^ expected f32, found integral variable + | ^ + | | + | expected f32, found integral variable + | help: use a float literal: `4.0` | = note: expected type `f32` found type `{integer}` @@ -38,7 +50,10 @@ error[E0308]: mismatched types --> $DIR/structure-constructor-type-mismatch.rs:45:12 | LL | x: 5, - | ^ expected f32, found integral variable + | ^ + | | + | expected f32, found integral variable + | help: use a float literal: `5.0` | = note: expected type `f32` found type `{integer}` @@ -47,7 +62,10 @@ error[E0308]: mismatched types --> $DIR/structure-constructor-type-mismatch.rs:52:12 | LL | x: 7, - | ^ expected f32, found integral variable + | ^ + | | + | expected f32, found integral variable + | help: use a float literal: `7.0` | = note: expected type `f32` found type `{integer}` @@ -62,7 +80,10 @@ error[E0308]: mismatched types --> $DIR/structure-constructor-type-mismatch.rs:59:12 | LL | x: 9, //~ ERROR mismatched types - | ^ expected f32, found integral variable + | ^ + | | + | expected f32, found integral variable + | help: use a float literal: `9.0` | = note: expected type `f32` found type `{integer}` @@ -71,7 +92,10 @@ error[E0308]: mismatched types --> $DIR/structure-constructor-type-mismatch.rs:60:12 | LL | y: 10, //~ ERROR mismatched types - | ^^ expected f32, found integral variable + | ^^ + | | + | expected f32, found integral variable + | help: use a float literal: `10.0` | = note: expected type `f32` found type `{integer}` diff --git a/src/test/ui/compile-fail-migration/substs-ppaux.normal.stderr b/src/test/ui/substs-ppaux.normal.stderr similarity index 98% rename from src/test/ui/compile-fail-migration/substs-ppaux.normal.stderr rename to src/test/ui/substs-ppaux.normal.stderr index 3eb15a08eae..9f87329fb34 100644 --- a/src/test/ui/compile-fail-migration/substs-ppaux.normal.stderr +++ b/src/test/ui/substs-ppaux.normal.stderr @@ -41,7 +41,7 @@ LL | >::bar; | ^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `str` - = note: to learn more, visit + = note: to learn more, visit = note: required because of the requirements on the impl of `Foo<'_, '_, u8>` for `str` note: required by `Foo::bar` --> $DIR/substs-ppaux.rs:16:5 diff --git a/src/test/ui/compile-fail-migration/substs-ppaux.rs b/src/test/ui/substs-ppaux.rs similarity index 100% rename from src/test/ui/compile-fail-migration/substs-ppaux.rs rename to src/test/ui/substs-ppaux.rs diff --git a/src/test/ui/compile-fail-migration/substs-ppaux.verbose.stderr b/src/test/ui/substs-ppaux.verbose.stderr similarity index 98% rename from src/test/ui/compile-fail-migration/substs-ppaux.verbose.stderr rename to src/test/ui/substs-ppaux.verbose.stderr index a417c0d8970..2daa960be3a 100644 --- a/src/test/ui/compile-fail-migration/substs-ppaux.verbose.stderr +++ b/src/test/ui/substs-ppaux.verbose.stderr @@ -41,7 +41,7 @@ LL | >::bar; | ^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `str` - = note: to learn more, visit + = note: to learn more, visit = note: required because of the requirements on the impl of `Foo<'_#0r, '_#1r, u8>` for `str` note: required by `Foo::bar` --> $DIR/substs-ppaux.rs:16:5 diff --git a/src/test/ui/compile-fail-migration/suffixed-literal-meta.rs b/src/test/ui/suffixed-literal-meta.rs similarity index 100% rename from src/test/ui/compile-fail-migration/suffixed-literal-meta.rs rename to src/test/ui/suffixed-literal-meta.rs diff --git a/src/test/ui/compile-fail-migration/suffixed-literal-meta.stderr b/src/test/ui/suffixed-literal-meta.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/suffixed-literal-meta.stderr rename to src/test/ui/suffixed-literal-meta.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/struct_field_privacy.rs b/src/test/ui/suggestions/auxiliary/struct_field_privacy.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/struct_field_privacy.rs rename to src/test/ui/suggestions/auxiliary/struct_field_privacy.rs diff --git a/src/test/ui/suggest-labels.rs b/src/test/ui/suggestions/suggest-labels.rs similarity index 100% rename from src/test/ui/suggest-labels.rs rename to src/test/ui/suggestions/suggest-labels.rs diff --git a/src/test/ui/suggest-labels.stderr b/src/test/ui/suggestions/suggest-labels.stderr similarity index 100% rename from src/test/ui/suggest-labels.stderr rename to src/test/ui/suggestions/suggest-labels.stderr diff --git a/src/test/ui/suggest-methods.rs b/src/test/ui/suggestions/suggest-methods.rs similarity index 100% rename from src/test/ui/suggest-methods.rs rename to src/test/ui/suggestions/suggest-methods.rs diff --git a/src/test/ui/suggest-methods.stderr b/src/test/ui/suggestions/suggest-methods.stderr similarity index 100% rename from src/test/ui/suggest-methods.stderr rename to src/test/ui/suggestions/suggest-methods.stderr diff --git a/src/test/ui/suggest-private-fields.rs b/src/test/ui/suggestions/suggest-private-fields.rs similarity index 100% rename from src/test/ui/suggest-private-fields.rs rename to src/test/ui/suggestions/suggest-private-fields.rs diff --git a/src/test/ui/suggest-private-fields.stderr b/src/test/ui/suggestions/suggest-private-fields.stderr similarity index 100% rename from src/test/ui/suggest-private-fields.stderr rename to src/test/ui/suggestions/suggest-private-fields.stderr diff --git a/src/test/ui/suggest-ref-mut.rs b/src/test/ui/suggestions/suggest-ref-mut.rs similarity index 100% rename from src/test/ui/suggest-ref-mut.rs rename to src/test/ui/suggestions/suggest-ref-mut.rs diff --git a/src/test/ui/suggest-ref-mut.stderr b/src/test/ui/suggestions/suggest-ref-mut.stderr similarity index 100% rename from src/test/ui/suggest-ref-mut.stderr rename to src/test/ui/suggestions/suggest-ref-mut.stderr diff --git a/src/test/ui/suggest-remove-refs-1.rs b/src/test/ui/suggestions/suggest-remove-refs-1.rs similarity index 100% rename from src/test/ui/suggest-remove-refs-1.rs rename to src/test/ui/suggestions/suggest-remove-refs-1.rs diff --git a/src/test/ui/suggest-remove-refs-1.stderr b/src/test/ui/suggestions/suggest-remove-refs-1.stderr similarity index 100% rename from src/test/ui/suggest-remove-refs-1.stderr rename to src/test/ui/suggestions/suggest-remove-refs-1.stderr diff --git a/src/test/ui/suggest-remove-refs-2.rs b/src/test/ui/suggestions/suggest-remove-refs-2.rs similarity index 100% rename from src/test/ui/suggest-remove-refs-2.rs rename to src/test/ui/suggestions/suggest-remove-refs-2.rs diff --git a/src/test/ui/suggest-remove-refs-2.stderr b/src/test/ui/suggestions/suggest-remove-refs-2.stderr similarity index 100% rename from src/test/ui/suggest-remove-refs-2.stderr rename to src/test/ui/suggestions/suggest-remove-refs-2.stderr diff --git a/src/test/ui/suggest-remove-refs-3.rs b/src/test/ui/suggestions/suggest-remove-refs-3.rs similarity index 100% rename from src/test/ui/suggest-remove-refs-3.rs rename to src/test/ui/suggestions/suggest-remove-refs-3.rs diff --git a/src/test/ui/suggest-remove-refs-3.stderr b/src/test/ui/suggestions/suggest-remove-refs-3.stderr similarity index 100% rename from src/test/ui/suggest-remove-refs-3.stderr rename to src/test/ui/suggestions/suggest-remove-refs-3.stderr diff --git a/src/test/ui/compile-fail-migration/super-at-top-level.rs b/src/test/ui/super-at-top-level.rs similarity index 100% rename from src/test/ui/compile-fail-migration/super-at-top-level.rs rename to src/test/ui/super-at-top-level.rs diff --git a/src/test/ui/compile-fail-migration/super-at-top-level.stderr b/src/test/ui/super-at-top-level.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/super-at-top-level.stderr rename to src/test/ui/super-at-top-level.stderr diff --git a/src/test/ui/compile-fail-migration/suppressed-error.rs b/src/test/ui/suppressed-error.rs similarity index 100% rename from src/test/ui/compile-fail-migration/suppressed-error.rs rename to src/test/ui/suppressed-error.rs diff --git a/src/test/ui/compile-fail-migration/suppressed-error.stderr b/src/test/ui/suppressed-error.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/suppressed-error.stderr rename to src/test/ui/suppressed-error.stderr diff --git a/src/test/ui/auxiliary/svh-a-base.rs b/src/test/ui/svh/auxiliary/svh-a-base.rs similarity index 100% rename from src/test/ui/auxiliary/svh-a-base.rs rename to src/test/ui/svh/auxiliary/svh-a-base.rs diff --git a/src/test/ui/auxiliary/svh-a-change-lit.rs b/src/test/ui/svh/auxiliary/svh-a-change-lit.rs similarity index 100% rename from src/test/ui/auxiliary/svh-a-change-lit.rs rename to src/test/ui/svh/auxiliary/svh-a-change-lit.rs diff --git a/src/test/ui/auxiliary/svh-a-change-significant-cfg.rs b/src/test/ui/svh/auxiliary/svh-a-change-significant-cfg.rs similarity index 100% rename from src/test/ui/auxiliary/svh-a-change-significant-cfg.rs rename to src/test/ui/svh/auxiliary/svh-a-change-significant-cfg.rs diff --git a/src/test/ui/auxiliary/svh-a-change-trait-bound.rs b/src/test/ui/svh/auxiliary/svh-a-change-trait-bound.rs similarity index 100% rename from src/test/ui/auxiliary/svh-a-change-trait-bound.rs rename to src/test/ui/svh/auxiliary/svh-a-change-trait-bound.rs diff --git a/src/test/ui/auxiliary/svh-a-change-type-arg.rs b/src/test/ui/svh/auxiliary/svh-a-change-type-arg.rs similarity index 100% rename from src/test/ui/auxiliary/svh-a-change-type-arg.rs rename to src/test/ui/svh/auxiliary/svh-a-change-type-arg.rs diff --git a/src/test/ui/auxiliary/svh-a-change-type-ret.rs b/src/test/ui/svh/auxiliary/svh-a-change-type-ret.rs similarity index 100% rename from src/test/ui/auxiliary/svh-a-change-type-ret.rs rename to src/test/ui/svh/auxiliary/svh-a-change-type-ret.rs diff --git a/src/test/ui/auxiliary/svh-a-change-type-static.rs b/src/test/ui/svh/auxiliary/svh-a-change-type-static.rs similarity index 100% rename from src/test/ui/auxiliary/svh-a-change-type-static.rs rename to src/test/ui/svh/auxiliary/svh-a-change-type-static.rs diff --git a/src/test/ui/auxiliary/svh-b.rs b/src/test/ui/svh/auxiliary/svh-b.rs similarity index 100% rename from src/test/ui/auxiliary/svh-b.rs rename to src/test/ui/svh/auxiliary/svh-b.rs diff --git a/src/test/ui/auxiliary/svh-uta-base.rs b/src/test/ui/svh/auxiliary/svh-uta-base.rs similarity index 100% rename from src/test/ui/auxiliary/svh-uta-base.rs rename to src/test/ui/svh/auxiliary/svh-uta-base.rs diff --git a/src/test/ui/auxiliary/svh-uta-change-use-trait.rs b/src/test/ui/svh/auxiliary/svh-uta-change-use-trait.rs similarity index 100% rename from src/test/ui/auxiliary/svh-uta-change-use-trait.rs rename to src/test/ui/svh/auxiliary/svh-uta-change-use-trait.rs diff --git a/src/test/ui/auxiliary/svh-utb.rs b/src/test/ui/svh/auxiliary/svh-utb.rs similarity index 100% rename from src/test/ui/auxiliary/svh-utb.rs rename to src/test/ui/svh/auxiliary/svh-utb.rs diff --git a/src/test/ui/svh-change-lit.rs b/src/test/ui/svh/svh-change-lit.rs similarity index 100% rename from src/test/ui/svh-change-lit.rs rename to src/test/ui/svh/svh-change-lit.rs diff --git a/src/test/ui/svh-change-lit.stderr b/src/test/ui/svh/svh-change-lit.stderr similarity index 100% rename from src/test/ui/svh-change-lit.stderr rename to src/test/ui/svh/svh-change-lit.stderr diff --git a/src/test/ui/svh-change-significant-cfg.rs b/src/test/ui/svh/svh-change-significant-cfg.rs similarity index 100% rename from src/test/ui/svh-change-significant-cfg.rs rename to src/test/ui/svh/svh-change-significant-cfg.rs diff --git a/src/test/ui/svh-change-significant-cfg.stderr b/src/test/ui/svh/svh-change-significant-cfg.stderr similarity index 100% rename from src/test/ui/svh-change-significant-cfg.stderr rename to src/test/ui/svh/svh-change-significant-cfg.stderr diff --git a/src/test/ui/svh-change-trait-bound.rs b/src/test/ui/svh/svh-change-trait-bound.rs similarity index 100% rename from src/test/ui/svh-change-trait-bound.rs rename to src/test/ui/svh/svh-change-trait-bound.rs diff --git a/src/test/ui/svh-change-trait-bound.stderr b/src/test/ui/svh/svh-change-trait-bound.stderr similarity index 100% rename from src/test/ui/svh-change-trait-bound.stderr rename to src/test/ui/svh/svh-change-trait-bound.stderr diff --git a/src/test/ui/svh-change-type-arg.rs b/src/test/ui/svh/svh-change-type-arg.rs similarity index 100% rename from src/test/ui/svh-change-type-arg.rs rename to src/test/ui/svh/svh-change-type-arg.rs diff --git a/src/test/ui/svh-change-type-arg.stderr b/src/test/ui/svh/svh-change-type-arg.stderr similarity index 100% rename from src/test/ui/svh-change-type-arg.stderr rename to src/test/ui/svh/svh-change-type-arg.stderr diff --git a/src/test/ui/svh-change-type-ret.rs b/src/test/ui/svh/svh-change-type-ret.rs similarity index 100% rename from src/test/ui/svh-change-type-ret.rs rename to src/test/ui/svh/svh-change-type-ret.rs diff --git a/src/test/ui/svh-change-type-ret.stderr b/src/test/ui/svh/svh-change-type-ret.stderr similarity index 100% rename from src/test/ui/svh-change-type-ret.stderr rename to src/test/ui/svh/svh-change-type-ret.stderr diff --git a/src/test/ui/svh-change-type-static.rs b/src/test/ui/svh/svh-change-type-static.rs similarity index 100% rename from src/test/ui/svh-change-type-static.rs rename to src/test/ui/svh/svh-change-type-static.rs diff --git a/src/test/ui/svh-change-type-static.stderr b/src/test/ui/svh/svh-change-type-static.stderr similarity index 100% rename from src/test/ui/svh-change-type-static.stderr rename to src/test/ui/svh/svh-change-type-static.stderr diff --git a/src/test/ui/svh-use-trait.rs b/src/test/ui/svh/svh-use-trait.rs similarity index 100% rename from src/test/ui/svh-use-trait.rs rename to src/test/ui/svh/svh-use-trait.rs diff --git a/src/test/ui/svh-use-trait.stderr b/src/test/ui/svh/svh-use-trait.stderr similarity index 100% rename from src/test/ui/svh-use-trait.stderr rename to src/test/ui/svh/svh-use-trait.stderr diff --git a/src/test/ui/compile-fail-migration/symbol-names/basic.rs b/src/test/ui/symbol-names/basic.rs similarity index 100% rename from src/test/ui/compile-fail-migration/symbol-names/basic.rs rename to src/test/ui/symbol-names/basic.rs diff --git a/src/test/ui/compile-fail-migration/symbol-names/basic.stderr b/src/test/ui/symbol-names/basic.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/symbol-names/basic.stderr rename to src/test/ui/symbol-names/basic.stderr diff --git a/src/test/ui/compile-fail-migration/symbol-names/impl1.rs b/src/test/ui/symbol-names/impl1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/symbol-names/impl1.rs rename to src/test/ui/symbol-names/impl1.rs diff --git a/src/test/ui/compile-fail-migration/symbol-names/impl1.stderr b/src/test/ui/symbol-names/impl1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/symbol-names/impl1.stderr rename to src/test/ui/symbol-names/impl1.stderr diff --git a/src/test/ui/compile-fail-migration/syntax-extension-minor.rs b/src/test/ui/syntax-extension-minor.rs similarity index 100% rename from src/test/ui/compile-fail-migration/syntax-extension-minor.rs rename to src/test/ui/syntax-extension-minor.rs diff --git a/src/test/ui/compile-fail-migration/syntax-extension-minor.stderr b/src/test/ui/syntax-extension-minor.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/syntax-extension-minor.stderr rename to src/test/ui/syntax-extension-minor.stderr diff --git a/src/test/ui/compile-fail-migration/syntax-trait-polarity-feature-gate.rs b/src/test/ui/syntax-trait-polarity-feature-gate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/syntax-trait-polarity-feature-gate.rs rename to src/test/ui/syntax-trait-polarity-feature-gate.rs diff --git a/src/test/ui/compile-fail-migration/syntax-trait-polarity-feature-gate.stderr b/src/test/ui/syntax-trait-polarity-feature-gate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/syntax-trait-polarity-feature-gate.stderr rename to src/test/ui/syntax-trait-polarity-feature-gate.stderr diff --git a/src/test/ui/compile-fail-migration/syntax-trait-polarity.rs b/src/test/ui/syntax-trait-polarity.rs similarity index 100% rename from src/test/ui/compile-fail-migration/syntax-trait-polarity.rs rename to src/test/ui/syntax-trait-polarity.rs diff --git a/src/test/ui/compile-fail-migration/syntax-trait-polarity.stderr b/src/test/ui/syntax-trait-polarity.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/syntax-trait-polarity.stderr rename to src/test/ui/syntax-trait-polarity.stderr diff --git a/src/test/ui/compile-fail-migration/synthetic-param.rs b/src/test/ui/synthetic-param.rs similarity index 100% rename from src/test/ui/compile-fail-migration/synthetic-param.rs rename to src/test/ui/synthetic-param.rs diff --git a/src/test/ui/compile-fail-migration/synthetic-param.stderr b/src/test/ui/synthetic-param.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/synthetic-param.stderr rename to src/test/ui/synthetic-param.stderr diff --git a/src/test/ui/compile-fail-migration/tag-that-dare-not-speak-its-name.rs b/src/test/ui/tag-that-dare-not-speak-its-name.rs similarity index 100% rename from src/test/ui/compile-fail-migration/tag-that-dare-not-speak-its-name.rs rename to src/test/ui/tag-that-dare-not-speak-its-name.rs diff --git a/src/test/ui/compile-fail-migration/tag-that-dare-not-speak-its-name.stderr b/src/test/ui/tag-that-dare-not-speak-its-name.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/tag-that-dare-not-speak-its-name.stderr rename to src/test/ui/tag-that-dare-not-speak-its-name.stderr diff --git a/src/test/ui/compile-fail-migration/tag-type-args.rs b/src/test/ui/tag-type-args.rs similarity index 100% rename from src/test/ui/compile-fail-migration/tag-type-args.rs rename to src/test/ui/tag-type-args.rs diff --git a/src/test/ui/compile-fail-migration/tag-type-args.stderr b/src/test/ui/tag-type-args.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/tag-type-args.stderr rename to src/test/ui/tag-type-args.stderr diff --git a/src/test/ui/compile-fail-migration/tag-variant-cast-non-nullary.rs b/src/test/ui/tag-variant-cast-non-nullary.rs similarity index 100% rename from src/test/ui/compile-fail-migration/tag-variant-cast-non-nullary.rs rename to src/test/ui/tag-variant-cast-non-nullary.rs diff --git a/src/test/ui/compile-fail-migration/tag-variant-cast-non-nullary.stderr b/src/test/ui/tag-variant-cast-non-nullary.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/tag-variant-cast-non-nullary.stderr rename to src/test/ui/tag-variant-cast-non-nullary.stderr diff --git a/src/test/ui/compile-fail-migration/tag-variant-disr-dup.rs b/src/test/ui/tag-variant-disr-dup.rs similarity index 100% rename from src/test/ui/compile-fail-migration/tag-variant-disr-dup.rs rename to src/test/ui/tag-variant-disr-dup.rs diff --git a/src/test/ui/compile-fail-migration/tag-variant-disr-dup.stderr b/src/test/ui/tag-variant-disr-dup.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/tag-variant-disr-dup.stderr rename to src/test/ui/tag-variant-disr-dup.stderr diff --git a/src/test/ui/compile-fail-migration/tail-typeck.rs b/src/test/ui/tail-typeck.rs similarity index 100% rename from src/test/ui/compile-fail-migration/tail-typeck.rs rename to src/test/ui/tail-typeck.rs diff --git a/src/test/ui/compile-fail-migration/tail-typeck.stderr b/src/test/ui/tail-typeck.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/tail-typeck.stderr rename to src/test/ui/tail-typeck.stderr diff --git a/src/test/ui/compile-fail-migration/terr-in-field.rs b/src/test/ui/terr-in-field.rs similarity index 100% rename from src/test/ui/compile-fail-migration/terr-in-field.rs rename to src/test/ui/terr-in-field.rs diff --git a/src/test/ui/compile-fail-migration/terr-in-field.stderr b/src/test/ui/terr-in-field.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/terr-in-field.stderr rename to src/test/ui/terr-in-field.stderr diff --git a/src/test/ui/compile-fail-migration/terr-sorts.rs b/src/test/ui/terr-sorts.rs similarity index 100% rename from src/test/ui/compile-fail-migration/terr-sorts.rs rename to src/test/ui/terr-sorts.rs diff --git a/src/test/ui/compile-fail-migration/terr-sorts.stderr b/src/test/ui/terr-sorts.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/terr-sorts.stderr rename to src/test/ui/terr-sorts.stderr diff --git a/src/test/ui/compile-fail-migration/test-cfg.rs b/src/test/ui/test-cfg.rs similarity index 100% rename from src/test/ui/compile-fail-migration/test-cfg.rs rename to src/test/ui/test-cfg.rs diff --git a/src/test/ui/compile-fail-migration/test-cfg.stderr b/src/test/ui/test-cfg.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/test-cfg.stderr rename to src/test/ui/test-cfg.stderr diff --git a/src/test/ui/compile-fail-migration/test-warns-dead-code.rs b/src/test/ui/test-warns-dead-code.rs similarity index 100% rename from src/test/ui/compile-fail-migration/test-warns-dead-code.rs rename to src/test/ui/test-warns-dead-code.rs diff --git a/src/test/ui/compile-fail-migration/test-warns-dead-code.stderr b/src/test/ui/test-warns-dead-code.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/test-warns-dead-code.stderr rename to src/test/ui/test-warns-dead-code.stderr diff --git a/src/test/ui/compile-fail-migration/thread-local-in-ctfe.nll.stderr b/src/test/ui/thread-local-in-ctfe.nll.stderr similarity index 63% rename from src/test/ui/compile-fail-migration/thread-local-in-ctfe.nll.stderr rename to src/test/ui/thread-local-in-ctfe.nll.stderr index 6784a83cc76..c9c0ac2b2d9 100644 --- a/src/test/ui/compile-fail-migration/thread-local-in-ctfe.nll.stderr +++ b/src/test/ui/thread-local-in-ctfe.nll.stderr @@ -10,15 +10,13 @@ error[E0625]: thread-local statics cannot be accessed at compile-time LL | static C: &u32 = &A; | ^^ -error[E0597]: `A` does not live long enough +error[E0712]: thread-local variable borrowed past end of function --> $DIR/thread-local-in-ctfe.rs:19:18 | LL | static C: &u32 = &A; - | ^^- `A` dropped here while still borrowed + | ^^- end of enclosing function is here | | - | borrowed value does not live long enough - | - = note: borrowed value must be valid for the static lifetime... + | thread-local variables cannot be borrowed beyond the end of the function error[E0625]: thread-local statics cannot be accessed at compile-time --> $DIR/thread-local-in-ctfe.rs:22:16 @@ -32,15 +30,13 @@ error[E0625]: thread-local statics cannot be accessed at compile-time LL | const E: &u32 = &A; | ^^ -error[E0597]: `A` does not live long enough +error[E0712]: thread-local variable borrowed past end of function --> $DIR/thread-local-in-ctfe.rs:25:17 | LL | const E: &u32 = &A; - | ^^- `A` dropped here while still borrowed + | ^^- end of enclosing function is here | | - | borrowed value does not live long enough - | - = note: borrowed value must be valid for the static lifetime... + | thread-local variables cannot be borrowed beyond the end of the function error[E0625]: thread-local statics cannot be accessed at compile-time --> $DIR/thread-local-in-ctfe.rs:29:5 @@ -50,5 +46,5 @@ LL | A error: aborting due to 7 previous errors -Some errors occurred: E0597, E0625. -For more information about an error, try `rustc --explain E0597`. +Some errors occurred: E0625, E0712. +For more information about an error, try `rustc --explain E0625`. diff --git a/src/test/ui/compile-fail-migration/thread-local-in-ctfe.rs b/src/test/ui/thread-local-in-ctfe.rs similarity index 100% rename from src/test/ui/compile-fail-migration/thread-local-in-ctfe.rs rename to src/test/ui/thread-local-in-ctfe.rs diff --git a/src/test/ui/compile-fail-migration/thread-local-in-ctfe.stderr b/src/test/ui/thread-local-in-ctfe.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/thread-local-in-ctfe.stderr rename to src/test/ui/thread-local-in-ctfe.stderr diff --git a/src/test/ui/tool-attributes-disabled-1.rs b/src/test/ui/tool-attributes/tool-attributes-disabled-1.rs similarity index 100% rename from src/test/ui/tool-attributes-disabled-1.rs rename to src/test/ui/tool-attributes/tool-attributes-disabled-1.rs diff --git a/src/test/ui/tool-attributes-disabled-1.stderr b/src/test/ui/tool-attributes/tool-attributes-disabled-1.stderr similarity index 100% rename from src/test/ui/tool-attributes-disabled-1.stderr rename to src/test/ui/tool-attributes/tool-attributes-disabled-1.stderr diff --git a/src/test/ui/tool-attributes-disabled-2.rs b/src/test/ui/tool-attributes/tool-attributes-disabled-2.rs similarity index 100% rename from src/test/ui/tool-attributes-disabled-2.rs rename to src/test/ui/tool-attributes/tool-attributes-disabled-2.rs diff --git a/src/test/ui/tool-attributes-disabled-2.stderr b/src/test/ui/tool-attributes/tool-attributes-disabled-2.stderr similarity index 100% rename from src/test/ui/tool-attributes-disabled-2.stderr rename to src/test/ui/tool-attributes/tool-attributes-disabled-2.stderr diff --git a/src/test/ui/tool-attributes-misplaced-1.rs b/src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs similarity index 100% rename from src/test/ui/tool-attributes-misplaced-1.rs rename to src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs diff --git a/src/test/ui/tool-attributes-misplaced-1.stderr b/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr similarity index 100% rename from src/test/ui/tool-attributes-misplaced-1.stderr rename to src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr diff --git a/src/test/ui/tool-attributes-misplaced-2.rs b/src/test/ui/tool-attributes/tool-attributes-misplaced-2.rs similarity index 100% rename from src/test/ui/tool-attributes-misplaced-2.rs rename to src/test/ui/tool-attributes/tool-attributes-misplaced-2.rs diff --git a/src/test/ui/tool-attributes-misplaced-2.stderr b/src/test/ui/tool-attributes/tool-attributes-misplaced-2.stderr similarity index 100% rename from src/test/ui/tool-attributes-misplaced-2.stderr rename to src/test/ui/tool-attributes/tool-attributes-misplaced-2.stderr diff --git a/src/test/ui/tool-attributes-shadowing.rs b/src/test/ui/tool-attributes/tool-attributes-shadowing.rs similarity index 100% rename from src/test/ui/tool-attributes-shadowing.rs rename to src/test/ui/tool-attributes/tool-attributes-shadowing.rs diff --git a/src/test/ui/tool-attributes-shadowing.stderr b/src/test/ui/tool-attributes/tool-attributes-shadowing.stderr similarity index 100% rename from src/test/ui/tool-attributes-shadowing.stderr rename to src/test/ui/tool-attributes/tool-attributes-shadowing.stderr diff --git a/src/test/ui/compile-fail-migration/tool_lints.rs b/src/test/ui/tool_lints-fail.rs similarity index 100% rename from src/test/ui/compile-fail-migration/tool_lints.rs rename to src/test/ui/tool_lints-fail.rs diff --git a/src/test/ui/compile-fail-migration/tool_lints.stderr b/src/test/ui/tool_lints-fail.stderr similarity index 77% rename from src/test/ui/compile-fail-migration/tool_lints.stderr rename to src/test/ui/tool_lints-fail.stderr index 4ee285e5ea4..735673b5785 100644 --- a/src/test/ui/compile-fail-migration/tool_lints.stderr +++ b/src/test/ui/tool_lints-fail.stderr @@ -1,11 +1,11 @@ error: unknown lint: `clippy` - --> $DIR/tool_lints.rs:16:9 + --> $DIR/tool_lints-fail.rs:16:9 | LL | #![deny(clippy)] //~ ERROR: unknown lint: `clippy` | ^^^^^^ | note: lint level defined here - --> $DIR/tool_lints.rs:14:9 + --> $DIR/tool_lints-fail.rs:14:9 | LL | #![deny(unknown_lints)] | ^^^^^^^^^^^^^ diff --git a/src/test/ui/compile-fail-migration/trace_macros-format.rs b/src/test/ui/trace_macros-format.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trace_macros-format.rs rename to src/test/ui/trace_macros-format.rs diff --git a/src/test/ui/compile-fail-migration/trace_macros-format.stderr b/src/test/ui/trace_macros-format.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trace_macros-format.stderr rename to src/test/ui/trace_macros-format.stderr diff --git a/src/test/ui/compile-fail-migration/trace_macros-gate.rs b/src/test/ui/trace_macros-gate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trace_macros-gate.rs rename to src/test/ui/trace_macros-gate.rs diff --git a/src/test/ui/compile-fail-migration/trace_macros-gate.stderr b/src/test/ui/trace_macros-gate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trace_macros-gate.stderr rename to src/test/ui/trace_macros-gate.stderr diff --git a/src/test/ui/compile-fail-migration/trait-alias.rs b/src/test/ui/trait-alias-fail.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-alias.rs rename to src/test/ui/trait-alias-fail.rs diff --git a/src/test/ui/compile-fail-migration/trait-alias.stderr b/src/test/ui/trait-alias-fail.stderr similarity index 85% rename from src/test/ui/compile-fail-migration/trait-alias.stderr rename to src/test/ui/trait-alias-fail.stderr index 75fd4a9d9af..f7b144c06f8 100644 --- a/src/test/ui/compile-fail-migration/trait-alias.stderr +++ b/src/test/ui/trait-alias-fail.stderr @@ -1,29 +1,29 @@ error: type parameters on the left side of a trait alias cannot be bounded - --> $DIR/trait-alias.rs:15:14 + --> $DIR/trait-alias-fail.rs:15:14 | LL | trait Alias2 = Default; | ^ error: type parameters on the left side of a trait alias cannot have defaults - --> $DIR/trait-alias.rs:15:14 + --> $DIR/trait-alias-fail.rs:15:14 | LL | trait Alias2 = Default; | ^ error[E0573]: expected type, found trait alias `Alias1` - --> $DIR/trait-alias.rs:20:6 + --> $DIR/trait-alias-fail.rs:20:6 | LL | impl Alias1 { //~ERROR expected type, found trait alias | ^^^^^^ not a type error[E0404]: expected trait, found trait alias `Alias1` - --> $DIR/trait-alias.rs:23:6 + --> $DIR/trait-alias-fail.rs:23:6 | LL | impl Alias1 for () { //~ERROR expected trait, found trait alias | ^^^^^^ not a trait error[E0658]: trait aliases are not yet fully implemented (see issue #41517) - --> $DIR/trait-alias.rs:13:1 + --> $DIR/trait-alias-fail.rs:13:1 | LL | trait Alias1 = Default where T: Clone; // ok | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | trait Alias1 = Default where T: Clone; // ok = help: add #![feature(trait_alias)] to the crate attributes to enable error[E0658]: trait aliases are not yet fully implemented (see issue #41517) - --> $DIR/trait-alias.rs:15:1 + --> $DIR/trait-alias-fail.rs:15:1 | LL | trait Alias2 = Default; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/compile-fail-migration/auxiliary/crate_a1.rs b/src/test/ui/traits/auxiliary/crate_a1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/crate_a1.rs rename to src/test/ui/traits/auxiliary/crate_a1.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/trait_bounds_on_structs_and_enums_xc.rs b/src/test/ui/traits/auxiliary/trait_bounds_on_structs_and_enums_xc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/trait_bounds_on_structs_and_enums_xc.rs rename to src/test/ui/traits/auxiliary/trait_bounds_on_structs_and_enums_xc.rs diff --git a/src/test/ui/compile-fail-migration/auxiliary/trait_safety_lib.rs b/src/test/ui/traits/auxiliary/trait_safety_lib.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/trait_safety_lib.rs rename to src/test/ui/traits/auxiliary/trait_safety_lib.rs diff --git a/src/test/ui/trait-alias.rs b/src/test/ui/traits/trait-alias.rs similarity index 100% rename from src/test/ui/trait-alias.rs rename to src/test/ui/traits/trait-alias.rs diff --git a/src/test/ui/trait-alias.stderr b/src/test/ui/traits/trait-alias.stderr similarity index 100% rename from src/test/ui/trait-alias.stderr rename to src/test/ui/traits/trait-alias.stderr diff --git a/src/test/ui/compile-fail-migration/trait-as-struct-constructor.rs b/src/test/ui/traits/trait-as-struct-constructor.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-as-struct-constructor.rs rename to src/test/ui/traits/trait-as-struct-constructor.rs diff --git a/src/test/ui/compile-fail-migration/trait-as-struct-constructor.stderr b/src/test/ui/traits/trait-as-struct-constructor.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-as-struct-constructor.stderr rename to src/test/ui/traits/trait-as-struct-constructor.stderr diff --git a/src/test/ui/compile-fail-migration/trait-bounds-not-on-bare-trait.rs b/src/test/ui/traits/trait-bounds-not-on-bare-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-not-on-bare-trait.rs rename to src/test/ui/traits/trait-bounds-not-on-bare-trait.rs diff --git a/src/test/ui/compile-fail-migration/trait-bounds-not-on-bare-trait.stderr b/src/test/ui/traits/trait-bounds-not-on-bare-trait.stderr similarity index 96% rename from src/test/ui/compile-fail-migration/trait-bounds-not-on-bare-trait.stderr rename to src/test/ui/traits/trait-bounds-not-on-bare-trait.stderr index 31a36fdc132..b0c1c284f5a 100644 --- a/src/test/ui/compile-fail-migration/trait-bounds-not-on-bare-trait.stderr +++ b/src/test/ui/traits/trait-bounds-not-on-bare-trait.stderr @@ -5,7 +5,7 @@ LL | fn foo(_x: Foo + Send) { | ^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `(dyn Foo + std::marker::Send + 'static)` - = note: to learn more, visit + = note: to learn more, visit = note: all local variables must have a statically known size error: aborting due to previous error diff --git a/src/test/ui/compile-fail-migration/trait-bounds-not-on-struct.rs b/src/test/ui/traits/trait-bounds-not-on-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-not-on-struct.rs rename to src/test/ui/traits/trait-bounds-not-on-struct.rs diff --git a/src/test/ui/compile-fail-migration/trait-bounds-not-on-struct.stderr b/src/test/ui/traits/trait-bounds-not-on-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-not-on-struct.stderr rename to src/test/ui/traits/trait-bounds-not-on-struct.stderr diff --git a/src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-in-fns.rs b/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-fns.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-in-fns.rs rename to src/test/ui/traits/trait-bounds-on-structs-and-enums-in-fns.rs diff --git a/src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-in-fns.stderr b/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-fns.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-in-fns.stderr rename to src/test/ui/traits/trait-bounds-on-structs-and-enums-in-fns.stderr diff --git a/src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-in-impls.rs b/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-impls.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-in-impls.rs rename to src/test/ui/traits/trait-bounds-on-structs-and-enums-in-impls.rs diff --git a/src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-in-impls.stderr b/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-impls.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-in-impls.stderr rename to src/test/ui/traits/trait-bounds-on-structs-and-enums-in-impls.stderr diff --git a/src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-locals.rs b/src/test/ui/traits/trait-bounds-on-structs-and-enums-locals.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-locals.rs rename to src/test/ui/traits/trait-bounds-on-structs-and-enums-locals.rs diff --git a/src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-locals.stderr b/src/test/ui/traits/trait-bounds-on-structs-and-enums-locals.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-locals.stderr rename to src/test/ui/traits/trait-bounds-on-structs-and-enums-locals.stderr diff --git a/src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-static.rs b/src/test/ui/traits/trait-bounds-on-structs-and-enums-static.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-static.rs rename to src/test/ui/traits/trait-bounds-on-structs-and-enums-static.rs diff --git a/src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-static.stderr b/src/test/ui/traits/trait-bounds-on-structs-and-enums-static.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-static.stderr rename to src/test/ui/traits/trait-bounds-on-structs-and-enums-static.stderr diff --git a/src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-xc.rs b/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-xc.rs rename to src/test/ui/traits/trait-bounds-on-structs-and-enums-xc.rs diff --git a/src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-xc.stderr b/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-xc.stderr rename to src/test/ui/traits/trait-bounds-on-structs-and-enums-xc.stderr diff --git a/src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-xc1.rs b/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-xc1.rs rename to src/test/ui/traits/trait-bounds-on-structs-and-enums-xc1.rs diff --git a/src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-xc1.stderr b/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums-xc1.stderr rename to src/test/ui/traits/trait-bounds-on-structs-and-enums-xc1.stderr diff --git a/src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums.rs b/src/test/ui/traits/trait-bounds-on-structs-and-enums.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums.rs rename to src/test/ui/traits/trait-bounds-on-structs-and-enums.rs diff --git a/src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums.stderr b/src/test/ui/traits/trait-bounds-on-structs-and-enums.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-on-structs-and-enums.stderr rename to src/test/ui/traits/trait-bounds-on-structs-and-enums.stderr diff --git a/src/test/ui/compile-fail-migration/trait-bounds-sugar.rs b/src/test/ui/traits/trait-bounds-sugar.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-sugar.rs rename to src/test/ui/traits/trait-bounds-sugar.rs diff --git a/src/test/ui/compile-fail-migration/trait-bounds-sugar.stderr b/src/test/ui/traits/trait-bounds-sugar.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-bounds-sugar.stderr rename to src/test/ui/traits/trait-bounds-sugar.stderr diff --git a/src/test/ui/compile-fail-migration/trait-coercion-generic-bad.rs b/src/test/ui/traits/trait-coercion-generic-bad.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-coercion-generic-bad.rs rename to src/test/ui/traits/trait-coercion-generic-bad.rs diff --git a/src/test/ui/compile-fail-migration/trait-coercion-generic-bad.stderr b/src/test/ui/traits/trait-coercion-generic-bad.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-coercion-generic-bad.stderr rename to src/test/ui/traits/trait-coercion-generic-bad.stderr diff --git a/src/test/ui/compile-fail-migration/trait-coercion-generic-regions.nll.stderr b/src/test/ui/traits/trait-coercion-generic-regions.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-coercion-generic-regions.nll.stderr rename to src/test/ui/traits/trait-coercion-generic-regions.nll.stderr diff --git a/src/test/ui/compile-fail-migration/trait-coercion-generic-regions.rs b/src/test/ui/traits/trait-coercion-generic-regions.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-coercion-generic-regions.rs rename to src/test/ui/traits/trait-coercion-generic-regions.rs diff --git a/src/test/ui/compile-fail-migration/trait-coercion-generic-regions.stderr b/src/test/ui/traits/trait-coercion-generic-regions.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-coercion-generic-regions.stderr rename to src/test/ui/traits/trait-coercion-generic-regions.stderr diff --git a/src/test/ui/trait-duplicate-methods.rs b/src/test/ui/traits/trait-duplicate-methods.rs similarity index 100% rename from src/test/ui/trait-duplicate-methods.rs rename to src/test/ui/traits/trait-duplicate-methods.rs diff --git a/src/test/ui/trait-duplicate-methods.stderr b/src/test/ui/traits/trait-duplicate-methods.stderr similarity index 100% rename from src/test/ui/trait-duplicate-methods.stderr rename to src/test/ui/traits/trait-duplicate-methods.stderr diff --git a/src/test/ui/compile-fail-migration/trait-impl-1.rs b/src/test/ui/traits/trait-impl-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-impl-1.rs rename to src/test/ui/traits/trait-impl-1.rs diff --git a/src/test/ui/compile-fail-migration/trait-impl-1.stderr b/src/test/ui/traits/trait-impl-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-impl-1.stderr rename to src/test/ui/traits/trait-impl-1.stderr diff --git a/src/test/ui/compile-fail-migration/trait-impl-can-not-have-untraitful-items.rs b/src/test/ui/traits/trait-impl-can-not-have-untraitful-items.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-impl-can-not-have-untraitful-items.rs rename to src/test/ui/traits/trait-impl-can-not-have-untraitful-items.rs diff --git a/src/test/ui/compile-fail-migration/trait-impl-can-not-have-untraitful-items.stderr b/src/test/ui/traits/trait-impl-can-not-have-untraitful-items.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-impl-can-not-have-untraitful-items.stderr rename to src/test/ui/traits/trait-impl-can-not-have-untraitful-items.stderr diff --git a/src/test/ui/compile-fail-migration/trait-impl-different-num-params.rs b/src/test/ui/traits/trait-impl-different-num-params.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-impl-different-num-params.rs rename to src/test/ui/traits/trait-impl-different-num-params.rs diff --git a/src/test/ui/compile-fail-migration/trait-impl-different-num-params.stderr b/src/test/ui/traits/trait-impl-different-num-params.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-impl-different-num-params.stderr rename to src/test/ui/traits/trait-impl-different-num-params.stderr diff --git a/src/test/ui/compile-fail-migration/trait-impl-for-module.rs b/src/test/ui/traits/trait-impl-for-module.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-impl-for-module.rs rename to src/test/ui/traits/trait-impl-for-module.rs diff --git a/src/test/ui/compile-fail-migration/trait-impl-for-module.stderr b/src/test/ui/traits/trait-impl-for-module.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-impl-for-module.stderr rename to src/test/ui/traits/trait-impl-for-module.stderr diff --git a/src/test/ui/compile-fail-migration/trait-impl-method-mismatch.rs b/src/test/ui/traits/trait-impl-method-mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-impl-method-mismatch.rs rename to src/test/ui/traits/trait-impl-method-mismatch.rs diff --git a/src/test/ui/compile-fail-migration/trait-impl-method-mismatch.stderr b/src/test/ui/traits/trait-impl-method-mismatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-impl-method-mismatch.stderr rename to src/test/ui/traits/trait-impl-method-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs b/src/test/ui/traits/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs rename to src/test/ui/traits/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs diff --git a/src/test/ui/compile-fail-migration/trait-impl-of-supertrait-has-wrong-lifetime-parameters.stderr b/src/test/ui/traits/trait-impl-of-supertrait-has-wrong-lifetime-parameters.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-impl-of-supertrait-has-wrong-lifetime-parameters.stderr rename to src/test/ui/traits/trait-impl-of-supertrait-has-wrong-lifetime-parameters.stderr diff --git a/src/test/ui/compile-fail-migration/trait-item-privacy.rs b/src/test/ui/traits/trait-item-privacy.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-item-privacy.rs rename to src/test/ui/traits/trait-item-privacy.rs diff --git a/src/test/ui/compile-fail-migration/trait-item-privacy.stderr b/src/test/ui/traits/trait-item-privacy.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-item-privacy.stderr rename to src/test/ui/traits/trait-item-privacy.stderr diff --git a/src/test/ui/compile-fail-migration/trait-matching-lifetimes.rs b/src/test/ui/traits/trait-matching-lifetimes.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-matching-lifetimes.rs rename to src/test/ui/traits/trait-matching-lifetimes.rs diff --git a/src/test/ui/compile-fail-migration/trait-matching-lifetimes.stderr b/src/test/ui/traits/trait-matching-lifetimes.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-matching-lifetimes.stderr rename to src/test/ui/traits/trait-matching-lifetimes.stderr diff --git a/src/test/ui/trait-method-private.rs b/src/test/ui/traits/trait-method-private.rs similarity index 100% rename from src/test/ui/trait-method-private.rs rename to src/test/ui/traits/trait-method-private.rs diff --git a/src/test/ui/trait-method-private.stderr b/src/test/ui/traits/trait-method-private.stderr similarity index 100% rename from src/test/ui/trait-method-private.stderr rename to src/test/ui/traits/trait-method-private.stderr diff --git a/src/test/ui/trait-object-auto-dedup-in-impl.rs b/src/test/ui/traits/trait-object-auto-dedup-in-impl.rs similarity index 100% rename from src/test/ui/trait-object-auto-dedup-in-impl.rs rename to src/test/ui/traits/trait-object-auto-dedup-in-impl.rs diff --git a/src/test/ui/trait-object-auto-dedup-in-impl.stderr b/src/test/ui/traits/trait-object-auto-dedup-in-impl.stderr similarity index 100% rename from src/test/ui/trait-object-auto-dedup-in-impl.stderr rename to src/test/ui/traits/trait-object-auto-dedup-in-impl.stderr diff --git a/src/test/ui/compile-fail-migration/trait-object-macro-matcher.rs b/src/test/ui/traits/trait-object-macro-matcher.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-object-macro-matcher.rs rename to src/test/ui/traits/trait-object-macro-matcher.rs diff --git a/src/test/ui/compile-fail-migration/trait-object-macro-matcher.stderr b/src/test/ui/traits/trait-object-macro-matcher.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-object-macro-matcher.stderr rename to src/test/ui/traits/trait-object-macro-matcher.stderr diff --git a/src/test/ui/compile-fail-migration/trait-object-safety.rs b/src/test/ui/traits/trait-object-safety.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-object-safety.rs rename to src/test/ui/traits/trait-object-safety.rs diff --git a/src/test/ui/compile-fail-migration/trait-object-safety.stderr b/src/test/ui/traits/trait-object-safety.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-object-safety.stderr rename to src/test/ui/traits/trait-object-safety.stderr diff --git a/src/test/ui/compile-fail-migration/trait-object-vs-lifetime-2.rs b/src/test/ui/traits/trait-object-vs-lifetime-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-object-vs-lifetime-2.rs rename to src/test/ui/traits/trait-object-vs-lifetime-2.rs diff --git a/src/test/ui/compile-fail-migration/trait-object-vs-lifetime-2.stderr b/src/test/ui/traits/trait-object-vs-lifetime-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-object-vs-lifetime-2.stderr rename to src/test/ui/traits/trait-object-vs-lifetime-2.stderr diff --git a/src/test/ui/compile-fail-migration/trait-object-vs-lifetime.rs b/src/test/ui/traits/trait-object-vs-lifetime.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-object-vs-lifetime.rs rename to src/test/ui/traits/trait-object-vs-lifetime.rs diff --git a/src/test/ui/compile-fail-migration/trait-object-vs-lifetime.stderr b/src/test/ui/traits/trait-object-vs-lifetime.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-object-vs-lifetime.stderr rename to src/test/ui/traits/trait-object-vs-lifetime.stderr diff --git a/src/test/ui/compile-fail-migration/trait-or-new-type-instead.rs b/src/test/ui/traits/trait-or-new-type-instead.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-or-new-type-instead.rs rename to src/test/ui/traits/trait-or-new-type-instead.rs diff --git a/src/test/ui/compile-fail-migration/trait-or-new-type-instead.stderr b/src/test/ui/traits/trait-or-new-type-instead.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-or-new-type-instead.stderr rename to src/test/ui/traits/trait-or-new-type-instead.stderr diff --git a/src/test/ui/compile-fail-migration/trait-privacy.rs b/src/test/ui/traits/trait-privacy.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-privacy.rs rename to src/test/ui/traits/trait-privacy.rs diff --git a/src/test/ui/compile-fail-migration/trait-privacy.stderr b/src/test/ui/traits/trait-privacy.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-privacy.stderr rename to src/test/ui/traits/trait-privacy.stderr diff --git a/src/test/ui/compile-fail-migration/trait-resolution-in-overloaded-op.rs b/src/test/ui/traits/trait-resolution-in-overloaded-op.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-resolution-in-overloaded-op.rs rename to src/test/ui/traits/trait-resolution-in-overloaded-op.rs diff --git a/src/test/ui/compile-fail-migration/trait-resolution-in-overloaded-op.stderr b/src/test/ui/traits/trait-resolution-in-overloaded-op.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-resolution-in-overloaded-op.stderr rename to src/test/ui/traits/trait-resolution-in-overloaded-op.stderr diff --git a/src/test/ui/trait-safety-fn-body.rs b/src/test/ui/traits/trait-safety-fn-body.rs similarity index 100% rename from src/test/ui/trait-safety-fn-body.rs rename to src/test/ui/traits/trait-safety-fn-body.rs diff --git a/src/test/ui/trait-safety-fn-body.stderr b/src/test/ui/traits/trait-safety-fn-body.stderr similarity index 100% rename from src/test/ui/trait-safety-fn-body.stderr rename to src/test/ui/traits/trait-safety-fn-body.stderr diff --git a/src/test/ui/compile-fail-migration/trait-safety-inherent-impl.rs b/src/test/ui/traits/trait-safety-inherent-impl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-safety-inherent-impl.rs rename to src/test/ui/traits/trait-safety-inherent-impl.rs diff --git a/src/test/ui/compile-fail-migration/trait-safety-inherent-impl.stderr b/src/test/ui/traits/trait-safety-inherent-impl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-safety-inherent-impl.stderr rename to src/test/ui/traits/trait-safety-inherent-impl.stderr diff --git a/src/test/ui/compile-fail-migration/trait-safety-trait-impl-cc.rs b/src/test/ui/traits/trait-safety-trait-impl-cc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-safety-trait-impl-cc.rs rename to src/test/ui/traits/trait-safety-trait-impl-cc.rs diff --git a/src/test/ui/compile-fail-migration/trait-safety-trait-impl-cc.stderr b/src/test/ui/traits/trait-safety-trait-impl-cc.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-safety-trait-impl-cc.stderr rename to src/test/ui/traits/trait-safety-trait-impl-cc.stderr diff --git a/src/test/ui/compile-fail-migration/trait-safety-trait-impl.rs b/src/test/ui/traits/trait-safety-trait-impl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-safety-trait-impl.rs rename to src/test/ui/traits/trait-safety-trait-impl.rs diff --git a/src/test/ui/compile-fail-migration/trait-safety-trait-impl.stderr b/src/test/ui/traits/trait-safety-trait-impl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-safety-trait-impl.stderr rename to src/test/ui/traits/trait-safety-trait-impl.stderr diff --git a/src/test/ui/compile-fail-migration/trait-static-method-generic-inference.rs b/src/test/ui/traits/trait-static-method-generic-inference.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-static-method-generic-inference.rs rename to src/test/ui/traits/trait-static-method-generic-inference.rs diff --git a/src/test/ui/compile-fail-migration/trait-static-method-generic-inference.stderr b/src/test/ui/traits/trait-static-method-generic-inference.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-static-method-generic-inference.stderr rename to src/test/ui/traits/trait-static-method-generic-inference.stderr diff --git a/src/test/ui/trait-suggest-where-clause.rs b/src/test/ui/traits/trait-suggest-where-clause.rs similarity index 100% rename from src/test/ui/trait-suggest-where-clause.rs rename to src/test/ui/traits/trait-suggest-where-clause.rs diff --git a/src/test/ui/trait-suggest-where-clause.stderr b/src/test/ui/traits/trait-suggest-where-clause.stderr similarity index 100% rename from src/test/ui/trait-suggest-where-clause.stderr rename to src/test/ui/traits/trait-suggest-where-clause.stderr diff --git a/src/test/ui/compile-fail-migration/trait-test-2.rs b/src/test/ui/traits/trait-test-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-test-2.rs rename to src/test/ui/traits/trait-test-2.rs diff --git a/src/test/ui/compile-fail-migration/trait-test-2.stderr b/src/test/ui/traits/trait-test-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-test-2.stderr rename to src/test/ui/traits/trait-test-2.stderr diff --git a/src/test/ui/compile-fail-migration/trait-test.rs b/src/test/ui/traits/trait-test.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trait-test.rs rename to src/test/ui/traits/trait-test.rs diff --git a/src/test/ui/compile-fail-migration/trait-test.stderr b/src/test/ui/traits/trait-test.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trait-test.stderr rename to src/test/ui/traits/trait-test.stderr diff --git a/src/test/ui/compile-fail-migration/traits-assoc-type-in-supertrait-bad.rs b/src/test/ui/traits/traits-assoc-type-in-supertrait-bad.rs similarity index 100% rename from src/test/ui/compile-fail-migration/traits-assoc-type-in-supertrait-bad.rs rename to src/test/ui/traits/traits-assoc-type-in-supertrait-bad.rs diff --git a/src/test/ui/compile-fail-migration/traits-assoc-type-in-supertrait-bad.stderr b/src/test/ui/traits/traits-assoc-type-in-supertrait-bad.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/traits-assoc-type-in-supertrait-bad.stderr rename to src/test/ui/traits/traits-assoc-type-in-supertrait-bad.stderr diff --git a/src/test/ui/compile-fail-migration/traits-inductive-overflow-simultaneous.rs b/src/test/ui/traits/traits-inductive-overflow-simultaneous.rs similarity index 100% rename from src/test/ui/compile-fail-migration/traits-inductive-overflow-simultaneous.rs rename to src/test/ui/traits/traits-inductive-overflow-simultaneous.rs diff --git a/src/test/ui/compile-fail-migration/traits-inductive-overflow-simultaneous.stderr b/src/test/ui/traits/traits-inductive-overflow-simultaneous.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/traits-inductive-overflow-simultaneous.stderr rename to src/test/ui/traits/traits-inductive-overflow-simultaneous.stderr diff --git a/src/test/ui/compile-fail-migration/traits-inductive-overflow-supertrait-oibit.rs b/src/test/ui/traits/traits-inductive-overflow-supertrait-oibit.rs similarity index 100% rename from src/test/ui/compile-fail-migration/traits-inductive-overflow-supertrait-oibit.rs rename to src/test/ui/traits/traits-inductive-overflow-supertrait-oibit.rs diff --git a/src/test/ui/compile-fail-migration/traits-inductive-overflow-supertrait-oibit.stderr b/src/test/ui/traits/traits-inductive-overflow-supertrait-oibit.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/traits-inductive-overflow-supertrait-oibit.stderr rename to src/test/ui/traits/traits-inductive-overflow-supertrait-oibit.stderr diff --git a/src/test/ui/compile-fail-migration/traits-inductive-overflow-supertrait.rs b/src/test/ui/traits/traits-inductive-overflow-supertrait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/traits-inductive-overflow-supertrait.rs rename to src/test/ui/traits/traits-inductive-overflow-supertrait.rs diff --git a/src/test/ui/compile-fail-migration/traits-inductive-overflow-supertrait.stderr b/src/test/ui/traits/traits-inductive-overflow-supertrait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/traits-inductive-overflow-supertrait.stderr rename to src/test/ui/traits/traits-inductive-overflow-supertrait.stderr diff --git a/src/test/ui/compile-fail-migration/traits-inductive-overflow-two-traits.rs b/src/test/ui/traits/traits-inductive-overflow-two-traits.rs similarity index 100% rename from src/test/ui/compile-fail-migration/traits-inductive-overflow-two-traits.rs rename to src/test/ui/traits/traits-inductive-overflow-two-traits.rs diff --git a/src/test/ui/compile-fail-migration/traits-inductive-overflow-two-traits.stderr b/src/test/ui/traits/traits-inductive-overflow-two-traits.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/traits-inductive-overflow-two-traits.stderr rename to src/test/ui/traits/traits-inductive-overflow-two-traits.stderr diff --git a/src/test/ui/compile-fail-migration/traits-issue-23003-overflow.rs b/src/test/ui/traits/traits-issue-23003-overflow.rs similarity index 100% rename from src/test/ui/compile-fail-migration/traits-issue-23003-overflow.rs rename to src/test/ui/traits/traits-issue-23003-overflow.rs diff --git a/src/test/ui/compile-fail-migration/traits-issue-23003-overflow.stderr b/src/test/ui/traits/traits-issue-23003-overflow.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/traits-issue-23003-overflow.stderr rename to src/test/ui/traits/traits-issue-23003-overflow.stderr diff --git a/src/test/ui/compile-fail-migration/traits-multidispatch-bad.rs b/src/test/ui/traits/traits-multidispatch-bad.rs similarity index 100% rename from src/test/ui/compile-fail-migration/traits-multidispatch-bad.rs rename to src/test/ui/traits/traits-multidispatch-bad.rs diff --git a/src/test/ui/compile-fail-migration/traits-multidispatch-bad.stderr b/src/test/ui/traits/traits-multidispatch-bad.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/traits-multidispatch-bad.stderr rename to src/test/ui/traits/traits-multidispatch-bad.stderr diff --git a/src/test/ui/traits-multidispatch-convert-ambig-dest.rs b/src/test/ui/traits/traits-multidispatch-convert-ambig-dest.rs similarity index 100% rename from src/test/ui/traits-multidispatch-convert-ambig-dest.rs rename to src/test/ui/traits/traits-multidispatch-convert-ambig-dest.rs diff --git a/src/test/ui/traits-multidispatch-convert-ambig-dest.stderr b/src/test/ui/traits/traits-multidispatch-convert-ambig-dest.stderr similarity index 100% rename from src/test/ui/traits-multidispatch-convert-ambig-dest.stderr rename to src/test/ui/traits/traits-multidispatch-convert-ambig-dest.stderr diff --git a/src/test/ui/compile-fail-migration/traits-negative-impls.rs b/src/test/ui/traits/traits-negative-impls.rs similarity index 100% rename from src/test/ui/compile-fail-migration/traits-negative-impls.rs rename to src/test/ui/traits/traits-negative-impls.rs diff --git a/src/test/ui/compile-fail-migration/traits-negative-impls.stderr b/src/test/ui/traits/traits-negative-impls.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/traits-negative-impls.stderr rename to src/test/ui/traits/traits-negative-impls.stderr diff --git a/src/test/ui/compile-fail-migration/traits-repeated-supertrait-ambig.rs b/src/test/ui/traits/traits-repeated-supertrait-ambig.rs similarity index 100% rename from src/test/ui/compile-fail-migration/traits-repeated-supertrait-ambig.rs rename to src/test/ui/traits/traits-repeated-supertrait-ambig.rs diff --git a/src/test/ui/compile-fail-migration/traits-repeated-supertrait-ambig.stderr b/src/test/ui/traits/traits-repeated-supertrait-ambig.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/traits-repeated-supertrait-ambig.stderr rename to src/test/ui/traits/traits-repeated-supertrait-ambig.stderr diff --git a/src/test/ui/compile-fail-migration/transmute-different-sizes.rs b/src/test/ui/transmute/transmute-different-sizes.rs similarity index 100% rename from src/test/ui/compile-fail-migration/transmute-different-sizes.rs rename to src/test/ui/transmute/transmute-different-sizes.rs diff --git a/src/test/ui/compile-fail-migration/transmute-different-sizes.stderr b/src/test/ui/transmute/transmute-different-sizes.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/transmute-different-sizes.stderr rename to src/test/ui/transmute/transmute-different-sizes.stderr diff --git a/src/test/ui/compile-fail-migration/transmute-fat-pointers.rs b/src/test/ui/transmute/transmute-fat-pointers.rs similarity index 100% rename from src/test/ui/compile-fail-migration/transmute-fat-pointers.rs rename to src/test/ui/transmute/transmute-fat-pointers.rs diff --git a/src/test/ui/compile-fail-migration/transmute-fat-pointers.stderr b/src/test/ui/transmute/transmute-fat-pointers.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/transmute-fat-pointers.stderr rename to src/test/ui/transmute/transmute-fat-pointers.stderr diff --git a/src/test/ui/compile-fail-migration/transmute-impl.rs b/src/test/ui/transmute/transmute-impl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/transmute-impl.rs rename to src/test/ui/transmute/transmute-impl.rs diff --git a/src/test/ui/compile-fail-migration/transmute-impl.stderr b/src/test/ui/transmute/transmute-impl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/transmute-impl.stderr rename to src/test/ui/transmute/transmute-impl.stderr diff --git a/src/test/ui/compile-fail-migration/transmute-imut-to-mut.rs b/src/test/ui/transmute/transmute-imut-to-mut.rs similarity index 100% rename from src/test/ui/compile-fail-migration/transmute-imut-to-mut.rs rename to src/test/ui/transmute/transmute-imut-to-mut.rs diff --git a/src/test/ui/compile-fail-migration/transmute-imut-to-mut.stderr b/src/test/ui/transmute/transmute-imut-to-mut.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/transmute-imut-to-mut.stderr rename to src/test/ui/transmute/transmute-imut-to-mut.stderr diff --git a/src/test/ui/trivial-bounds-inconsistent-associated-functions.rs b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-associated-functions.rs similarity index 100% rename from src/test/ui/trivial-bounds-inconsistent-associated-functions.rs rename to src/test/ui/trivial-bounds/trivial-bounds-inconsistent-associated-functions.rs diff --git a/src/test/ui/trivial-bounds-inconsistent-copy-reborrow.nll.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.nll.stderr similarity index 100% rename from src/test/ui/trivial-bounds-inconsistent-copy-reborrow.nll.stderr rename to src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.nll.stderr diff --git a/src/test/ui/trivial-bounds-inconsistent-copy-reborrow.rs b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.rs similarity index 100% rename from src/test/ui/trivial-bounds-inconsistent-copy-reborrow.rs rename to src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.rs diff --git a/src/test/ui/trivial-bounds-inconsistent-copy-reborrow.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.stderr similarity index 100% rename from src/test/ui/trivial-bounds-inconsistent-copy-reborrow.stderr rename to src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy-reborrow.stderr diff --git a/src/test/ui/trivial-bounds-inconsistent-copy.rs b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.rs similarity index 100% rename from src/test/ui/trivial-bounds-inconsistent-copy.rs rename to src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.rs diff --git a/src/test/ui/trivial-bounds-inconsistent-copy.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.stderr similarity index 100% rename from src/test/ui/trivial-bounds-inconsistent-copy.stderr rename to src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.stderr diff --git a/src/test/ui/trivial-bounds-inconsistent-projection-error.rs b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.rs similarity index 100% rename from src/test/ui/trivial-bounds-inconsistent-projection-error.rs rename to src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.rs diff --git a/src/test/ui/trivial-bounds-inconsistent-projection-error.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.stderr similarity index 100% rename from src/test/ui/trivial-bounds-inconsistent-projection-error.stderr rename to src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection-error.stderr diff --git a/src/test/ui/trivial-bounds-inconsistent-projection.rs b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.rs similarity index 100% rename from src/test/ui/trivial-bounds-inconsistent-projection.rs rename to src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.rs diff --git a/src/test/ui/trivial-bounds-inconsistent-projection.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.stderr similarity index 100% rename from src/test/ui/trivial-bounds-inconsistent-projection.stderr rename to src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.stderr diff --git a/src/test/ui/trivial-bounds-inconsistent-sized.rs b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.rs similarity index 100% rename from src/test/ui/trivial-bounds-inconsistent-sized.rs rename to src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.rs diff --git a/src/test/ui/trivial-bounds-inconsistent-sized.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.stderr similarity index 100% rename from src/test/ui/trivial-bounds-inconsistent-sized.stderr rename to src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.stderr diff --git a/src/test/ui/trivial-bounds-inconsistent-well-formed.rs b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.rs similarity index 100% rename from src/test/ui/trivial-bounds-inconsistent-well-formed.rs rename to src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.rs diff --git a/src/test/ui/trivial-bounds-inconsistent-well-formed.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.stderr similarity index 100% rename from src/test/ui/trivial-bounds-inconsistent-well-formed.stderr rename to src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.stderr diff --git a/src/test/ui/trivial-bounds-inconsistent.rs b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.rs similarity index 100% rename from src/test/ui/trivial-bounds-inconsistent.rs rename to src/test/ui/trivial-bounds/trivial-bounds-inconsistent.rs diff --git a/src/test/ui/trivial-bounds-inconsistent.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.stderr similarity index 100% rename from src/test/ui/trivial-bounds-inconsistent.stderr rename to src/test/ui/trivial-bounds/trivial-bounds-inconsistent.stderr diff --git a/src/test/ui/trivial-bounds-leak-copy.rs b/src/test/ui/trivial-bounds/trivial-bounds-leak-copy.rs similarity index 100% rename from src/test/ui/trivial-bounds-leak-copy.rs rename to src/test/ui/trivial-bounds/trivial-bounds-leak-copy.rs diff --git a/src/test/ui/trivial-bounds-leak-copy.stderr b/src/test/ui/trivial-bounds/trivial-bounds-leak-copy.stderr similarity index 100% rename from src/test/ui/trivial-bounds-leak-copy.stderr rename to src/test/ui/trivial-bounds/trivial-bounds-leak-copy.stderr diff --git a/src/test/ui/trivial-bounds-leak.rs b/src/test/ui/trivial-bounds/trivial-bounds-leak.rs similarity index 100% rename from src/test/ui/trivial-bounds-leak.rs rename to src/test/ui/trivial-bounds/trivial-bounds-leak.rs diff --git a/src/test/ui/trivial-bounds-leak.stderr b/src/test/ui/trivial-bounds/trivial-bounds-leak.stderr similarity index 100% rename from src/test/ui/trivial-bounds-leak.stderr rename to src/test/ui/trivial-bounds/trivial-bounds-leak.stderr diff --git a/src/test/ui/trivial-bounds-lint.rs b/src/test/ui/trivial-bounds/trivial-bounds-lint.rs similarity index 100% rename from src/test/ui/trivial-bounds-lint.rs rename to src/test/ui/trivial-bounds/trivial-bounds-lint.rs diff --git a/src/test/ui/trivial-bounds-lint.stderr b/src/test/ui/trivial-bounds/trivial-bounds-lint.stderr similarity index 100% rename from src/test/ui/trivial-bounds-lint.stderr rename to src/test/ui/trivial-bounds/trivial-bounds-lint.stderr diff --git a/src/test/ui/trivial-bounds-object.rs b/src/test/ui/trivial-bounds/trivial-bounds-object.rs similarity index 100% rename from src/test/ui/trivial-bounds-object.rs rename to src/test/ui/trivial-bounds/trivial-bounds-object.rs diff --git a/src/test/ui/compile-fail-migration/trivial_casts.rs b/src/test/ui/trivial_casts.rs similarity index 100% rename from src/test/ui/compile-fail-migration/trivial_casts.rs rename to src/test/ui/trivial_casts.rs diff --git a/src/test/ui/compile-fail-migration/trivial_casts.stderr b/src/test/ui/trivial_casts.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/trivial_casts.stderr rename to src/test/ui/trivial_casts.stderr diff --git a/src/test/ui/compile-fail-migration/tuple-arity-mismatch.rs b/src/test/ui/tuple/tuple-arity-mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/tuple-arity-mismatch.rs rename to src/test/ui/tuple/tuple-arity-mismatch.rs diff --git a/src/test/ui/compile-fail-migration/tuple-arity-mismatch.stderr b/src/test/ui/tuple/tuple-arity-mismatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/tuple-arity-mismatch.stderr rename to src/test/ui/tuple/tuple-arity-mismatch.stderr diff --git a/src/test/ui/tuple-float-index.fixed b/src/test/ui/tuple/tuple-float-index.fixed similarity index 100% rename from src/test/ui/tuple-float-index.fixed rename to src/test/ui/tuple/tuple-float-index.fixed diff --git a/src/test/ui/tuple-float-index.rs b/src/test/ui/tuple/tuple-float-index.rs similarity index 100% rename from src/test/ui/tuple-float-index.rs rename to src/test/ui/tuple/tuple-float-index.rs diff --git a/src/test/ui/tuple-float-index.stderr b/src/test/ui/tuple/tuple-float-index.stderr similarity index 100% rename from src/test/ui/tuple-float-index.stderr rename to src/test/ui/tuple/tuple-float-index.stderr diff --git a/src/test/ui/compile-fail-migration/tuple-index-not-tuple.rs b/src/test/ui/tuple/tuple-index-not-tuple.rs similarity index 100% rename from src/test/ui/compile-fail-migration/tuple-index-not-tuple.rs rename to src/test/ui/tuple/tuple-index-not-tuple.rs diff --git a/src/test/ui/compile-fail-migration/tuple-index-not-tuple.stderr b/src/test/ui/tuple/tuple-index-not-tuple.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/tuple-index-not-tuple.stderr rename to src/test/ui/tuple/tuple-index-not-tuple.stderr diff --git a/src/test/ui/compile-fail-migration/tuple-index-out-of-bounds.rs b/src/test/ui/tuple/tuple-index-out-of-bounds.rs similarity index 100% rename from src/test/ui/compile-fail-migration/tuple-index-out-of-bounds.rs rename to src/test/ui/tuple/tuple-index-out-of-bounds.rs diff --git a/src/test/ui/compile-fail-migration/tuple-index-out-of-bounds.stderr b/src/test/ui/tuple/tuple-index-out-of-bounds.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/tuple-index-out-of-bounds.stderr rename to src/test/ui/tuple/tuple-index-out-of-bounds.stderr diff --git a/src/test/ui/tuple-struct-fields/test.rs b/src/test/ui/tuple/tuple-struct-fields/test.rs similarity index 100% rename from src/test/ui/tuple-struct-fields/test.rs rename to src/test/ui/tuple/tuple-struct-fields/test.rs diff --git a/src/test/ui/tuple-struct-fields/test.stderr b/src/test/ui/tuple/tuple-struct-fields/test.stderr similarity index 100% rename from src/test/ui/tuple-struct-fields/test.stderr rename to src/test/ui/tuple/tuple-struct-fields/test.stderr diff --git a/src/test/ui/tuple-struct-fields/test2.rs b/src/test/ui/tuple/tuple-struct-fields/test2.rs similarity index 100% rename from src/test/ui/tuple-struct-fields/test2.rs rename to src/test/ui/tuple/tuple-struct-fields/test2.rs diff --git a/src/test/ui/tuple-struct-fields/test2.stderr b/src/test/ui/tuple/tuple-struct-fields/test2.stderr similarity index 100% rename from src/test/ui/tuple-struct-fields/test2.stderr rename to src/test/ui/tuple/tuple-struct-fields/test2.stderr diff --git a/src/test/ui/tuple-struct-fields/test3.rs b/src/test/ui/tuple/tuple-struct-fields/test3.rs similarity index 100% rename from src/test/ui/tuple-struct-fields/test3.rs rename to src/test/ui/tuple/tuple-struct-fields/test3.rs diff --git a/src/test/ui/tuple-struct-fields/test3.stderr b/src/test/ui/tuple/tuple-struct-fields/test3.stderr similarity index 100% rename from src/test/ui/tuple-struct-fields/test3.stderr rename to src/test/ui/tuple/tuple-struct-fields/test3.stderr diff --git a/src/test/ui/compile-fail-migration/tuple-struct-nonexhaustive.rs b/src/test/ui/tuple/tuple-struct-nonexhaustive.rs similarity index 100% rename from src/test/ui/compile-fail-migration/tuple-struct-nonexhaustive.rs rename to src/test/ui/tuple/tuple-struct-nonexhaustive.rs diff --git a/src/test/ui/compile-fail-migration/tuple-struct-nonexhaustive.stderr b/src/test/ui/tuple/tuple-struct-nonexhaustive.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/tuple-struct-nonexhaustive.stderr rename to src/test/ui/tuple/tuple-struct-nonexhaustive.stderr diff --git a/src/test/ui/compile-fail-migration/tutorial-suffix-inference-test.rs b/src/test/ui/tutorial-suffix-inference-test.rs similarity index 100% rename from src/test/ui/compile-fail-migration/tutorial-suffix-inference-test.rs rename to src/test/ui/tutorial-suffix-inference-test.rs diff --git a/src/test/ui/compile-fail-migration/tutorial-suffix-inference-test.stderr b/src/test/ui/tutorial-suffix-inference-test.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/tutorial-suffix-inference-test.stderr rename to src/test/ui/tutorial-suffix-inference-test.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/coherence_lib.rs b/src/test/ui/type/auxiliary/crate_a1.rs similarity index 60% rename from src/test/ui/compile-fail-migration/auxiliary/coherence_lib.rs rename to src/test/ui/type/auxiliary/crate_a1.rs index daa123849e4..70f7cac94de 100644 --- a/src/test/ui/compile-fail-migration/auxiliary/coherence_lib.rs +++ b/src/test/ui/type/auxiliary/crate_a1.rs @@ -1,4 +1,4 @@ -// Copyright 2012 The Rust Project Developers. See the COPYRIGHT +// Copyright 2015 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -8,18 +8,14 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_type="lib"] +pub struct Foo; -pub trait Remote { - fn foo(&self) { } +pub trait Bar{} + +pub fn bar() -> Box { + unimplemented!() } -pub trait Remote1 { - fn foo(&self, t: T) { } -} -pub trait Remote2 { - fn foo(&self, t: T, u: U) { } -} - -pub struct Pair(T,U); +pub fn try_foo(x: Foo){} +pub fn try_bar(x: Box){} diff --git a/src/test/ui/compile-fail-migration/auxiliary/crate_a2.rs b/src/test/ui/type/auxiliary/crate_a2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/crate_a2.rs rename to src/test/ui/type/auxiliary/crate_a2.rs diff --git a/src/test/ui/type-alias-bounds.rs b/src/test/ui/type/type-alias-bounds.rs similarity index 100% rename from src/test/ui/type-alias-bounds.rs rename to src/test/ui/type/type-alias-bounds.rs diff --git a/src/test/ui/type-alias-bounds.stderr b/src/test/ui/type/type-alias-bounds.stderr similarity index 100% rename from src/test/ui/type-alias-bounds.stderr rename to src/test/ui/type/type-alias-bounds.stderr diff --git a/src/test/ui/type-annotation-needed.rs b/src/test/ui/type/type-annotation-needed.rs similarity index 100% rename from src/test/ui/type-annotation-needed.rs rename to src/test/ui/type/type-annotation-needed.rs diff --git a/src/test/ui/type-annotation-needed.stderr b/src/test/ui/type/type-annotation-needed.stderr similarity index 100% rename from src/test/ui/type-annotation-needed.stderr rename to src/test/ui/type/type-annotation-needed.stderr diff --git a/src/test/ui/compile-fail-migration/type-arg-out-of-scope.rs b/src/test/ui/type/type-arg-out-of-scope.rs similarity index 100% rename from src/test/ui/compile-fail-migration/type-arg-out-of-scope.rs rename to src/test/ui/type/type-arg-out-of-scope.rs diff --git a/src/test/ui/compile-fail-migration/type-arg-out-of-scope.stderr b/src/test/ui/type/type-arg-out-of-scope.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/type-arg-out-of-scope.stderr rename to src/test/ui/type/type-arg-out-of-scope.stderr diff --git a/src/test/ui/type-ascription-instead-of-initializer.rs b/src/test/ui/type/type-ascription-instead-of-initializer.rs similarity index 100% rename from src/test/ui/type-ascription-instead-of-initializer.rs rename to src/test/ui/type/type-ascription-instead-of-initializer.rs diff --git a/src/test/ui/type-ascription-instead-of-initializer.stderr b/src/test/ui/type/type-ascription-instead-of-initializer.stderr similarity index 100% rename from src/test/ui/type-ascription-instead-of-initializer.stderr rename to src/test/ui/type/type-ascription-instead-of-initializer.stderr diff --git a/src/test/ui/type-ascription-instead-of-statement-end.rs b/src/test/ui/type/type-ascription-instead-of-statement-end.rs similarity index 100% rename from src/test/ui/type-ascription-instead-of-statement-end.rs rename to src/test/ui/type/type-ascription-instead-of-statement-end.rs diff --git a/src/test/ui/type-ascription-instead-of-statement-end.stderr b/src/test/ui/type/type-ascription-instead-of-statement-end.stderr similarity index 100% rename from src/test/ui/type-ascription-instead-of-statement-end.stderr rename to src/test/ui/type/type-ascription-instead-of-statement-end.stderr diff --git a/src/test/ui/compile-fail-migration/type-ascription-precedence.rs b/src/test/ui/type/type-ascription-precedence.rs similarity index 100% rename from src/test/ui/compile-fail-migration/type-ascription-precedence.rs rename to src/test/ui/type/type-ascription-precedence.rs diff --git a/src/test/ui/compile-fail-migration/type-ascription-precedence.stderr b/src/test/ui/type/type-ascription-precedence.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/type-ascription-precedence.stderr rename to src/test/ui/type/type-ascription-precedence.stderr diff --git a/src/test/ui/compile-fail-migration/type-ascription-soundness.rs b/src/test/ui/type/type-ascription-soundness.rs similarity index 100% rename from src/test/ui/compile-fail-migration/type-ascription-soundness.rs rename to src/test/ui/type/type-ascription-soundness.rs diff --git a/src/test/ui/compile-fail-migration/type-ascription-soundness.stderr b/src/test/ui/type/type-ascription-soundness.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/type-ascription-soundness.stderr rename to src/test/ui/type/type-ascription-soundness.stderr diff --git a/src/test/ui/type-ascription-with-fn-call.rs b/src/test/ui/type/type-ascription-with-fn-call.rs similarity index 100% rename from src/test/ui/type-ascription-with-fn-call.rs rename to src/test/ui/type/type-ascription-with-fn-call.rs diff --git a/src/test/ui/type-ascription-with-fn-call.stderr b/src/test/ui/type/type-ascription-with-fn-call.stderr similarity index 100% rename from src/test/ui/type-ascription-with-fn-call.stderr rename to src/test/ui/type/type-ascription-with-fn-call.stderr diff --git a/src/test/ui/type-check-defaults.rs b/src/test/ui/type/type-check-defaults.rs similarity index 100% rename from src/test/ui/type-check-defaults.rs rename to src/test/ui/type/type-check-defaults.rs diff --git a/src/test/ui/type-check-defaults.stderr b/src/test/ui/type/type-check-defaults.stderr similarity index 100% rename from src/test/ui/type-check-defaults.stderr rename to src/test/ui/type/type-check-defaults.stderr diff --git a/src/test/ui/type-check/assignment-in-if.rs b/src/test/ui/type/type-check/assignment-in-if.rs similarity index 100% rename from src/test/ui/type-check/assignment-in-if.rs rename to src/test/ui/type/type-check/assignment-in-if.rs diff --git a/src/test/ui/type-check/assignment-in-if.stderr b/src/test/ui/type/type-check/assignment-in-if.stderr similarity index 100% rename from src/test/ui/type-check/assignment-in-if.stderr rename to src/test/ui/type/type-check/assignment-in-if.stderr diff --git a/src/test/ui/type-check/cannot_infer_local_or_array.rs b/src/test/ui/type/type-check/cannot_infer_local_or_array.rs similarity index 100% rename from src/test/ui/type-check/cannot_infer_local_or_array.rs rename to src/test/ui/type/type-check/cannot_infer_local_or_array.rs diff --git a/src/test/ui/type-check/cannot_infer_local_or_array.stderr b/src/test/ui/type/type-check/cannot_infer_local_or_array.stderr similarity index 100% rename from src/test/ui/type-check/cannot_infer_local_or_array.stderr rename to src/test/ui/type/type-check/cannot_infer_local_or_array.stderr diff --git a/src/test/ui/type-check/cannot_infer_local_or_vec.rs b/src/test/ui/type/type-check/cannot_infer_local_or_vec.rs similarity index 100% rename from src/test/ui/type-check/cannot_infer_local_or_vec.rs rename to src/test/ui/type/type-check/cannot_infer_local_or_vec.rs diff --git a/src/test/ui/type-check/cannot_infer_local_or_vec.stderr b/src/test/ui/type/type-check/cannot_infer_local_or_vec.stderr similarity index 100% rename from src/test/ui/type-check/cannot_infer_local_or_vec.stderr rename to src/test/ui/type/type-check/cannot_infer_local_or_vec.stderr diff --git a/src/test/ui/type-check/cannot_infer_local_or_vec_in_tuples.rs b/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.rs similarity index 100% rename from src/test/ui/type-check/cannot_infer_local_or_vec_in_tuples.rs rename to src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.rs diff --git a/src/test/ui/type-check/cannot_infer_local_or_vec_in_tuples.stderr b/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.stderr similarity index 100% rename from src/test/ui/type-check/cannot_infer_local_or_vec_in_tuples.stderr rename to src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.stderr diff --git a/src/test/ui/type-check/issue-22897.rs b/src/test/ui/type/type-check/issue-22897.rs similarity index 100% rename from src/test/ui/type-check/issue-22897.rs rename to src/test/ui/type/type-check/issue-22897.rs diff --git a/src/test/ui/type-check/issue-22897.stderr b/src/test/ui/type/type-check/issue-22897.stderr similarity index 100% rename from src/test/ui/type-check/issue-22897.stderr rename to src/test/ui/type/type-check/issue-22897.stderr diff --git a/src/test/ui/type-check/issue-40294.rs b/src/test/ui/type/type-check/issue-40294.rs similarity index 100% rename from src/test/ui/type-check/issue-40294.rs rename to src/test/ui/type/type-check/issue-40294.rs diff --git a/src/test/ui/type-check/issue-40294.stderr b/src/test/ui/type/type-check/issue-40294.stderr similarity index 100% rename from src/test/ui/type-check/issue-40294.stderr rename to src/test/ui/type/type-check/issue-40294.stderr diff --git a/src/test/ui/type-check/issue-41314.rs b/src/test/ui/type/type-check/issue-41314.rs similarity index 100% rename from src/test/ui/type-check/issue-41314.rs rename to src/test/ui/type/type-check/issue-41314.rs diff --git a/src/test/ui/type-check/issue-41314.stderr b/src/test/ui/type/type-check/issue-41314.stderr similarity index 100% rename from src/test/ui/type-check/issue-41314.stderr rename to src/test/ui/type/type-check/issue-41314.stderr diff --git a/src/test/ui/type-check/missing_trait_impl.rs b/src/test/ui/type/type-check/missing_trait_impl.rs similarity index 100% rename from src/test/ui/type-check/missing_trait_impl.rs rename to src/test/ui/type/type-check/missing_trait_impl.rs diff --git a/src/test/ui/type-check/missing_trait_impl.stderr b/src/test/ui/type/type-check/missing_trait_impl.stderr similarity index 100% rename from src/test/ui/type-check/missing_trait_impl.stderr rename to src/test/ui/type/type-check/missing_trait_impl.stderr diff --git a/src/test/ui/type-check/unknown_type_for_closure.rs b/src/test/ui/type/type-check/unknown_type_for_closure.rs similarity index 100% rename from src/test/ui/type-check/unknown_type_for_closure.rs rename to src/test/ui/type/type-check/unknown_type_for_closure.rs diff --git a/src/test/ui/type-check/unknown_type_for_closure.stderr b/src/test/ui/type/type-check/unknown_type_for_closure.stderr similarity index 100% rename from src/test/ui/type-check/unknown_type_for_closure.stderr rename to src/test/ui/type/type-check/unknown_type_for_closure.stderr diff --git a/src/test/ui/type-dependent-def-issue-49241.rs b/src/test/ui/type/type-dependent-def-issue-49241.rs similarity index 100% rename from src/test/ui/type-dependent-def-issue-49241.rs rename to src/test/ui/type/type-dependent-def-issue-49241.rs diff --git a/src/test/ui/type-dependent-def-issue-49241.stderr b/src/test/ui/type/type-dependent-def-issue-49241.stderr similarity index 100% rename from src/test/ui/type-dependent-def-issue-49241.stderr rename to src/test/ui/type/type-dependent-def-issue-49241.stderr diff --git a/src/test/ui/compile-fail-migration/type-mismatch-multiple.rs b/src/test/ui/type/type-mismatch-multiple.rs similarity index 100% rename from src/test/ui/compile-fail-migration/type-mismatch-multiple.rs rename to src/test/ui/type/type-mismatch-multiple.rs diff --git a/src/test/ui/compile-fail-migration/type-mismatch-multiple.stderr b/src/test/ui/type/type-mismatch-multiple.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/type-mismatch-multiple.stderr rename to src/test/ui/type/type-mismatch-multiple.stderr diff --git a/src/test/ui/compile-fail-migration/type-mismatch-same-crate-name.rs b/src/test/ui/type/type-mismatch-same-crate-name.rs similarity index 100% rename from src/test/ui/compile-fail-migration/type-mismatch-same-crate-name.rs rename to src/test/ui/type/type-mismatch-same-crate-name.rs diff --git a/src/test/ui/compile-fail-migration/type-mismatch-same-crate-name.stderr b/src/test/ui/type/type-mismatch-same-crate-name.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/type-mismatch-same-crate-name.stderr rename to src/test/ui/type/type-mismatch-same-crate-name.stderr diff --git a/src/test/ui/type-mismatch.rs b/src/test/ui/type/type-mismatch.rs similarity index 100% rename from src/test/ui/type-mismatch.rs rename to src/test/ui/type/type-mismatch.rs diff --git a/src/test/ui/type-mismatch.stderr b/src/test/ui/type/type-mismatch.stderr similarity index 100% rename from src/test/ui/type-mismatch.stderr rename to src/test/ui/type/type-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/type-parameter-defaults-referencing-Self-ppaux.rs b/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.rs similarity index 100% rename from src/test/ui/compile-fail-migration/type-parameter-defaults-referencing-Self-ppaux.rs rename to src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.rs diff --git a/src/test/ui/compile-fail-migration/type-parameter-defaults-referencing-Self-ppaux.stderr b/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/type-parameter-defaults-referencing-Self-ppaux.stderr rename to src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.stderr diff --git a/src/test/ui/compile-fail-migration/type-parameter-defaults-referencing-Self.rs b/src/test/ui/type/type-parameter-defaults-referencing-Self.rs similarity index 100% rename from src/test/ui/compile-fail-migration/type-parameter-defaults-referencing-Self.rs rename to src/test/ui/type/type-parameter-defaults-referencing-Self.rs diff --git a/src/test/ui/compile-fail-migration/type-parameter-defaults-referencing-Self.stderr b/src/test/ui/type/type-parameter-defaults-referencing-Self.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/type-parameter-defaults-referencing-Self.stderr rename to src/test/ui/type/type-parameter-defaults-referencing-Self.stderr diff --git a/src/test/ui/compile-fail-migration/type-parameter-names.rs b/src/test/ui/type/type-parameter-names.rs similarity index 100% rename from src/test/ui/compile-fail-migration/type-parameter-names.rs rename to src/test/ui/type/type-parameter-names.rs diff --git a/src/test/ui/compile-fail-migration/type-parameter-names.stderr b/src/test/ui/type/type-parameter-names.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/type-parameter-names.stderr rename to src/test/ui/type/type-parameter-names.stderr diff --git a/src/test/ui/compile-fail-migration/type-params-in-different-spaces-1.rs b/src/test/ui/type/type-params-in-different-spaces-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/type-params-in-different-spaces-1.rs rename to src/test/ui/type/type-params-in-different-spaces-1.rs diff --git a/src/test/ui/compile-fail-migration/type-params-in-different-spaces-1.stderr b/src/test/ui/type/type-params-in-different-spaces-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/type-params-in-different-spaces-1.stderr rename to src/test/ui/type/type-params-in-different-spaces-1.stderr diff --git a/src/test/ui/compile-fail-migration/type-params-in-different-spaces-2.rs b/src/test/ui/type/type-params-in-different-spaces-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/type-params-in-different-spaces-2.rs rename to src/test/ui/type/type-params-in-different-spaces-2.rs diff --git a/src/test/ui/compile-fail-migration/type-params-in-different-spaces-2.stderr b/src/test/ui/type/type-params-in-different-spaces-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/type-params-in-different-spaces-2.stderr rename to src/test/ui/type/type-params-in-different-spaces-2.stderr diff --git a/src/test/ui/compile-fail-migration/type-params-in-different-spaces-3.rs b/src/test/ui/type/type-params-in-different-spaces-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/type-params-in-different-spaces-3.rs rename to src/test/ui/type/type-params-in-different-spaces-3.rs diff --git a/src/test/ui/compile-fail-migration/type-params-in-different-spaces-3.stderr b/src/test/ui/type/type-params-in-different-spaces-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/type-params-in-different-spaces-3.stderr rename to src/test/ui/type/type-params-in-different-spaces-3.stderr diff --git a/src/test/ui/compile-fail-migration/type-path-err-node-types.rs b/src/test/ui/type/type-path-err-node-types.rs similarity index 100% rename from src/test/ui/compile-fail-migration/type-path-err-node-types.rs rename to src/test/ui/type/type-path-err-node-types.rs diff --git a/src/test/ui/compile-fail-migration/type-path-err-node-types.stderr b/src/test/ui/type/type-path-err-node-types.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/type-path-err-node-types.stderr rename to src/test/ui/type/type-path-err-node-types.stderr diff --git a/src/test/ui/type-recursive.rs b/src/test/ui/type/type-recursive.rs similarity index 100% rename from src/test/ui/type-recursive.rs rename to src/test/ui/type/type-recursive.rs diff --git a/src/test/ui/type-recursive.stderr b/src/test/ui/type/type-recursive.stderr similarity index 100% rename from src/test/ui/type-recursive.stderr rename to src/test/ui/type/type-recursive.stderr diff --git a/src/test/ui/compile-fail-migration/type-shadow.rs b/src/test/ui/type/type-shadow.rs similarity index 100% rename from src/test/ui/compile-fail-migration/type-shadow.rs rename to src/test/ui/type/type-shadow.rs diff --git a/src/test/ui/compile-fail-migration/type-shadow.stderr b/src/test/ui/type/type-shadow.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/type-shadow.stderr rename to src/test/ui/type/type-shadow.stderr diff --git a/src/test/ui/compile-fail-migration/type_length_limit.rs b/src/test/ui/type_length_limit.rs similarity index 100% rename from src/test/ui/compile-fail-migration/type_length_limit.rs rename to src/test/ui/type_length_limit.rs diff --git a/src/test/ui/compile-fail-migration/type_length_limit.stderr b/src/test/ui/type_length_limit.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/type_length_limit.stderr rename to src/test/ui/type_length_limit.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/tdticc_coherence_lib.rs b/src/test/ui/typeck/auxiliary/tdticc_coherence_lib.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/tdticc_coherence_lib.rs rename to src/test/ui/typeck/auxiliary/tdticc_coherence_lib.rs diff --git a/src/test/ui/compile-fail-migration/typeck-auto-trait-no-supertraits-2.rs b/src/test/ui/typeck/typeck-auto-trait-no-supertraits-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-auto-trait-no-supertraits-2.rs rename to src/test/ui/typeck/typeck-auto-trait-no-supertraits-2.rs diff --git a/src/test/ui/compile-fail-migration/typeck-auto-trait-no-supertraits-2.stderr b/src/test/ui/typeck/typeck-auto-trait-no-supertraits-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-auto-trait-no-supertraits-2.stderr rename to src/test/ui/typeck/typeck-auto-trait-no-supertraits-2.stderr diff --git a/src/test/ui/compile-fail-migration/typeck-auto-trait-no-supertraits.rs b/src/test/ui/typeck/typeck-auto-trait-no-supertraits.rs similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-auto-trait-no-supertraits.rs rename to src/test/ui/typeck/typeck-auto-trait-no-supertraits.rs diff --git a/src/test/ui/compile-fail-migration/typeck-auto-trait-no-supertraits.stderr b/src/test/ui/typeck/typeck-auto-trait-no-supertraits.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-auto-trait-no-supertraits.stderr rename to src/test/ui/typeck/typeck-auto-trait-no-supertraits.stderr diff --git a/src/test/ui/typeck-builtin-bound-type-parameters.rs b/src/test/ui/typeck/typeck-builtin-bound-type-parameters.rs similarity index 100% rename from src/test/ui/typeck-builtin-bound-type-parameters.rs rename to src/test/ui/typeck/typeck-builtin-bound-type-parameters.rs diff --git a/src/test/ui/typeck-builtin-bound-type-parameters.stderr b/src/test/ui/typeck/typeck-builtin-bound-type-parameters.stderr similarity index 100% rename from src/test/ui/typeck-builtin-bound-type-parameters.stderr rename to src/test/ui/typeck/typeck-builtin-bound-type-parameters.stderr diff --git a/src/test/ui/compile-fail-migration/typeck-cast-pointer-to-float.rs b/src/test/ui/typeck/typeck-cast-pointer-to-float.rs similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-cast-pointer-to-float.rs rename to src/test/ui/typeck/typeck-cast-pointer-to-float.rs diff --git a/src/test/ui/compile-fail-migration/typeck-cast-pointer-to-float.stderr b/src/test/ui/typeck/typeck-cast-pointer-to-float.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-cast-pointer-to-float.stderr rename to src/test/ui/typeck/typeck-cast-pointer-to-float.stderr diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-assoc-type.rs b/src/test/ui/typeck/typeck-default-trait-impl-assoc-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-assoc-type.rs rename to src/test/ui/typeck/typeck-default-trait-impl-assoc-type.rs diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-assoc-type.stderr b/src/test/ui/typeck/typeck-default-trait-impl-assoc-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-assoc-type.stderr rename to src/test/ui/typeck/typeck-default-trait-impl-assoc-type.stderr diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-constituent-types-2.rs b/src/test/ui/typeck/typeck-default-trait-impl-constituent-types-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-constituent-types-2.rs rename to src/test/ui/typeck/typeck-default-trait-impl-constituent-types-2.rs diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-constituent-types-2.stderr b/src/test/ui/typeck/typeck-default-trait-impl-constituent-types-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-constituent-types-2.stderr rename to src/test/ui/typeck/typeck-default-trait-impl-constituent-types-2.stderr diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-constituent-types.rs b/src/test/ui/typeck/typeck-default-trait-impl-constituent-types.rs similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-constituent-types.rs rename to src/test/ui/typeck/typeck-default-trait-impl-constituent-types.rs diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-constituent-types.stderr b/src/test/ui/typeck/typeck-default-trait-impl-constituent-types.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-constituent-types.stderr rename to src/test/ui/typeck/typeck-default-trait-impl-constituent-types.stderr diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-cross-crate-coherence.rs b/src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.rs similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-cross-crate-coherence.rs rename to src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.rs diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-cross-crate-coherence.stderr b/src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-cross-crate-coherence.stderr rename to src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.stderr diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-negation-send.rs b/src/test/ui/typeck/typeck-default-trait-impl-negation-send.rs similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-negation-send.rs rename to src/test/ui/typeck/typeck-default-trait-impl-negation-send.rs diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-negation-send.stderr b/src/test/ui/typeck/typeck-default-trait-impl-negation-send.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-negation-send.stderr rename to src/test/ui/typeck/typeck-default-trait-impl-negation-send.stderr diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-negation-sync.rs b/src/test/ui/typeck/typeck-default-trait-impl-negation-sync.rs similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-negation-sync.rs rename to src/test/ui/typeck/typeck-default-trait-impl-negation-sync.rs diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-negation-sync.stderr b/src/test/ui/typeck/typeck-default-trait-impl-negation-sync.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-negation-sync.stderr rename to src/test/ui/typeck/typeck-default-trait-impl-negation-sync.stderr diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-negation.rs b/src/test/ui/typeck/typeck-default-trait-impl-negation.rs similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-negation.rs rename to src/test/ui/typeck/typeck-default-trait-impl-negation.rs diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-negation.stderr b/src/test/ui/typeck/typeck-default-trait-impl-negation.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-negation.stderr rename to src/test/ui/typeck/typeck-default-trait-impl-negation.stderr diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-precedence.rs b/src/test/ui/typeck/typeck-default-trait-impl-precedence.rs similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-precedence.rs rename to src/test/ui/typeck/typeck-default-trait-impl-precedence.rs diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-precedence.stderr b/src/test/ui/typeck/typeck-default-trait-impl-precedence.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-precedence.stderr rename to src/test/ui/typeck/typeck-default-trait-impl-precedence.stderr diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-send-param.rs b/src/test/ui/typeck/typeck-default-trait-impl-send-param.rs similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-send-param.rs rename to src/test/ui/typeck/typeck-default-trait-impl-send-param.rs diff --git a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-send-param.stderr b/src/test/ui/typeck/typeck-default-trait-impl-send-param.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-default-trait-impl-send-param.stderr rename to src/test/ui/typeck/typeck-default-trait-impl-send-param.stderr diff --git a/src/test/ui/compile-fail-migration/typeck-negative-impls-builtin.rs b/src/test/ui/typeck/typeck-negative-impls-builtin.rs similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-negative-impls-builtin.rs rename to src/test/ui/typeck/typeck-negative-impls-builtin.rs diff --git a/src/test/ui/compile-fail-migration/typeck-negative-impls-builtin.stderr b/src/test/ui/typeck/typeck-negative-impls-builtin.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-negative-impls-builtin.stderr rename to src/test/ui/typeck/typeck-negative-impls-builtin.stderr diff --git a/src/test/ui/compile-fail-migration/typeck-unsafe-always-share.rs b/src/test/ui/typeck/typeck-unsafe-always-share.rs similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-unsafe-always-share.rs rename to src/test/ui/typeck/typeck-unsafe-always-share.rs diff --git a/src/test/ui/compile-fail-migration/typeck-unsafe-always-share.stderr b/src/test/ui/typeck/typeck-unsafe-always-share.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/typeck-unsafe-always-share.stderr rename to src/test/ui/typeck/typeck-unsafe-always-share.stderr diff --git a/src/test/ui/typeck_type_placeholder_item.rs b/src/test/ui/typeck/typeck_type_placeholder_item.rs similarity index 100% rename from src/test/ui/typeck_type_placeholder_item.rs rename to src/test/ui/typeck/typeck_type_placeholder_item.rs diff --git a/src/test/ui/typeck_type_placeholder_item.stderr b/src/test/ui/typeck/typeck_type_placeholder_item.stderr similarity index 100% rename from src/test/ui/typeck_type_placeholder_item.stderr rename to src/test/ui/typeck/typeck_type_placeholder_item.stderr diff --git a/src/test/ui/typeck_type_placeholder_lifetime_1.rs b/src/test/ui/typeck/typeck_type_placeholder_lifetime_1.rs similarity index 100% rename from src/test/ui/typeck_type_placeholder_lifetime_1.rs rename to src/test/ui/typeck/typeck_type_placeholder_lifetime_1.rs diff --git a/src/test/ui/typeck_type_placeholder_lifetime_1.stderr b/src/test/ui/typeck/typeck_type_placeholder_lifetime_1.stderr similarity index 100% rename from src/test/ui/typeck_type_placeholder_lifetime_1.stderr rename to src/test/ui/typeck/typeck_type_placeholder_lifetime_1.stderr diff --git a/src/test/ui/typeck_type_placeholder_lifetime_2.rs b/src/test/ui/typeck/typeck_type_placeholder_lifetime_2.rs similarity index 100% rename from src/test/ui/typeck_type_placeholder_lifetime_2.rs rename to src/test/ui/typeck/typeck_type_placeholder_lifetime_2.rs diff --git a/src/test/ui/typeck_type_placeholder_lifetime_2.stderr b/src/test/ui/typeck/typeck_type_placeholder_lifetime_2.stderr similarity index 100% rename from src/test/ui/typeck_type_placeholder_lifetime_2.stderr rename to src/test/ui/typeck/typeck_type_placeholder_lifetime_2.stderr diff --git a/src/test/ui/compile-fail-migration/typeck_type_placeholder_mismatch.rs b/src/test/ui/typeck/typeck_type_placeholder_mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/typeck_type_placeholder_mismatch.rs rename to src/test/ui/typeck/typeck_type_placeholder_mismatch.rs diff --git a/src/test/ui/compile-fail-migration/typeck_type_placeholder_mismatch.stderr b/src/test/ui/typeck/typeck_type_placeholder_mismatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/typeck_type_placeholder_mismatch.stderr rename to src/test/ui/typeck/typeck_type_placeholder_mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/ufcs-explicit-self-bad.rs b/src/test/ui/ufcs/ufcs-explicit-self-bad.rs similarity index 100% rename from src/test/ui/compile-fail-migration/ufcs-explicit-self-bad.rs rename to src/test/ui/ufcs/ufcs-explicit-self-bad.rs diff --git a/src/test/ui/compile-fail-migration/ufcs-explicit-self-bad.stderr b/src/test/ui/ufcs/ufcs-explicit-self-bad.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/ufcs-explicit-self-bad.stderr rename to src/test/ui/ufcs/ufcs-explicit-self-bad.stderr diff --git a/src/test/ui/compile-fail-migration/ufcs-partially-resolved.rs b/src/test/ui/ufcs/ufcs-partially-resolved.rs similarity index 100% rename from src/test/ui/compile-fail-migration/ufcs-partially-resolved.rs rename to src/test/ui/ufcs/ufcs-partially-resolved.rs diff --git a/src/test/ui/compile-fail-migration/ufcs-partially-resolved.stderr b/src/test/ui/ufcs/ufcs-partially-resolved.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/ufcs-partially-resolved.stderr rename to src/test/ui/ufcs/ufcs-partially-resolved.stderr diff --git a/src/test/ui/compile-fail-migration/ufcs-qpath-missing-params.rs b/src/test/ui/ufcs/ufcs-qpath-missing-params.rs similarity index 100% rename from src/test/ui/compile-fail-migration/ufcs-qpath-missing-params.rs rename to src/test/ui/ufcs/ufcs-qpath-missing-params.rs diff --git a/src/test/ui/compile-fail-migration/ufcs-qpath-missing-params.stderr b/src/test/ui/ufcs/ufcs-qpath-missing-params.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/ufcs-qpath-missing-params.stderr rename to src/test/ui/ufcs/ufcs-qpath-missing-params.stderr diff --git a/src/test/ui/compile-fail-migration/ufcs-qpath-self-mismatch.rs b/src/test/ui/ufcs/ufcs-qpath-self-mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/ufcs-qpath-self-mismatch.rs rename to src/test/ui/ufcs/ufcs-qpath-self-mismatch.rs diff --git a/src/test/ui/compile-fail-migration/ufcs-qpath-self-mismatch.stderr b/src/test/ui/ufcs/ufcs-qpath-self-mismatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/ufcs-qpath-self-mismatch.stderr rename to src/test/ui/ufcs/ufcs-qpath-self-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-feature-gate.rs b/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-feature-gate.rs rename to src/test/ui/unboxed-closures/unboxed-closure-feature-gate.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-feature-gate.stderr b/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-feature-gate.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-feature-gate.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-illegal-move.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-illegal-move.nll.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-illegal-move.nll.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-illegal-move.rs b/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-illegal-move.rs rename to src/test/ui/unboxed-closures/unboxed-closure-illegal-move.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-illegal-move.stderr b/src/test/ui/unboxed-closures/unboxed-closure-illegal-move.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-illegal-move.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-illegal-move.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-immutable-capture.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-immutable-capture.nll.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.nll.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-immutable-capture.rs b/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-immutable-capture.rs rename to src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-immutable-capture.stderr b/src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-immutable-capture.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-immutable-capture.stderr diff --git a/src/test/ui/unboxed-closure-no-cyclic-sig.rs b/src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.rs similarity index 100% rename from src/test/ui/unboxed-closure-no-cyclic-sig.rs rename to src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.rs diff --git a/src/test/ui/unboxed-closure-no-cyclic-sig.stderr b/src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.stderr similarity index 100% rename from src/test/ui/unboxed-closure-no-cyclic-sig.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-region.rs b/src/test/ui/unboxed-closures/unboxed-closure-region.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-region.rs rename to src/test/ui/unboxed-closures/unboxed-closure-region.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-region.stderr b/src/test/ui/unboxed-closures/unboxed-closure-region.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-region.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-region.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-default.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-default.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-default.rs rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-default.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-default.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-default.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-default.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-default.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-equiv.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-equiv.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-equiv.rs rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-equiv.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-equiv.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-equiv.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-equiv.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-equiv.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-lifetime-elision.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-lifetime-elision.rs rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-lifetime-elision.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-lifetime-elision.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-not-used-on-fn.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-not-used-on-fn.rs rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-not-used-on-fn.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-not-used-on-fn.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-region.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-region.rs rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-region.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-region.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-region.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-region.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-region.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-used-on-struct-1.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-used-on-struct-1.rs rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-used-on-struct-1.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-used-on-struct-1.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-1.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-used-on-struct-3.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-used-on-struct-3.rs rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-used-on-struct-3.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-used-on-struct-3.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct-3.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-used-on-struct.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-used-on-struct.rs rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-used-on-struct.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-used-on-struct.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-used-on-struct.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-wrong-number-number-type-parameters-1.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-wrong-number-number-type-parameters-1.rs rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-wrong-number-number-type-parameters-1.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-wrong-number-number-type-parameters-1.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-1.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-wrong-number-number-type-parameters-3.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-wrong-number-number-type-parameters-3.rs rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-wrong-number-number-type-parameters-3.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-wrong-number-number-type-parameters-3.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters-3.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-wrong-number-number-type-parameters.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-wrong-number-number-type-parameters.rs rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-wrong-number-number-type-parameters.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closure-sugar-wrong-number-number-type-parameters.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-number-number-type-parameters.stderr diff --git a/src/test/ui/unboxed-closure-sugar-wrong-trait.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.rs similarity index 100% rename from src/test/ui/unboxed-closure-sugar-wrong-trait.rs rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.rs diff --git a/src/test/ui/unboxed-closure-sugar-wrong-trait.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.stderr similarity index 100% rename from src/test/ui/unboxed-closure-sugar-wrong-trait.stderr rename to src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-borrow-conflict.rs b/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-borrow-conflict.rs rename to src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-borrow-conflict.stderr b/src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-borrow-conflict.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-borrow-conflict.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-failed-recursive-fn-1.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.nll.stderr similarity index 86% rename from src/test/ui/compile-fail-migration/unboxed-closures-failed-recursive-fn-1.nll.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.nll.stderr index a4527e79392..8cda1e60ba9 100644 --- a/src/test/ui/compile-fail-migration/unboxed-closures-failed-recursive-fn-1.nll.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.nll.stderr @@ -38,12 +38,9 @@ LL | let g = factorial.as_ref().unwrap(); | ^^^^^^^^^ borrowed value does not live long enough ... LL | } - | - - | | - | `factorial` dropped here while still borrowed - | borrow later used here, when `factorial` is dropped + | - `factorial` dropped here while still borrowed | - = note: values in a scope are dropped in the opposite order they are defined + = note: borrowed value must be valid for the static lifetime... error[E0506]: cannot assign to `factorial` because it is borrowed --> $DIR/unboxed-closures-failed-recursive-fn-1.rs:42:5 @@ -55,10 +52,9 @@ LL | let g = factorial.as_ref().unwrap(); | --------- borrow occurs due to use in closure ... LL | factorial = Some(Box::new(f)); - | ^^^^^^^^^ - | | - | assignment to borrowed `factorial` occurs here - | borrow later used here + | ^^^^^^^^^ assignment to borrowed `factorial` occurs here + | + = note: borrowed value must be valid for the static lifetime... error: aborting due to 4 previous errors diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-failed-recursive-fn-1.rs b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-failed-recursive-fn-1.rs rename to src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-failed-recursive-fn-1.stderr b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-failed-recursive-fn-1.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-1.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-failed-recursive-fn-2.rs b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-failed-recursive-fn-2.rs rename to src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-failed-recursive-fn-2.stderr b/src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-failed-recursive-fn-2.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-failed-recursive-fn-2.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-fnmut-as-fn.rs b/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-fnmut-as-fn.rs rename to src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-fnmut-as-fn.stderr b/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-fnmut-as-fn.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-argument-types-two-region-pointers.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-argument-types-two-region-pointers.nll.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.nll.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-argument-types-two-region-pointers.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-argument-types-two-region-pointers.rs rename to src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-argument-types-two-region-pointers.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-argument-types-two-region-pointers.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-infer-argument-types-two-region-pointers.stderr diff --git a/src/test/ui/unboxed-closures-infer-fn-once-move-from-projection.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.rs similarity index 100% rename from src/test/ui/unboxed-closures-infer-fn-once-move-from-projection.rs rename to src/test/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.rs diff --git a/src/test/ui/unboxed-closures-infer-fn-once-move-from-projection.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.stderr similarity index 100% rename from src/test/ui/unboxed-closures-infer-fn-once-move-from-projection.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-infer-fn-once-move-from-projection.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.nll.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.nll.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs rename to src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut-no-mut.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-missing-mut.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-missing-mut.nll.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.nll.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-missing-mut.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-missing-mut.rs rename to src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-missing-mut.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-missing-mut.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-missing-mut.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-move-missing-mut.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-move-missing-mut.nll.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.nll.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-move-missing-mut.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-move-missing-mut.rs rename to src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-move-missing-mut.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-fnmut-move-missing-mut.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move-missing-mut.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-fnonce-call-twice.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-fnonce-call-twice.nll.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.nll.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-fnonce-call-twice.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-fnonce-call-twice.rs rename to src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-fnonce-call-twice.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-fnonce-call-twice.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-call-twice.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-fnonce-move-call-twice.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-fnonce-move-call-twice.nll.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.nll.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-fnonce-move-call-twice.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-fnonce-move-call-twice.rs rename to src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-infer-fnonce-move-call-twice.stderr b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-infer-fnonce-move-call-twice.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move-call-twice.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-mutate-upvar.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-mutate-upvar.nll.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.nll.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-mutate-upvar.rs b/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-mutate-upvar.rs rename to src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-mutate-upvar.stderr b/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-mutate-upvar.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-mutated-upvar-from-fn-closure.ast.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.ast.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-mutated-upvar-from-fn-closure.ast.nll.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.ast.nll.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-mutated-upvar-from-fn-closure.ast.stderr b/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.ast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-mutated-upvar-from-fn-closure.ast.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.ast.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-mutated-upvar-from-fn-closure.mir.stderr b/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.mir.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-mutated-upvar-from-fn-closure.mir.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.mir.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-mutated-upvar-from-fn-closure.rs b/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-mutated-upvar-from-fn-closure.rs rename to src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-recursive-fn-using-fn-mut.nll.stderr b/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-recursive-fn-using-fn-mut.nll.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.nll.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-recursive-fn-using-fn-mut.rs b/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-recursive-fn-using-fn-mut.rs rename to src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-recursive-fn-using-fn-mut.stderr b/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-recursive-fn-using-fn-mut.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-static-call-wrong-trait.rs b/src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-static-call-wrong-trait.rs rename to src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-static-call-wrong-trait.stderr b/src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-static-call-wrong-trait.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-static-call-wrong-trait.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-type-mismatch.rs b/src/test/ui/unboxed-closures/unboxed-closures-type-mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-type-mismatch.rs rename to src/test/ui/unboxed-closures/unboxed-closures-type-mismatch.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-type-mismatch.stderr b/src/test/ui/unboxed-closures/unboxed-closures-type-mismatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-type-mismatch.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-type-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-unsafe-extern-fn.rs b/src/test/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-unsafe-extern-fn.rs rename to src/test/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-unsafe-extern-fn.stderr b/src/test/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-unsafe-extern-fn.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-unsafe-extern-fn.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-wrong-abi.rs b/src/test/ui/unboxed-closures/unboxed-closures-wrong-abi.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-wrong-abi.rs rename to src/test/ui/unboxed-closures/unboxed-closures-wrong-abi.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-wrong-abi.stderr b/src/test/ui/unboxed-closures/unboxed-closures-wrong-abi.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-wrong-abi.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-wrong-abi.stderr diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-wrong-arg-type-extern-fn.rs b/src/test/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-wrong-arg-type-extern-fn.rs rename to src/test/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.rs diff --git a/src/test/ui/compile-fail-migration/unboxed-closures-wrong-arg-type-extern-fn.stderr b/src/test/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unboxed-closures-wrong-arg-type-extern-fn.stderr rename to src/test/ui/unboxed-closures/unboxed-closures-wrong-arg-type-extern-fn.stderr diff --git a/src/test/ui/compile-fail-migration/underscore-lifetime-binders.rs b/src/test/ui/underscore-lifetime/underscore-lifetime-binders.rs similarity index 100% rename from src/test/ui/compile-fail-migration/underscore-lifetime-binders.rs rename to src/test/ui/underscore-lifetime/underscore-lifetime-binders.rs diff --git a/src/test/ui/compile-fail-migration/underscore-lifetime-binders.stderr b/src/test/ui/underscore-lifetime/underscore-lifetime-binders.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/underscore-lifetime-binders.stderr rename to src/test/ui/underscore-lifetime/underscore-lifetime-binders.stderr diff --git a/src/test/ui/compile-fail-migration/underscore-lifetime-elison-mismatch.nll.stderr b/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/underscore-lifetime-elison-mismatch.nll.stderr rename to src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.nll.stderr diff --git a/src/test/ui/compile-fail-migration/underscore-lifetime-elison-mismatch.rs b/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/underscore-lifetime-elison-mismatch.rs rename to src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.rs diff --git a/src/test/ui/compile-fail-migration/underscore-lifetime-elison-mismatch.stderr b/src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/underscore-lifetime-elison-mismatch.stderr rename to src/test/ui/underscore-lifetime/underscore-lifetime-elison-mismatch.stderr diff --git a/src/test/ui/compile-fail-migration/uninhabited-enum-cast.rs b/src/test/ui/uninhabited/uninhabited-enum-cast.rs similarity index 100% rename from src/test/ui/compile-fail-migration/uninhabited-enum-cast.rs rename to src/test/ui/uninhabited/uninhabited-enum-cast.rs diff --git a/src/test/ui/compile-fail-migration/uninhabited-enum-cast.stderr b/src/test/ui/uninhabited/uninhabited-enum-cast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/uninhabited-enum-cast.stderr rename to src/test/ui/uninhabited/uninhabited-enum-cast.stderr diff --git a/src/test/ui/compile-fail-migration/uninhabited-irrefutable.rs b/src/test/ui/uninhabited/uninhabited-irrefutable.rs similarity index 100% rename from src/test/ui/compile-fail-migration/uninhabited-irrefutable.rs rename to src/test/ui/uninhabited/uninhabited-irrefutable.rs diff --git a/src/test/ui/compile-fail-migration/uninhabited-irrefutable.stderr b/src/test/ui/uninhabited/uninhabited-irrefutable.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/uninhabited-irrefutable.stderr rename to src/test/ui/uninhabited/uninhabited-irrefutable.stderr diff --git a/src/test/ui/compile-fail-migration/uninhabited-matches-feature-gated.rs b/src/test/ui/uninhabited/uninhabited-matches-feature-gated.rs similarity index 100% rename from src/test/ui/compile-fail-migration/uninhabited-matches-feature-gated.rs rename to src/test/ui/uninhabited/uninhabited-matches-feature-gated.rs diff --git a/src/test/ui/compile-fail-migration/uninhabited-matches-feature-gated.stderr b/src/test/ui/uninhabited/uninhabited-matches-feature-gated.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/uninhabited-matches-feature-gated.stderr rename to src/test/ui/uninhabited/uninhabited-matches-feature-gated.stderr diff --git a/src/test/ui/compile-fail-migration/uninhabited-patterns.rs b/src/test/ui/uninhabited/uninhabited-patterns.rs similarity index 100% rename from src/test/ui/compile-fail-migration/uninhabited-patterns.rs rename to src/test/ui/uninhabited/uninhabited-patterns.rs diff --git a/src/test/ui/compile-fail-migration/uninhabited-patterns.stderr b/src/test/ui/uninhabited/uninhabited-patterns.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/uninhabited-patterns.stderr rename to src/test/ui/uninhabited/uninhabited-patterns.stderr diff --git a/src/test/ui/compile-fail-migration/union-ub-fat-ptr.rs b/src/test/ui/union-ub-fat-ptr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/union-ub-fat-ptr.rs rename to src/test/ui/union-ub-fat-ptr.rs diff --git a/src/test/ui/compile-fail-migration/union-ub-fat-ptr.stderr b/src/test/ui/union-ub-fat-ptr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/union-ub-fat-ptr.stderr rename to src/test/ui/union-ub-fat-ptr.stderr diff --git a/src/test/ui/compile-fail-migration/union/union-borrow-move-parent-sibling.nll.stderr b/src/test/ui/union/union-borrow-move-parent-sibling.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-borrow-move-parent-sibling.nll.stderr rename to src/test/ui/union/union-borrow-move-parent-sibling.nll.stderr diff --git a/src/test/ui/compile-fail-migration/union/union-borrow-move-parent-sibling.rs b/src/test/ui/union/union-borrow-move-parent-sibling.rs similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-borrow-move-parent-sibling.rs rename to src/test/ui/union/union-borrow-move-parent-sibling.rs diff --git a/src/test/ui/compile-fail-migration/union/union-borrow-move-parent-sibling.stderr b/src/test/ui/union/union-borrow-move-parent-sibling.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-borrow-move-parent-sibling.stderr rename to src/test/ui/union/union-borrow-move-parent-sibling.stderr diff --git a/src/test/ui/compile-fail-migration/union/union-const-pat.rs b/src/test/ui/union/union-const-pat.rs similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-const-pat.rs rename to src/test/ui/union/union-const-pat.rs diff --git a/src/test/ui/compile-fail-migration/union/union-const-pat.stderr b/src/test/ui/union/union-const-pat.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-const-pat.stderr rename to src/test/ui/union/union-const-pat.stderr diff --git a/src/test/ui/compile-fail-migration/union/union-copy.rs b/src/test/ui/union/union-copy.rs similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-copy.rs rename to src/test/ui/union/union-copy.rs diff --git a/src/test/ui/compile-fail-migration/union/union-copy.stderr b/src/test/ui/union/union-copy.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-copy.stderr rename to src/test/ui/union/union-copy.stderr diff --git a/src/test/ui/compile-fail-migration/union/union-derive-clone.rs b/src/test/ui/union/union-derive-clone.rs similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-derive-clone.rs rename to src/test/ui/union/union-derive-clone.rs diff --git a/src/test/ui/compile-fail-migration/union/union-derive-clone.stderr b/src/test/ui/union/union-derive-clone.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-derive-clone.stderr rename to src/test/ui/union/union-derive-clone.stderr diff --git a/src/test/ui/compile-fail-migration/union/union-derive.rs b/src/test/ui/union/union-derive.rs similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-derive.rs rename to src/test/ui/union/union-derive.rs diff --git a/src/test/ui/compile-fail-migration/union/union-derive.stderr b/src/test/ui/union/union-derive.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-derive.stderr rename to src/test/ui/union/union-derive.stderr diff --git a/src/test/ui/compile-fail-migration/union/union-empty.rs b/src/test/ui/union/union-empty.rs similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-empty.rs rename to src/test/ui/union/union-empty.rs diff --git a/src/test/ui/compile-fail-migration/union/union-empty.stderr b/src/test/ui/union/union-empty.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-empty.stderr rename to src/test/ui/union/union-empty.stderr diff --git a/src/test/ui/compile-fail-migration/union/union-generic.rs b/src/test/ui/union/union-generic.rs similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-generic.rs rename to src/test/ui/union/union-generic.rs diff --git a/src/test/ui/compile-fail-migration/union/union-generic.stderr b/src/test/ui/union/union-generic.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-generic.stderr rename to src/test/ui/union/union-generic.stderr diff --git a/src/test/ui/compile-fail-migration/union/union-lint-dead-code.rs b/src/test/ui/union/union-lint-dead-code.rs similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-lint-dead-code.rs rename to src/test/ui/union/union-lint-dead-code.rs diff --git a/src/test/ui/compile-fail-migration/union/union-lint-dead-code.stderr b/src/test/ui/union/union-lint-dead-code.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-lint-dead-code.stderr rename to src/test/ui/union/union-lint-dead-code.stderr diff --git a/src/test/ui/compile-fail-migration/union/union-nonrepresentable.rs b/src/test/ui/union/union-nonrepresentable.rs similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-nonrepresentable.rs rename to src/test/ui/union/union-nonrepresentable.rs diff --git a/src/test/ui/compile-fail-migration/union/union-nonrepresentable.stderr b/src/test/ui/union/union-nonrepresentable.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-nonrepresentable.stderr rename to src/test/ui/union/union-nonrepresentable.stderr diff --git a/src/test/ui/compile-fail-migration/union/union-repr-c.rs b/src/test/ui/union/union-repr-c.rs similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-repr-c.rs rename to src/test/ui/union/union-repr-c.rs diff --git a/src/test/ui/compile-fail-migration/union/union-repr-c.stderr b/src/test/ui/union/union-repr-c.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-repr-c.stderr rename to src/test/ui/union/union-repr-c.stderr diff --git a/src/test/ui/compile-fail-migration/union/union-unsafe.rs b/src/test/ui/union/union-unsafe.rs similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-unsafe.rs rename to src/test/ui/union/union-unsafe.rs diff --git a/src/test/ui/compile-fail-migration/union/union-unsafe.stderr b/src/test/ui/union/union-unsafe.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-unsafe.stderr rename to src/test/ui/union/union-unsafe.stderr diff --git a/src/test/ui/compile-fail-migration/union/union-unsized.rs b/src/test/ui/union/union-unsized.rs similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-unsized.rs rename to src/test/ui/union/union-unsized.rs diff --git a/src/test/ui/compile-fail-migration/union/union-unsized.stderr b/src/test/ui/union/union-unsized.stderr similarity index 95% rename from src/test/ui/compile-fail-migration/union/union-unsized.stderr rename to src/test/ui/union/union-unsized.stderr index f23dc315425..e2da6035881 100644 --- a/src/test/ui/compile-fail-migration/union/union-unsized.stderr +++ b/src/test/ui/union/union-unsized.stderr @@ -5,7 +5,7 @@ LL | a: str, | ^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `str` - = note: to learn more, visit + = note: to learn more, visit = note: no field of a union may have a dynamically sized type error[E0277]: the size for values of type `str` cannot be known at compilation time @@ -15,7 +15,7 @@ LL | b: str, | ^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `str` - = note: to learn more, visit + = note: to learn more, visit = note: no field of a union may have a dynamically sized type error: aborting due to 2 previous errors diff --git a/src/test/ui/compile-fail-migration/union/union-with-drop-fields-lint.rs b/src/test/ui/union/union-with-drop-fields-lint.rs similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-with-drop-fields-lint.rs rename to src/test/ui/union/union-with-drop-fields-lint.rs diff --git a/src/test/ui/compile-fail-migration/union/union-with-drop-fields-lint.stderr b/src/test/ui/union/union-with-drop-fields-lint.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/union/union-with-drop-fields-lint.stderr rename to src/test/ui/union/union-with-drop-fields-lint.stderr diff --git a/src/test/ui/compile-fail-migration/unique-object-noncopyable.rs b/src/test/ui/unique-object-noncopyable.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unique-object-noncopyable.rs rename to src/test/ui/unique-object-noncopyable.rs diff --git a/src/test/ui/compile-fail-migration/unique-object-noncopyable.stderr b/src/test/ui/unique-object-noncopyable.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unique-object-noncopyable.stderr rename to src/test/ui/unique-object-noncopyable.stderr diff --git a/src/test/ui/compile-fail-migration/unique-pinned-nocopy.rs b/src/test/ui/unique-pinned-nocopy.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unique-pinned-nocopy.rs rename to src/test/ui/unique-pinned-nocopy.rs diff --git a/src/test/ui/compile-fail-migration/unique-pinned-nocopy.stderr b/src/test/ui/unique-pinned-nocopy.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unique-pinned-nocopy.stderr rename to src/test/ui/unique-pinned-nocopy.stderr diff --git a/src/test/ui/compile-fail-migration/unknown-lint-tool-name.rs b/src/test/ui/unknown-lint-tool-name.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unknown-lint-tool-name.rs rename to src/test/ui/unknown-lint-tool-name.rs diff --git a/src/test/ui/compile-fail-migration/unknown-lint-tool-name.stderr b/src/test/ui/unknown-lint-tool-name.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unknown-lint-tool-name.stderr rename to src/test/ui/unknown-lint-tool-name.stderr diff --git a/src/test/ui/compile-fail-migration/unknown-tool-name.rs b/src/test/ui/unknown-tool-name.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unknown-tool-name.rs rename to src/test/ui/unknown-tool-name.rs diff --git a/src/test/ui/compile-fail-migration/unknown-tool-name.stderr b/src/test/ui/unknown-tool-name.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unknown-tool-name.stderr rename to src/test/ui/unknown-tool-name.stderr diff --git a/src/test/ui/compile-fail-migration/unop-move-semantics.nll.stderr b/src/test/ui/unop-move-semantics.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unop-move-semantics.nll.stderr rename to src/test/ui/unop-move-semantics.nll.stderr diff --git a/src/test/ui/compile-fail-migration/unop-move-semantics.rs b/src/test/ui/unop-move-semantics.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unop-move-semantics.rs rename to src/test/ui/unop-move-semantics.rs diff --git a/src/test/ui/compile-fail-migration/unop-move-semantics.stderr b/src/test/ui/unop-move-semantics.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unop-move-semantics.stderr rename to src/test/ui/unop-move-semantics.stderr diff --git a/src/test/ui/compile-fail-migration/unop-neg-bool.rs b/src/test/ui/unop-neg-bool.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unop-neg-bool.rs rename to src/test/ui/unop-neg-bool.rs diff --git a/src/test/ui/compile-fail-migration/unop-neg-bool.stderr b/src/test/ui/unop-neg-bool.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unop-neg-bool.stderr rename to src/test/ui/unop-neg-bool.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/unreachable_variant.rs b/src/test/ui/unreachable/auxiliary/unreachable_variant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/unreachable_variant.rs rename to src/test/ui/unreachable/auxiliary/unreachable_variant.rs diff --git a/src/test/ui/compile-fail-migration/unreachable-arm.rs b/src/test/ui/unreachable/unreachable-arm.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unreachable-arm.rs rename to src/test/ui/unreachable/unreachable-arm.rs diff --git a/src/test/ui/compile-fail-migration/unreachable-arm.stderr b/src/test/ui/unreachable/unreachable-arm.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unreachable-arm.stderr rename to src/test/ui/unreachable/unreachable-arm.stderr diff --git a/src/test/ui/compile-fail-migration/unreachable-code.rs b/src/test/ui/unreachable/unreachable-code.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unreachable-code.rs rename to src/test/ui/unreachable/unreachable-code.rs diff --git a/src/test/ui/compile-fail-migration/unreachable-code.stderr b/src/test/ui/unreachable/unreachable-code.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unreachable-code.stderr rename to src/test/ui/unreachable/unreachable-code.stderr diff --git a/src/test/ui/compile-fail-migration/unreachable-in-call.rs b/src/test/ui/unreachable/unreachable-in-call.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unreachable-in-call.rs rename to src/test/ui/unreachable/unreachable-in-call.rs diff --git a/src/test/ui/compile-fail-migration/unreachable-in-call.stderr b/src/test/ui/unreachable/unreachable-in-call.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unreachable-in-call.stderr rename to src/test/ui/unreachable/unreachable-in-call.stderr diff --git a/src/test/ui/compile-fail-migration/unreachable-loop-patterns.rs b/src/test/ui/unreachable/unreachable-loop-patterns.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unreachable-loop-patterns.rs rename to src/test/ui/unreachable/unreachable-loop-patterns.rs diff --git a/src/test/ui/compile-fail-migration/unreachable-loop-patterns.stderr b/src/test/ui/unreachable/unreachable-loop-patterns.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unreachable-loop-patterns.stderr rename to src/test/ui/unreachable/unreachable-loop-patterns.stderr diff --git a/src/test/ui/compile-fail-migration/unreachable-try-pattern.rs b/src/test/ui/unreachable/unreachable-try-pattern.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unreachable-try-pattern.rs rename to src/test/ui/unreachable/unreachable-try-pattern.rs diff --git a/src/test/ui/compile-fail-migration/unreachable-try-pattern.stderr b/src/test/ui/unreachable/unreachable-try-pattern.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unreachable-try-pattern.stderr rename to src/test/ui/unreachable/unreachable-try-pattern.stderr diff --git a/src/test/ui/compile-fail-migration/unreachable-variant.rs b/src/test/ui/unreachable/unreachable-variant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unreachable-variant.rs rename to src/test/ui/unreachable/unreachable-variant.rs diff --git a/src/test/ui/compile-fail-migration/unreachable-variant.stderr b/src/test/ui/unreachable/unreachable-variant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unreachable-variant.stderr rename to src/test/ui/unreachable/unreachable-variant.stderr diff --git a/src/test/ui/compile-fail-migration/unresolved-extern-mod-suggestion.rs b/src/test/ui/unresolved/unresolved-extern-mod-suggestion.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unresolved-extern-mod-suggestion.rs rename to src/test/ui/unresolved/unresolved-extern-mod-suggestion.rs diff --git a/src/test/ui/compile-fail-migration/unresolved-extern-mod-suggestion.stderr b/src/test/ui/unresolved/unresolved-extern-mod-suggestion.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unresolved-extern-mod-suggestion.stderr rename to src/test/ui/unresolved/unresolved-extern-mod-suggestion.stderr diff --git a/src/test/ui/compile-fail-migration/unresolved-import-recovery.rs b/src/test/ui/unresolved/unresolved-import-recovery.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unresolved-import-recovery.rs rename to src/test/ui/unresolved/unresolved-import-recovery.rs diff --git a/src/test/ui/compile-fail-migration/unresolved-import-recovery.stderr b/src/test/ui/unresolved/unresolved-import-recovery.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unresolved-import-recovery.stderr rename to src/test/ui/unresolved/unresolved-import-recovery.stderr diff --git a/src/test/ui/compile-fail-migration/unresolved-import.rs b/src/test/ui/unresolved/unresolved-import.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unresolved-import.rs rename to src/test/ui/unresolved/unresolved-import.rs diff --git a/src/test/ui/compile-fail-migration/unresolved-import.stderr b/src/test/ui/unresolved/unresolved-import.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unresolved-import.stderr rename to src/test/ui/unresolved/unresolved-import.stderr diff --git a/src/test/ui/compile-fail-migration/unsafe-around-compiler-generated-unsafe.rs b/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-around-compiler-generated-unsafe.rs rename to src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.rs diff --git a/src/test/ui/compile-fail-migration/unsafe-around-compiler-generated-unsafe.stderr b/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-around-compiler-generated-unsafe.stderr rename to src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.stderr diff --git a/src/test/ui/unsafe-block-without-braces.rs b/src/test/ui/unsafe/unsafe-block-without-braces.rs similarity index 100% rename from src/test/ui/unsafe-block-without-braces.rs rename to src/test/ui/unsafe/unsafe-block-without-braces.rs diff --git a/src/test/ui/unsafe-block-without-braces.stderr b/src/test/ui/unsafe/unsafe-block-without-braces.stderr similarity index 100% rename from src/test/ui/unsafe-block-without-braces.stderr rename to src/test/ui/unsafe/unsafe-block-without-braces.stderr diff --git a/src/test/ui/unsafe-const-fn.rs b/src/test/ui/unsafe/unsafe-const-fn.rs similarity index 100% rename from src/test/ui/unsafe-const-fn.rs rename to src/test/ui/unsafe/unsafe-const-fn.rs diff --git a/src/test/ui/unsafe-const-fn.stderr b/src/test/ui/unsafe/unsafe-const-fn.stderr similarity index 100% rename from src/test/ui/unsafe-const-fn.stderr rename to src/test/ui/unsafe/unsafe-const-fn.stderr diff --git a/src/test/ui/compile-fail-migration/unsafe-fn-assign-deref-ptr.rs b/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-fn-assign-deref-ptr.rs rename to src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.rs diff --git a/src/test/ui/compile-fail-migration/unsafe-fn-assign-deref-ptr.stderr b/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-fn-assign-deref-ptr.stderr rename to src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.stderr diff --git a/src/test/ui/compile-fail-migration/unsafe-fn-autoderef.rs b/src/test/ui/unsafe/unsafe-fn-autoderef.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-fn-autoderef.rs rename to src/test/ui/unsafe/unsafe-fn-autoderef.rs diff --git a/src/test/ui/compile-fail-migration/unsafe-fn-autoderef.stderr b/src/test/ui/unsafe/unsafe-fn-autoderef.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-fn-autoderef.stderr rename to src/test/ui/unsafe/unsafe-fn-autoderef.stderr diff --git a/src/test/ui/compile-fail-migration/unsafe-fn-called-from-safe.rs b/src/test/ui/unsafe/unsafe-fn-called-from-safe.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-fn-called-from-safe.rs rename to src/test/ui/unsafe/unsafe-fn-called-from-safe.rs diff --git a/src/test/ui/compile-fail-migration/unsafe-fn-called-from-safe.stderr b/src/test/ui/unsafe/unsafe-fn-called-from-safe.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-fn-called-from-safe.stderr rename to src/test/ui/unsafe/unsafe-fn-called-from-safe.stderr diff --git a/src/test/ui/compile-fail-migration/unsafe-fn-deref-ptr.rs b/src/test/ui/unsafe/unsafe-fn-deref-ptr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-fn-deref-ptr.rs rename to src/test/ui/unsafe/unsafe-fn-deref-ptr.rs diff --git a/src/test/ui/compile-fail-migration/unsafe-fn-deref-ptr.stderr b/src/test/ui/unsafe/unsafe-fn-deref-ptr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-fn-deref-ptr.stderr rename to src/test/ui/unsafe/unsafe-fn-deref-ptr.stderr diff --git a/src/test/ui/compile-fail-migration/unsafe-fn-used-as-value.rs b/src/test/ui/unsafe/unsafe-fn-used-as-value.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-fn-used-as-value.rs rename to src/test/ui/unsafe/unsafe-fn-used-as-value.rs diff --git a/src/test/ui/compile-fail-migration/unsafe-fn-used-as-value.stderr b/src/test/ui/unsafe/unsafe-fn-used-as-value.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-fn-used-as-value.stderr rename to src/test/ui/unsafe/unsafe-fn-used-as-value.stderr diff --git a/src/test/ui/compile-fail-migration/unsafe-move-val-init.rs b/src/test/ui/unsafe/unsafe-move-val-init.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-move-val-init.rs rename to src/test/ui/unsafe/unsafe-move-val-init.rs diff --git a/src/test/ui/compile-fail-migration/unsafe-move-val-init.stderr b/src/test/ui/unsafe/unsafe-move-val-init.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-move-val-init.stderr rename to src/test/ui/unsafe/unsafe-move-val-init.stderr diff --git a/src/test/ui/compile-fail-migration/unsafe-subtyping.rs b/src/test/ui/unsafe/unsafe-subtyping.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-subtyping.rs rename to src/test/ui/unsafe/unsafe-subtyping.rs diff --git a/src/test/ui/compile-fail-migration/unsafe-subtyping.stderr b/src/test/ui/unsafe/unsafe-subtyping.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-subtyping.stderr rename to src/test/ui/unsafe/unsafe-subtyping.stderr diff --git a/src/test/ui/compile-fail-migration/unsafe-trait-impl.rs b/src/test/ui/unsafe/unsafe-trait-impl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-trait-impl.rs rename to src/test/ui/unsafe/unsafe-trait-impl.rs diff --git a/src/test/ui/compile-fail-migration/unsafe-trait-impl.stderr b/src/test/ui/unsafe/unsafe-trait-impl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unsafe-trait-impl.stderr rename to src/test/ui/unsafe/unsafe-trait-impl.stderr diff --git a/src/test/ui/compile-fail-migration/unsized-bare-typaram.rs b/src/test/ui/unsized/unsized-bare-typaram.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsized-bare-typaram.rs rename to src/test/ui/unsized/unsized-bare-typaram.rs diff --git a/src/test/ui/compile-fail-migration/unsized-bare-typaram.stderr b/src/test/ui/unsized/unsized-bare-typaram.stderr similarity index 96% rename from src/test/ui/compile-fail-migration/unsized-bare-typaram.stderr rename to src/test/ui/unsized/unsized-bare-typaram.stderr index 884d7acff03..314e47baaad 100644 --- a/src/test/ui/compile-fail-migration/unsized-bare-typaram.stderr +++ b/src/test/ui/unsized/unsized-bare-typaram.stderr @@ -5,7 +5,7 @@ LL | fn foo() { bar::() } | ^^^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `T` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where T: std::marker::Sized` bound note: required by `bar` --> $DIR/unsized-bare-typaram.rs:11:1 diff --git a/src/test/ui/compile-fail-migration/unsized-enum.rs b/src/test/ui/unsized/unsized-enum.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsized-enum.rs rename to src/test/ui/unsized/unsized-enum.rs diff --git a/src/test/ui/compile-fail-migration/unsized-enum.stderr b/src/test/ui/unsized/unsized-enum.stderr similarity index 96% rename from src/test/ui/compile-fail-migration/unsized-enum.stderr rename to src/test/ui/unsized/unsized-enum.stderr index 7e965fbda52..f518859c37c 100644 --- a/src/test/ui/compile-fail-migration/unsized-enum.stderr +++ b/src/test/ui/unsized/unsized-enum.stderr @@ -5,7 +5,7 @@ LL | fn foo2() { not_sized::>() } | ^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `T` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where T: std::marker::Sized` bound note: required by `Foo` --> $DIR/unsized-enum.rs:15:1 diff --git a/src/test/ui/unsized-enum2.rs b/src/test/ui/unsized/unsized-enum2.rs similarity index 100% rename from src/test/ui/unsized-enum2.rs rename to src/test/ui/unsized/unsized-enum2.rs diff --git a/src/test/ui/unsized-enum2.stderr b/src/test/ui/unsized/unsized-enum2.stderr similarity index 100% rename from src/test/ui/unsized-enum2.stderr rename to src/test/ui/unsized/unsized-enum2.stderr diff --git a/src/test/ui/compile-fail-migration/unsized-inherent-impl-self-type.rs b/src/test/ui/unsized/unsized-inherent-impl-self-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsized-inherent-impl-self-type.rs rename to src/test/ui/unsized/unsized-inherent-impl-self-type.rs diff --git a/src/test/ui/compile-fail-migration/unsized-inherent-impl-self-type.stderr b/src/test/ui/unsized/unsized-inherent-impl-self-type.stderr similarity index 96% rename from src/test/ui/compile-fail-migration/unsized-inherent-impl-self-type.stderr rename to src/test/ui/unsized/unsized-inherent-impl-self-type.stderr index e89a3bffe9a..8b6d9c610d1 100644 --- a/src/test/ui/compile-fail-migration/unsized-inherent-impl-self-type.stderr +++ b/src/test/ui/unsized/unsized-inherent-impl-self-type.stderr @@ -5,7 +5,7 @@ LL | impl S5 { | ^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound note: required by `S5` --> $DIR/unsized-inherent-impl-self-type.rs:15:1 diff --git a/src/test/ui/compile-fail-migration/unsized-struct.rs b/src/test/ui/unsized/unsized-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsized-struct.rs rename to src/test/ui/unsized/unsized-struct.rs diff --git a/src/test/ui/compile-fail-migration/unsized-struct.stderr b/src/test/ui/unsized/unsized-struct.stderr similarity index 96% rename from src/test/ui/compile-fail-migration/unsized-struct.stderr rename to src/test/ui/unsized/unsized-struct.stderr index 7a089b76a44..0e2d000d5f0 100644 --- a/src/test/ui/compile-fail-migration/unsized-struct.stderr +++ b/src/test/ui/unsized/unsized-struct.stderr @@ -5,7 +5,7 @@ LL | fn foo2() { not_sized::>() } | ^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `T` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where T: std::marker::Sized` bound note: required by `Foo` --> $DIR/unsized-struct.rs:15:1 @@ -20,7 +20,7 @@ LL | fn bar2() { is_sized::>() } | ^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time | = help: within `Bar`, the trait `std::marker::Sized` is not implemented for `T` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where T: std::marker::Sized` bound = note: required because it appears within the type `Bar` note: required by `is_sized` diff --git a/src/test/ui/compile-fail-migration/unsized-trait-impl-self-type.rs b/src/test/ui/unsized/unsized-trait-impl-self-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsized-trait-impl-self-type.rs rename to src/test/ui/unsized/unsized-trait-impl-self-type.rs diff --git a/src/test/ui/compile-fail-migration/unsized-trait-impl-self-type.stderr b/src/test/ui/unsized/unsized-trait-impl-self-type.stderr similarity index 96% rename from src/test/ui/compile-fail-migration/unsized-trait-impl-self-type.stderr rename to src/test/ui/unsized/unsized-trait-impl-self-type.stderr index 4bb9bd48358..b51787ef105 100644 --- a/src/test/ui/compile-fail-migration/unsized-trait-impl-self-type.stderr +++ b/src/test/ui/unsized/unsized-trait-impl-self-type.stderr @@ -5,7 +5,7 @@ LL | impl T3 for S5 { | ^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound note: required by `S5` --> $DIR/unsized-trait-impl-self-type.rs:18:1 diff --git a/src/test/ui/compile-fail-migration/unsized-trait-impl-trait-arg.rs b/src/test/ui/unsized/unsized-trait-impl-trait-arg.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsized-trait-impl-trait-arg.rs rename to src/test/ui/unsized/unsized-trait-impl-trait-arg.rs diff --git a/src/test/ui/compile-fail-migration/unsized-trait-impl-trait-arg.stderr b/src/test/ui/unsized/unsized-trait-impl-trait-arg.stderr similarity index 96% rename from src/test/ui/compile-fail-migration/unsized-trait-impl-trait-arg.stderr rename to src/test/ui/unsized/unsized-trait-impl-trait-arg.stderr index b4369755a0e..187fac9626d 100644 --- a/src/test/ui/compile-fail-migration/unsized-trait-impl-trait-arg.stderr +++ b/src/test/ui/unsized/unsized-trait-impl-trait-arg.stderr @@ -5,7 +5,7 @@ LL | impl T2 for S4 { | ^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound error: aborting due to previous error diff --git a/src/test/ui/compile-fail-migration/unsized3.rs b/src/test/ui/unsized3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsized3.rs rename to src/test/ui/unsized3.rs diff --git a/src/test/ui/compile-fail-migration/unsized3.stderr b/src/test/ui/unsized3.stderr similarity index 96% rename from src/test/ui/compile-fail-migration/unsized3.stderr rename to src/test/ui/unsized3.stderr index 3e01248d7d9..1d7b146b131 100644 --- a/src/test/ui/compile-fail-migration/unsized3.stderr +++ b/src/test/ui/unsized3.stderr @@ -5,7 +5,7 @@ LL | f2::(x); | ^^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound note: required by `f2` --> $DIR/unsized3.rs:20:1 @@ -20,7 +20,7 @@ LL | f4::(x); | ^^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound note: required by `f4` --> $DIR/unsized3.rs:31:1 @@ -35,7 +35,7 @@ LL | f5(x1); | ^^ doesn't have a size known at compile-time | = help: within `S`, the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: required because it appears within the type `S` note: required by `f5` @@ -51,7 +51,7 @@ LL | f5(&(*x1, 34)); | ^^ doesn't have a size known at compile-time | = help: within `S`, the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: required because it appears within the type `S` = note: only the last element of a tuple may have a dynamically sized type @@ -63,7 +63,7 @@ LL | f5(&(32, *x1)); | ^^^^^^^^^ doesn't have a size known at compile-time | = help: within `({integer}, S)`, the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: required because it appears within the type `S` = note: required because it appears within the type `({integer}, S)` @@ -76,7 +76,7 @@ LL | f5(&(32, *x1)); | ^^ doesn't have a size known at compile-time | = help: within `({integer}, S)`, the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: required because it appears within the type `S` = note: required because it appears within the type `({integer}, S)` diff --git a/src/test/ui/compile-fail-migration/unsized5.rs b/src/test/ui/unsized5.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsized5.rs rename to src/test/ui/unsized5.rs diff --git a/src/test/ui/compile-fail-migration/unsized5.stderr b/src/test/ui/unsized5.stderr similarity index 95% rename from src/test/ui/compile-fail-migration/unsized5.stderr rename to src/test/ui/unsized5.stderr index fa93ec236a5..73553f84981 100644 --- a/src/test/ui/compile-fail-migration/unsized5.stderr +++ b/src/test/ui/unsized5.stderr @@ -5,7 +5,7 @@ LL | f1: X, | ^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: only the last field of a struct may have a dynamically sized type @@ -16,7 +16,7 @@ LL | g: X, | ^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: only the last field of a struct may have a dynamically sized type @@ -27,7 +27,7 @@ LL | f: str, | ^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `str` - = note: to learn more, visit + = note: to learn more, visit = note: only the last field of a struct may have a dynamically sized type error[E0277]: the size for values of type `[u8]` cannot be known at compilation time @@ -37,7 +37,7 @@ LL | f: [u8], | ^^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `[u8]` - = note: to learn more, visit + = note: to learn more, visit = note: only the last field of a struct may have a dynamically sized type error[E0277]: the size for values of type `X` cannot be known at compilation time @@ -47,7 +47,7 @@ LL | V1(X, isize), | ^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: no field of an enum variant may have a dynamically sized type @@ -58,7 +58,7 @@ LL | V2{f1: X, f: isize}, | ^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: no field of an enum variant may have a dynamically sized type diff --git a/src/test/ui/compile-fail-migration/unsized6.rs b/src/test/ui/unsized6.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsized6.rs rename to src/test/ui/unsized6.rs diff --git a/src/test/ui/compile-fail-migration/unsized6.stderr b/src/test/ui/unsized6.stderr similarity index 95% rename from src/test/ui/compile-fail-migration/unsized6.stderr rename to src/test/ui/unsized6.stderr index 9f53369b12f..5dc12a344ad 100644 --- a/src/test/ui/compile-fail-migration/unsized6.stderr +++ b/src/test/ui/unsized6.stderr @@ -5,7 +5,7 @@ LL | let y: Y; | ^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `Y` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where Y: std::marker::Sized` bound = note: all local variables must have a statically known size @@ -16,7 +16,7 @@ LL | let _: (isize, (X, isize)); | ^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: only the last element of a tuple may have a dynamically sized type @@ -27,7 +27,7 @@ LL | let y: (isize, (Z, usize)); | ^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `Z` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where Z: std::marker::Sized` bound = note: only the last element of a tuple may have a dynamically sized type @@ -38,7 +38,7 @@ LL | let y: X; | ^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: all local variables must have a statically known size @@ -49,7 +49,7 @@ LL | let y: (isize, (Y, isize)); | ^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `Y` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where Y: std::marker::Sized` bound = note: only the last element of a tuple may have a dynamically sized type @@ -60,7 +60,7 @@ LL | let y: X = *x1; | ^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: all local variables must have a statically known size @@ -71,7 +71,7 @@ LL | let y = *x2; | ^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: all local variables must have a statically known size @@ -82,7 +82,7 @@ LL | let (y, z) = (*x3, 4); | ^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: all local variables must have a statically known size @@ -93,7 +93,7 @@ LL | let y: X = *x1; | ^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: all local variables must have a statically known size @@ -104,7 +104,7 @@ LL | let y = *x2; | ^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: all local variables must have a statically known size @@ -115,7 +115,7 @@ LL | let (y, z) = (*x3, 4); | ^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: all local variables must have a statically known size @@ -126,7 +126,7 @@ LL | fn g1(x: X) {} | ^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: all local variables must have a statically known size @@ -137,7 +137,7 @@ LL | fn g2(x: X) {} | ^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound = note: all local variables must have a statically known size diff --git a/src/test/ui/compile-fail-migration/unsized7.rs b/src/test/ui/unsized7.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsized7.rs rename to src/test/ui/unsized7.rs diff --git a/src/test/ui/compile-fail-migration/unsized7.stderr b/src/test/ui/unsized7.stderr similarity index 96% rename from src/test/ui/compile-fail-migration/unsized7.stderr rename to src/test/ui/unsized7.stderr index c5539d8d319..67217659fbc 100644 --- a/src/test/ui/compile-fail-migration/unsized7.stderr +++ b/src/test/ui/unsized7.stderr @@ -5,7 +5,7 @@ LL | impl T1 for S3 { | ^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `X` - = note: to learn more, visit + = note: to learn more, visit = help: consider adding a `where X: std::marker::Sized` bound error: aborting due to previous error diff --git a/src/test/ui/compile-fail-migration/unspecified-self-in-trait-ref.rs b/src/test/ui/unspecified-self-in-trait-ref.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unspecified-self-in-trait-ref.rs rename to src/test/ui/unspecified-self-in-trait-ref.rs diff --git a/src/test/ui/compile-fail-migration/unspecified-self-in-trait-ref.stderr b/src/test/ui/unspecified-self-in-trait-ref.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unspecified-self-in-trait-ref.stderr rename to src/test/ui/unspecified-self-in-trait-ref.stderr diff --git a/src/test/ui/compile-fail-migration/unsupported-cast.rs b/src/test/ui/unsupported-cast.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unsupported-cast.rs rename to src/test/ui/unsupported-cast.rs diff --git a/src/test/ui/compile-fail-migration/unsupported-cast.stderr b/src/test/ui/unsupported-cast.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unsupported-cast.stderr rename to src/test/ui/unsupported-cast.stderr diff --git a/src/test/ui/compile-fail-migration/unused-attr.rs b/src/test/ui/unused/unused-attr.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unused-attr.rs rename to src/test/ui/unused/unused-attr.rs diff --git a/src/test/ui/compile-fail-migration/unused-attr.stderr b/src/test/ui/unused/unused-attr.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unused-attr.stderr rename to src/test/ui/unused/unused-attr.stderr diff --git a/src/test/ui/compile-fail-migration/unused-macro-rules.rs b/src/test/ui/unused/unused-macro-rules.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unused-macro-rules.rs rename to src/test/ui/unused/unused-macro-rules.rs diff --git a/src/test/ui/compile-fail-migration/unused-macro-rules.stderr b/src/test/ui/unused/unused-macro-rules.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unused-macro-rules.stderr rename to src/test/ui/unused/unused-macro-rules.stderr diff --git a/src/test/ui/compile-fail-migration/unused-macro-with-bad-frag-spec.rs b/src/test/ui/unused/unused-macro-with-bad-frag-spec.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unused-macro-with-bad-frag-spec.rs rename to src/test/ui/unused/unused-macro-with-bad-frag-spec.rs diff --git a/src/test/ui/compile-fail-migration/unused-macro-with-bad-frag-spec.stderr b/src/test/ui/unused/unused-macro-with-bad-frag-spec.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unused-macro-with-bad-frag-spec.stderr rename to src/test/ui/unused/unused-macro-with-bad-frag-spec.stderr diff --git a/src/test/ui/compile-fail-migration/unused-macro-with-follow-violation.rs b/src/test/ui/unused/unused-macro-with-follow-violation.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unused-macro-with-follow-violation.rs rename to src/test/ui/unused/unused-macro-with-follow-violation.rs diff --git a/src/test/ui/compile-fail-migration/unused-macro-with-follow-violation.stderr b/src/test/ui/unused/unused-macro-with-follow-violation.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unused-macro-with-follow-violation.stderr rename to src/test/ui/unused/unused-macro-with-follow-violation.stderr diff --git a/src/test/ui/compile-fail-migration/unused-macro.rs b/src/test/ui/unused/unused-macro.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unused-macro.rs rename to src/test/ui/unused/unused-macro.rs diff --git a/src/test/ui/compile-fail-migration/unused-macro.stderr b/src/test/ui/unused/unused-macro.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unused-macro.stderr rename to src/test/ui/unused/unused-macro.stderr diff --git a/src/test/ui/compile-fail-migration/unused-mut-warning-captured-var.rs b/src/test/ui/unused/unused-mut-warning-captured-var.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unused-mut-warning-captured-var.rs rename to src/test/ui/unused/unused-mut-warning-captured-var.rs diff --git a/src/test/ui/compile-fail-migration/unused-mut-warning-captured-var.stderr b/src/test/ui/unused/unused-mut-warning-captured-var.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unused-mut-warning-captured-var.stderr rename to src/test/ui/unused/unused-mut-warning-captured-var.stderr diff --git a/src/test/ui/compile-fail-migration/unused-result.rs b/src/test/ui/unused/unused-result.rs similarity index 100% rename from src/test/ui/compile-fail-migration/unused-result.rs rename to src/test/ui/unused/unused-result.rs diff --git a/src/test/ui/compile-fail-migration/unused-result.stderr b/src/test/ui/unused/unused-result.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/unused-result.stderr rename to src/test/ui/unused/unused-result.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/use_from_trait_xc.rs b/src/test/ui/use/auxiliary/use_from_trait_xc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/use_from_trait_xc.rs rename to src/test/ui/use/auxiliary/use_from_trait_xc.rs diff --git a/src/test/ui/compile-fail-migration/use-after-move-based-on-type.nll.stderr b/src/test/ui/use/use-after-move-based-on-type.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/use-after-move-based-on-type.nll.stderr rename to src/test/ui/use/use-after-move-based-on-type.nll.stderr diff --git a/src/test/ui/compile-fail-migration/use-after-move-based-on-type.rs b/src/test/ui/use/use-after-move-based-on-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/use-after-move-based-on-type.rs rename to src/test/ui/use/use-after-move-based-on-type.rs diff --git a/src/test/ui/compile-fail-migration/use-after-move-based-on-type.stderr b/src/test/ui/use/use-after-move-based-on-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/use-after-move-based-on-type.stderr rename to src/test/ui/use/use-after-move-based-on-type.stderr diff --git a/src/test/ui/compile-fail-migration/use-after-move-implicity-coerced-object.nll.stderr b/src/test/ui/use/use-after-move-implicity-coerced-object.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/use-after-move-implicity-coerced-object.nll.stderr rename to src/test/ui/use/use-after-move-implicity-coerced-object.nll.stderr diff --git a/src/test/ui/compile-fail-migration/use-after-move-implicity-coerced-object.rs b/src/test/ui/use/use-after-move-implicity-coerced-object.rs similarity index 100% rename from src/test/ui/compile-fail-migration/use-after-move-implicity-coerced-object.rs rename to src/test/ui/use/use-after-move-implicity-coerced-object.rs diff --git a/src/test/ui/compile-fail-migration/use-after-move-implicity-coerced-object.stderr b/src/test/ui/use/use-after-move-implicity-coerced-object.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/use-after-move-implicity-coerced-object.stderr rename to src/test/ui/use/use-after-move-implicity-coerced-object.stderr diff --git a/src/test/ui/compile-fail-migration/use-after-move-self-based-on-type.rs b/src/test/ui/use/use-after-move-self-based-on-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/use-after-move-self-based-on-type.rs rename to src/test/ui/use/use-after-move-self-based-on-type.rs diff --git a/src/test/ui/compile-fail-migration/use-after-move-self-based-on-type.stderr b/src/test/ui/use/use-after-move-self-based-on-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/use-after-move-self-based-on-type.stderr rename to src/test/ui/use/use-after-move-self-based-on-type.stderr diff --git a/src/test/ui/compile-fail-migration/use-after-move-self.nll.stderr b/src/test/ui/use/use-after-move-self.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/use-after-move-self.nll.stderr rename to src/test/ui/use/use-after-move-self.nll.stderr diff --git a/src/test/ui/compile-fail-migration/use-after-move-self.rs b/src/test/ui/use/use-after-move-self.rs similarity index 100% rename from src/test/ui/compile-fail-migration/use-after-move-self.rs rename to src/test/ui/use/use-after-move-self.rs diff --git a/src/test/ui/compile-fail-migration/use-after-move-self.stderr b/src/test/ui/use/use-after-move-self.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/use-after-move-self.stderr rename to src/test/ui/use/use-after-move-self.stderr diff --git a/src/test/ui/compile-fail-migration/use-from-trait-xc.rs b/src/test/ui/use/use-from-trait-xc.rs similarity index 100% rename from src/test/ui/compile-fail-migration/use-from-trait-xc.rs rename to src/test/ui/use/use-from-trait-xc.rs diff --git a/src/test/ui/compile-fail-migration/use-from-trait-xc.stderr b/src/test/ui/use/use-from-trait-xc.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/use-from-trait-xc.stderr rename to src/test/ui/use/use-from-trait-xc.stderr diff --git a/src/test/ui/compile-fail-migration/use-from-trait.rs b/src/test/ui/use/use-from-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/use-from-trait.rs rename to src/test/ui/use/use-from-trait.rs diff --git a/src/test/ui/compile-fail-migration/use-from-trait.stderr b/src/test/ui/use/use-from-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/use-from-trait.stderr rename to src/test/ui/use/use-from-trait.stderr diff --git a/src/test/ui/compile-fail-migration/use-keyword.rs b/src/test/ui/use/use-keyword.rs similarity index 100% rename from src/test/ui/compile-fail-migration/use-keyword.rs rename to src/test/ui/use/use-keyword.rs diff --git a/src/test/ui/compile-fail-migration/use-keyword.stderr b/src/test/ui/use/use-keyword.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/use-keyword.stderr rename to src/test/ui/use/use-keyword.stderr diff --git a/src/test/ui/compile-fail-migration/use-meta-mismatch.rs b/src/test/ui/use/use-meta-mismatch.rs similarity index 100% rename from src/test/ui/compile-fail-migration/use-meta-mismatch.rs rename to src/test/ui/use/use-meta-mismatch.rs diff --git a/src/test/ui/compile-fail-migration/use-meta-mismatch.stderr b/src/test/ui/use/use-meta-mismatch.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/use-meta-mismatch.stderr rename to src/test/ui/use/use-meta-mismatch.stderr diff --git a/src/test/ui/use-mod.rs b/src/test/ui/use/use-mod.rs similarity index 100% rename from src/test/ui/use-mod.rs rename to src/test/ui/use/use-mod.rs diff --git a/src/test/ui/use-mod.stderr b/src/test/ui/use/use-mod.stderr similarity index 100% rename from src/test/ui/use-mod.stderr rename to src/test/ui/use/use-mod.stderr diff --git a/src/test/ui/compile-fail-migration/use-mod-2.rs b/src/test/ui/use/use-mod/use-mod-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/use-mod-2.rs rename to src/test/ui/use/use-mod/use-mod-2.rs diff --git a/src/test/ui/compile-fail-migration/use-mod-2.stderr b/src/test/ui/use/use-mod/use-mod-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/use-mod-2.stderr rename to src/test/ui/use/use-mod/use-mod-2.stderr diff --git a/src/test/ui/compile-fail-migration/use-mod-3.rs b/src/test/ui/use/use-mod/use-mod-3.rs similarity index 100% rename from src/test/ui/compile-fail-migration/use-mod-3.rs rename to src/test/ui/use/use-mod/use-mod-3.rs diff --git a/src/test/ui/compile-fail-migration/use-mod-3.stderr b/src/test/ui/use/use-mod/use-mod-3.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/use-mod-3.stderr rename to src/test/ui/use/use-mod/use-mod-3.stderr diff --git a/src/test/ui/compile-fail-migration/use-mod-4.rs b/src/test/ui/use/use-mod/use-mod-4.rs similarity index 100% rename from src/test/ui/compile-fail-migration/use-mod-4.rs rename to src/test/ui/use/use-mod/use-mod-4.rs diff --git a/src/test/ui/compile-fail-migration/use-mod-4.stderr b/src/test/ui/use/use-mod/use-mod-4.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/use-mod-4.stderr rename to src/test/ui/use/use-mod/use-mod-4.stderr diff --git a/src/test/ui/use-nested-groups-error.rs b/src/test/ui/use/use-nested-groups-error.rs similarity index 100% rename from src/test/ui/use-nested-groups-error.rs rename to src/test/ui/use/use-nested-groups-error.rs diff --git a/src/test/ui/use-nested-groups-error.stderr b/src/test/ui/use/use-nested-groups-error.stderr similarity index 100% rename from src/test/ui/use-nested-groups-error.stderr rename to src/test/ui/use/use-nested-groups-error.stderr diff --git a/src/test/ui/use-nested-groups-unused-imports.rs b/src/test/ui/use/use-nested-groups-unused-imports.rs similarity index 100% rename from src/test/ui/use-nested-groups-unused-imports.rs rename to src/test/ui/use/use-nested-groups-unused-imports.rs diff --git a/src/test/ui/use-nested-groups-unused-imports.stderr b/src/test/ui/use/use-nested-groups-unused-imports.stderr similarity index 100% rename from src/test/ui/use-nested-groups-unused-imports.stderr rename to src/test/ui/use/use-nested-groups-unused-imports.stderr diff --git a/src/test/ui/compile-fail-migration/use-paths-as-items.rs b/src/test/ui/use/use-paths-as-items.rs similarity index 100% rename from src/test/ui/compile-fail-migration/use-paths-as-items.rs rename to src/test/ui/use/use-paths-as-items.rs diff --git a/src/test/ui/compile-fail-migration/use-paths-as-items.stderr b/src/test/ui/use/use-paths-as-items.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/use-paths-as-items.stderr rename to src/test/ui/use/use-paths-as-items.stderr diff --git a/src/test/ui/compile-fail-migration/use-self-type.rs b/src/test/ui/use/use-self-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/use-self-type.rs rename to src/test/ui/use/use-self-type.rs diff --git a/src/test/ui/compile-fail-migration/use-self-type.stderr b/src/test/ui/use/use-self-type.stderr similarity index 83% rename from src/test/ui/compile-fail-migration/use-self-type.stderr rename to src/test/ui/use/use-self-type.stderr index 1a3bf5a9e88..5a1e5ea2595 100644 --- a/src/test/ui/compile-fail-migration/use-self-type.stderr +++ b/src/test/ui/use/use-self-type.stderr @@ -4,11 +4,11 @@ error[E0433]: failed to resolve. Use of undeclared type or module `Self` LL | pub(in Self::f) struct Z; //~ ERROR Use of undeclared type or module `Self` | ^^^^ Use of undeclared type or module `Self` -error[E0432]: unresolved import +error[E0432]: unresolved import `Self` --> $DIR/use-self-type.rs:16:13 | LL | use Self::f; //~ ERROR unresolved import - | ^^^^^^^ + | ^^^^ Use of undeclared type or module `Self` error: aborting due to 2 previous errors diff --git a/src/test/ui/compile-fail-migration/use-super-global-path.rs b/src/test/ui/use/use-super-global-path.rs similarity index 100% rename from src/test/ui/compile-fail-migration/use-super-global-path.rs rename to src/test/ui/use/use-super-global-path.rs diff --git a/src/test/ui/compile-fail-migration/use-super-global-path.stderr b/src/test/ui/use/use-super-global-path.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/use-super-global-path.stderr rename to src/test/ui/use/use-super-global-path.stderr diff --git a/src/test/ui/compile-fail-migration/used.rs b/src/test/ui/used.rs similarity index 100% rename from src/test/ui/compile-fail-migration/used.rs rename to src/test/ui/used.rs diff --git a/src/test/ui/compile-fail-migration/used.stderr b/src/test/ui/used.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/used.stderr rename to src/test/ui/used.stderr diff --git a/src/test/ui/compile-fail-migration/useless-pub.rs b/src/test/ui/useless-pub.rs similarity index 100% rename from src/test/ui/compile-fail-migration/useless-pub.rs rename to src/test/ui/useless-pub.rs diff --git a/src/test/ui/compile-fail-migration/useless-pub.stderr b/src/test/ui/useless-pub.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/useless-pub.stderr rename to src/test/ui/useless-pub.stderr diff --git a/src/test/ui/compile-fail-migration/useless_comment.rs b/src/test/ui/useless_comment.rs similarity index 100% rename from src/test/ui/compile-fail-migration/useless_comment.rs rename to src/test/ui/useless_comment.rs diff --git a/src/test/ui/compile-fail-migration/useless_comment.stderr b/src/test/ui/useless_comment.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/useless_comment.stderr rename to src/test/ui/useless_comment.stderr diff --git a/src/test/ui/compile-fail-migration/user-defined-macro-rules.rs b/src/test/ui/user-defined-macro-rules.rs similarity index 100% rename from src/test/ui/compile-fail-migration/user-defined-macro-rules.rs rename to src/test/ui/user-defined-macro-rules.rs diff --git a/src/test/ui/compile-fail-migration/user-defined-macro-rules.stderr b/src/test/ui/user-defined-macro-rules.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/user-defined-macro-rules.stderr rename to src/test/ui/user-defined-macro-rules.stderr diff --git a/src/test/ui/compile-fail-migration/utf8_idents.rs b/src/test/ui/utf8_idents.rs similarity index 100% rename from src/test/ui/compile-fail-migration/utf8_idents.rs rename to src/test/ui/utf8_idents.rs diff --git a/src/test/ui/compile-fail-migration/utf8_idents.stderr b/src/test/ui/utf8_idents.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/utf8_idents.stderr rename to src/test/ui/utf8_idents.stderr diff --git a/src/test/ui/compile-fail-migration/variadic-ffi-2.rs b/src/test/ui/variadic/variadic-ffi-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variadic-ffi-2.rs rename to src/test/ui/variadic/variadic-ffi-2.rs diff --git a/src/test/ui/compile-fail-migration/variadic-ffi-2.stderr b/src/test/ui/variadic/variadic-ffi-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variadic-ffi-2.stderr rename to src/test/ui/variadic/variadic-ffi-2.stderr diff --git a/src/test/ui/variadic-ffi-3.rs b/src/test/ui/variadic/variadic-ffi-3.rs similarity index 100% rename from src/test/ui/variadic-ffi-3.rs rename to src/test/ui/variadic/variadic-ffi-3.rs diff --git a/src/test/ui/variadic-ffi-3.stderr b/src/test/ui/variadic/variadic-ffi-3.stderr similarity index 100% rename from src/test/ui/variadic-ffi-3.stderr rename to src/test/ui/variadic/variadic-ffi-3.stderr diff --git a/src/test/ui/compile-fail-migration/variadic-ffi.rs b/src/test/ui/variadic/variadic-ffi.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variadic-ffi.rs rename to src/test/ui/variadic/variadic-ffi.rs diff --git a/src/test/ui/compile-fail-migration/variadic-ffi.stderr b/src/test/ui/variadic/variadic-ffi.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variadic-ffi.stderr rename to src/test/ui/variadic/variadic-ffi.stderr diff --git a/src/test/ui/compile-fail-migration/variance-associated-types.rs b/src/test/ui/variance/variance-associated-types.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-associated-types.rs rename to src/test/ui/variance/variance-associated-types.rs diff --git a/src/test/ui/compile-fail-migration/variance-associated-types.stderr b/src/test/ui/variance/variance-associated-types.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-associated-types.stderr rename to src/test/ui/variance/variance-associated-types.stderr diff --git a/src/test/ui/compile-fail-migration/variance-btree-invariant-types.nll.stderr b/src/test/ui/variance/variance-btree-invariant-types.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-btree-invariant-types.nll.stderr rename to src/test/ui/variance/variance-btree-invariant-types.nll.stderr diff --git a/src/test/ui/compile-fail-migration/variance-btree-invariant-types.rs b/src/test/ui/variance/variance-btree-invariant-types.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-btree-invariant-types.rs rename to src/test/ui/variance/variance-btree-invariant-types.rs diff --git a/src/test/ui/compile-fail-migration/variance-btree-invariant-types.stderr b/src/test/ui/variance/variance-btree-invariant-types.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-btree-invariant-types.stderr rename to src/test/ui/variance/variance-btree-invariant-types.stderr diff --git a/src/test/ui/compile-fail-migration/variance-cell-is-invariant.rs b/src/test/ui/variance/variance-cell-is-invariant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-cell-is-invariant.rs rename to src/test/ui/variance/variance-cell-is-invariant.rs diff --git a/src/test/ui/compile-fail-migration/variance-cell-is-invariant.stderr b/src/test/ui/variance/variance-cell-is-invariant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-cell-is-invariant.stderr rename to src/test/ui/variance/variance-cell-is-invariant.stderr diff --git a/src/test/ui/compile-fail-migration/variance-contravariant-arg-object.nll.stderr b/src/test/ui/variance/variance-contravariant-arg-object.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-contravariant-arg-object.nll.stderr rename to src/test/ui/variance/variance-contravariant-arg-object.nll.stderr diff --git a/src/test/ui/compile-fail-migration/variance-contravariant-arg-object.rs b/src/test/ui/variance/variance-contravariant-arg-object.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-contravariant-arg-object.rs rename to src/test/ui/variance/variance-contravariant-arg-object.rs diff --git a/src/test/ui/compile-fail-migration/variance-contravariant-arg-object.stderr b/src/test/ui/variance/variance-contravariant-arg-object.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-contravariant-arg-object.stderr rename to src/test/ui/variance/variance-contravariant-arg-object.stderr diff --git a/src/test/ui/compile-fail-migration/variance-contravariant-arg-trait-match.rs b/src/test/ui/variance/variance-contravariant-arg-trait-match.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-contravariant-arg-trait-match.rs rename to src/test/ui/variance/variance-contravariant-arg-trait-match.rs diff --git a/src/test/ui/compile-fail-migration/variance-contravariant-arg-trait-match.stderr b/src/test/ui/variance/variance-contravariant-arg-trait-match.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-contravariant-arg-trait-match.stderr rename to src/test/ui/variance/variance-contravariant-arg-trait-match.stderr diff --git a/src/test/ui/compile-fail-migration/variance-contravariant-self-trait-match.rs b/src/test/ui/variance/variance-contravariant-self-trait-match.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-contravariant-self-trait-match.rs rename to src/test/ui/variance/variance-contravariant-self-trait-match.rs diff --git a/src/test/ui/compile-fail-migration/variance-contravariant-self-trait-match.stderr b/src/test/ui/variance/variance-contravariant-self-trait-match.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-contravariant-self-trait-match.stderr rename to src/test/ui/variance/variance-contravariant-self-trait-match.stderr diff --git a/src/test/ui/compile-fail-migration/variance-covariant-arg-object.nll.stderr b/src/test/ui/variance/variance-covariant-arg-object.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-covariant-arg-object.nll.stderr rename to src/test/ui/variance/variance-covariant-arg-object.nll.stderr diff --git a/src/test/ui/compile-fail-migration/variance-covariant-arg-object.rs b/src/test/ui/variance/variance-covariant-arg-object.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-covariant-arg-object.rs rename to src/test/ui/variance/variance-covariant-arg-object.rs diff --git a/src/test/ui/compile-fail-migration/variance-covariant-arg-object.stderr b/src/test/ui/variance/variance-covariant-arg-object.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-covariant-arg-object.stderr rename to src/test/ui/variance/variance-covariant-arg-object.stderr diff --git a/src/test/ui/compile-fail-migration/variance-covariant-arg-trait-match.rs b/src/test/ui/variance/variance-covariant-arg-trait-match.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-covariant-arg-trait-match.rs rename to src/test/ui/variance/variance-covariant-arg-trait-match.rs diff --git a/src/test/ui/compile-fail-migration/variance-covariant-arg-trait-match.stderr b/src/test/ui/variance/variance-covariant-arg-trait-match.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-covariant-arg-trait-match.stderr rename to src/test/ui/variance/variance-covariant-arg-trait-match.stderr diff --git a/src/test/ui/compile-fail-migration/variance-covariant-self-trait-match.rs b/src/test/ui/variance/variance-covariant-self-trait-match.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-covariant-self-trait-match.rs rename to src/test/ui/variance/variance-covariant-self-trait-match.rs diff --git a/src/test/ui/compile-fail-migration/variance-covariant-self-trait-match.stderr b/src/test/ui/variance/variance-covariant-self-trait-match.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-covariant-self-trait-match.stderr rename to src/test/ui/variance/variance-covariant-self-trait-match.stderr diff --git a/src/test/ui/compile-fail-migration/variance-invariant-arg-object.nll.stderr b/src/test/ui/variance/variance-invariant-arg-object.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-invariant-arg-object.nll.stderr rename to src/test/ui/variance/variance-invariant-arg-object.nll.stderr diff --git a/src/test/ui/compile-fail-migration/variance-invariant-arg-object.rs b/src/test/ui/variance/variance-invariant-arg-object.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-invariant-arg-object.rs rename to src/test/ui/variance/variance-invariant-arg-object.rs diff --git a/src/test/ui/compile-fail-migration/variance-invariant-arg-object.stderr b/src/test/ui/variance/variance-invariant-arg-object.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-invariant-arg-object.stderr rename to src/test/ui/variance/variance-invariant-arg-object.stderr diff --git a/src/test/ui/compile-fail-migration/variance-invariant-arg-trait-match.rs b/src/test/ui/variance/variance-invariant-arg-trait-match.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-invariant-arg-trait-match.rs rename to src/test/ui/variance/variance-invariant-arg-trait-match.rs diff --git a/src/test/ui/compile-fail-migration/variance-invariant-arg-trait-match.stderr b/src/test/ui/variance/variance-invariant-arg-trait-match.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-invariant-arg-trait-match.stderr rename to src/test/ui/variance/variance-invariant-arg-trait-match.stderr diff --git a/src/test/ui/compile-fail-migration/variance-invariant-self-trait-match.rs b/src/test/ui/variance/variance-invariant-self-trait-match.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-invariant-self-trait-match.rs rename to src/test/ui/variance/variance-invariant-self-trait-match.rs diff --git a/src/test/ui/compile-fail-migration/variance-invariant-self-trait-match.stderr b/src/test/ui/variance/variance-invariant-self-trait-match.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-invariant-self-trait-match.stderr rename to src/test/ui/variance/variance-invariant-self-trait-match.stderr diff --git a/src/test/ui/compile-fail-migration/variance-issue-20533.nll.stderr b/src/test/ui/variance/variance-issue-20533.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-issue-20533.nll.stderr rename to src/test/ui/variance/variance-issue-20533.nll.stderr diff --git a/src/test/ui/compile-fail-migration/variance-issue-20533.rs b/src/test/ui/variance/variance-issue-20533.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-issue-20533.rs rename to src/test/ui/variance/variance-issue-20533.rs diff --git a/src/test/ui/compile-fail-migration/variance-issue-20533.stderr b/src/test/ui/variance/variance-issue-20533.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-issue-20533.stderr rename to src/test/ui/variance/variance-issue-20533.stderr diff --git a/src/test/ui/compile-fail-migration/variance-object-types.rs b/src/test/ui/variance/variance-object-types.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-object-types.rs rename to src/test/ui/variance/variance-object-types.rs diff --git a/src/test/ui/compile-fail-migration/variance-object-types.stderr b/src/test/ui/variance/variance-object-types.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-object-types.stderr rename to src/test/ui/variance/variance-object-types.stderr diff --git a/src/test/ui/compile-fail-migration/variance-regions-direct.rs b/src/test/ui/variance/variance-regions-direct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-regions-direct.rs rename to src/test/ui/variance/variance-regions-direct.rs diff --git a/src/test/ui/compile-fail-migration/variance-regions-direct.stderr b/src/test/ui/variance/variance-regions-direct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-regions-direct.stderr rename to src/test/ui/variance/variance-regions-direct.stderr diff --git a/src/test/ui/compile-fail-migration/variance-regions-indirect.rs b/src/test/ui/variance/variance-regions-indirect.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-regions-indirect.rs rename to src/test/ui/variance/variance-regions-indirect.rs diff --git a/src/test/ui/compile-fail-migration/variance-regions-indirect.stderr b/src/test/ui/variance/variance-regions-indirect.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-regions-indirect.stderr rename to src/test/ui/variance/variance-regions-indirect.stderr diff --git a/src/test/ui/compile-fail-migration/variance-regions-unused-direct.rs b/src/test/ui/variance/variance-regions-unused-direct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-regions-unused-direct.rs rename to src/test/ui/variance/variance-regions-unused-direct.rs diff --git a/src/test/ui/compile-fail-migration/variance-regions-unused-direct.stderr b/src/test/ui/variance/variance-regions-unused-direct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-regions-unused-direct.stderr rename to src/test/ui/variance/variance-regions-unused-direct.stderr diff --git a/src/test/ui/compile-fail-migration/variance-regions-unused-indirect.rs b/src/test/ui/variance/variance-regions-unused-indirect.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-regions-unused-indirect.rs rename to src/test/ui/variance/variance-regions-unused-indirect.rs diff --git a/src/test/ui/compile-fail-migration/variance-regions-unused-indirect.stderr b/src/test/ui/variance/variance-regions-unused-indirect.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-regions-unused-indirect.stderr rename to src/test/ui/variance/variance-regions-unused-indirect.stderr diff --git a/src/test/ui/compile-fail-migration/variance-trait-bounds.rs b/src/test/ui/variance/variance-trait-bounds.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-trait-bounds.rs rename to src/test/ui/variance/variance-trait-bounds.rs diff --git a/src/test/ui/compile-fail-migration/variance-trait-bounds.stderr b/src/test/ui/variance/variance-trait-bounds.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-trait-bounds.stderr rename to src/test/ui/variance/variance-trait-bounds.stderr diff --git a/src/test/ui/compile-fail-migration/variance-trait-matching.nll.stderr b/src/test/ui/variance/variance-trait-matching.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-trait-matching.nll.stderr rename to src/test/ui/variance/variance-trait-matching.nll.stderr diff --git a/src/test/ui/compile-fail-migration/variance-trait-matching.rs b/src/test/ui/variance/variance-trait-matching.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-trait-matching.rs rename to src/test/ui/variance/variance-trait-matching.rs diff --git a/src/test/ui/compile-fail-migration/variance-trait-matching.stderr b/src/test/ui/variance/variance-trait-matching.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-trait-matching.stderr rename to src/test/ui/variance/variance-trait-matching.stderr diff --git a/src/test/ui/compile-fail-migration/variance-trait-object-bound.rs b/src/test/ui/variance/variance-trait-object-bound.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-trait-object-bound.rs rename to src/test/ui/variance/variance-trait-object-bound.rs diff --git a/src/test/ui/compile-fail-migration/variance-trait-object-bound.stderr b/src/test/ui/variance/variance-trait-object-bound.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-trait-object-bound.stderr rename to src/test/ui/variance/variance-trait-object-bound.stderr diff --git a/src/test/ui/compile-fail-migration/variance-types-bounds.rs b/src/test/ui/variance/variance-types-bounds.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-types-bounds.rs rename to src/test/ui/variance/variance-types-bounds.rs diff --git a/src/test/ui/compile-fail-migration/variance-types-bounds.stderr b/src/test/ui/variance/variance-types-bounds.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-types-bounds.stderr rename to src/test/ui/variance/variance-types-bounds.stderr diff --git a/src/test/ui/compile-fail-migration/variance-types.rs b/src/test/ui/variance/variance-types.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-types.rs rename to src/test/ui/variance/variance-types.rs diff --git a/src/test/ui/compile-fail-migration/variance-types.stderr b/src/test/ui/variance/variance-types.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-types.stderr rename to src/test/ui/variance/variance-types.stderr diff --git a/src/test/ui/compile-fail-migration/variance-unused-region-param.rs b/src/test/ui/variance/variance-unused-region-param.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-unused-region-param.rs rename to src/test/ui/variance/variance-unused-region-param.rs diff --git a/src/test/ui/compile-fail-migration/variance-unused-region-param.stderr b/src/test/ui/variance/variance-unused-region-param.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-unused-region-param.stderr rename to src/test/ui/variance/variance-unused-region-param.stderr diff --git a/src/test/ui/variance-unused-type-param.rs b/src/test/ui/variance/variance-unused-type-param.rs similarity index 100% rename from src/test/ui/variance-unused-type-param.rs rename to src/test/ui/variance/variance-unused-type-param.rs diff --git a/src/test/ui/variance-unused-type-param.stderr b/src/test/ui/variance/variance-unused-type-param.stderr similarity index 100% rename from src/test/ui/variance-unused-type-param.stderr rename to src/test/ui/variance/variance-unused-type-param.stderr diff --git a/src/test/ui/compile-fail-migration/variance-use-contravariant-struct-1.nll.stderr b/src/test/ui/variance/variance-use-contravariant-struct-1.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-use-contravariant-struct-1.nll.stderr rename to src/test/ui/variance/variance-use-contravariant-struct-1.nll.stderr diff --git a/src/test/ui/compile-fail-migration/variance-use-contravariant-struct-1.rs b/src/test/ui/variance/variance-use-contravariant-struct-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-use-contravariant-struct-1.rs rename to src/test/ui/variance/variance-use-contravariant-struct-1.rs diff --git a/src/test/ui/compile-fail-migration/variance-use-contravariant-struct-1.stderr b/src/test/ui/variance/variance-use-contravariant-struct-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-use-contravariant-struct-1.stderr rename to src/test/ui/variance/variance-use-contravariant-struct-1.stderr diff --git a/src/test/ui/compile-fail-migration/variance-use-contravariant-struct-2.rs b/src/test/ui/variance/variance-use-contravariant-struct-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-use-contravariant-struct-2.rs rename to src/test/ui/variance/variance-use-contravariant-struct-2.rs diff --git a/src/test/ui/compile-fail-migration/variance-use-contravariant-struct-2.stderr b/src/test/ui/variance/variance-use-contravariant-struct-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-use-contravariant-struct-2.stderr rename to src/test/ui/variance/variance-use-contravariant-struct-2.stderr diff --git a/src/test/ui/compile-fail-migration/variance-use-covariant-struct-1.nll.stderr b/src/test/ui/variance/variance-use-covariant-struct-1.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-use-covariant-struct-1.nll.stderr rename to src/test/ui/variance/variance-use-covariant-struct-1.nll.stderr diff --git a/src/test/ui/compile-fail-migration/variance-use-covariant-struct-1.rs b/src/test/ui/variance/variance-use-covariant-struct-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-use-covariant-struct-1.rs rename to src/test/ui/variance/variance-use-covariant-struct-1.rs diff --git a/src/test/ui/compile-fail-migration/variance-use-covariant-struct-1.stderr b/src/test/ui/variance/variance-use-covariant-struct-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-use-covariant-struct-1.stderr rename to src/test/ui/variance/variance-use-covariant-struct-1.stderr diff --git a/src/test/ui/compile-fail-migration/variance-use-covariant-struct-2.rs b/src/test/ui/variance/variance-use-covariant-struct-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-use-covariant-struct-2.rs rename to src/test/ui/variance/variance-use-covariant-struct-2.rs diff --git a/src/test/ui/compile-fail-migration/variance-use-covariant-struct-2.stderr b/src/test/ui/variance/variance-use-covariant-struct-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-use-covariant-struct-2.stderr rename to src/test/ui/variance/variance-use-covariant-struct-2.stderr diff --git a/src/test/ui/compile-fail-migration/variance-use-invariant-struct-1.nll.stderr b/src/test/ui/variance/variance-use-invariant-struct-1.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-use-invariant-struct-1.nll.stderr rename to src/test/ui/variance/variance-use-invariant-struct-1.nll.stderr diff --git a/src/test/ui/compile-fail-migration/variance-use-invariant-struct-1.rs b/src/test/ui/variance/variance-use-invariant-struct-1.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variance-use-invariant-struct-1.rs rename to src/test/ui/variance/variance-use-invariant-struct-1.rs diff --git a/src/test/ui/compile-fail-migration/variance-use-invariant-struct-1.stderr b/src/test/ui/variance/variance-use-invariant-struct-1.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variance-use-invariant-struct-1.stderr rename to src/test/ui/variance/variance-use-invariant-struct-1.stderr diff --git a/src/test/ui/compile-fail-migration/auxiliary/variant-namespacing.rs b/src/test/ui/variants/auxiliary/variant-namespacing.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/variant-namespacing.rs rename to src/test/ui/variants/auxiliary/variant-namespacing.rs diff --git a/src/test/ui/compile-fail-migration/variant-namespacing.rs b/src/test/ui/variants/variant-namespacing.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variant-namespacing.rs rename to src/test/ui/variants/variant-namespacing.rs diff --git a/src/test/ui/compile-fail-migration/variant-namespacing.stderr b/src/test/ui/variants/variant-namespacing.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variant-namespacing.stderr rename to src/test/ui/variants/variant-namespacing.stderr diff --git a/src/test/ui/compile-fail-migration/variant-size-differences.rs b/src/test/ui/variants/variant-size-differences.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variant-size-differences.rs rename to src/test/ui/variants/variant-size-differences.rs diff --git a/src/test/ui/compile-fail-migration/variant-size-differences.stderr b/src/test/ui/variants/variant-size-differences.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variant-size-differences.stderr rename to src/test/ui/variants/variant-size-differences.stderr diff --git a/src/test/ui/compile-fail-migration/variant-used-as-type.rs b/src/test/ui/variants/variant-used-as-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/variant-used-as-type.rs rename to src/test/ui/variants/variant-used-as-type.rs diff --git a/src/test/ui/compile-fail-migration/variant-used-as-type.stderr b/src/test/ui/variants/variant-used-as-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/variant-used-as-type.stderr rename to src/test/ui/variants/variant-used-as-type.stderr diff --git a/src/test/ui/compile-fail-migration/vec-macro-with-comma-only.rs b/src/test/ui/vec/vec-macro-with-comma-only.rs similarity index 100% rename from src/test/ui/compile-fail-migration/vec-macro-with-comma-only.rs rename to src/test/ui/vec/vec-macro-with-comma-only.rs diff --git a/src/test/ui/compile-fail-migration/vec-macro-with-comma-only.stderr b/src/test/ui/vec/vec-macro-with-comma-only.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/vec-macro-with-comma-only.stderr rename to src/test/ui/vec/vec-macro-with-comma-only.stderr diff --git a/src/test/ui/compile-fail-migration/vec-mut-iter-borrow.nll.stderr b/src/test/ui/vec/vec-mut-iter-borrow.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/vec-mut-iter-borrow.nll.stderr rename to src/test/ui/vec/vec-mut-iter-borrow.nll.stderr diff --git a/src/test/ui/compile-fail-migration/vec-mut-iter-borrow.rs b/src/test/ui/vec/vec-mut-iter-borrow.rs similarity index 100% rename from src/test/ui/compile-fail-migration/vec-mut-iter-borrow.rs rename to src/test/ui/vec/vec-mut-iter-borrow.rs diff --git a/src/test/ui/compile-fail-migration/vec-mut-iter-borrow.stderr b/src/test/ui/vec/vec-mut-iter-borrow.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/vec-mut-iter-borrow.stderr rename to src/test/ui/vec/vec-mut-iter-borrow.stderr diff --git a/src/test/ui/compile-fail-migration/vec-res-add.rs b/src/test/ui/vec/vec-res-add.rs similarity index 100% rename from src/test/ui/compile-fail-migration/vec-res-add.rs rename to src/test/ui/vec/vec-res-add.rs diff --git a/src/test/ui/compile-fail-migration/vec-res-add.stderr b/src/test/ui/vec/vec-res-add.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/vec-res-add.stderr rename to src/test/ui/vec/vec-res-add.stderr diff --git a/src/test/ui/compile-fail-migration/vector-cast-weirdness.rs b/src/test/ui/vector-cast-weirdness.rs similarity index 100% rename from src/test/ui/compile-fail-migration/vector-cast-weirdness.rs rename to src/test/ui/vector-cast-weirdness.rs diff --git a/src/test/ui/compile-fail-migration/vector-cast-weirdness.stderr b/src/test/ui/vector-cast-weirdness.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/vector-cast-weirdness.stderr rename to src/test/ui/vector-cast-weirdness.stderr diff --git a/src/test/ui/compile-fail-migration/vtable-res-trait-param.rs b/src/test/ui/vtable-res-trait-param.rs similarity index 100% rename from src/test/ui/compile-fail-migration/vtable-res-trait-param.rs rename to src/test/ui/vtable-res-trait-param.rs diff --git a/src/test/ui/compile-fail-migration/vtable-res-trait-param.stderr b/src/test/ui/vtable-res-trait-param.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/vtable-res-trait-param.stderr rename to src/test/ui/vtable-res-trait-param.stderr diff --git a/src/test/ui/compile-fail-migration/walk-struct-literal-with.nll.stderr b/src/test/ui/walk-struct-literal-with.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/walk-struct-literal-with.nll.stderr rename to src/test/ui/walk-struct-literal-with.nll.stderr diff --git a/src/test/ui/compile-fail-migration/walk-struct-literal-with.rs b/src/test/ui/walk-struct-literal-with.rs similarity index 100% rename from src/test/ui/compile-fail-migration/walk-struct-literal-with.rs rename to src/test/ui/walk-struct-literal-with.rs diff --git a/src/test/ui/compile-fail-migration/walk-struct-literal-with.stderr b/src/test/ui/walk-struct-literal-with.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/walk-struct-literal-with.stderr rename to src/test/ui/walk-struct-literal-with.stderr diff --git a/src/test/ui/compile-fail-migration/warn-path-statement.rs b/src/test/ui/warn-path-statement.rs similarity index 100% rename from src/test/ui/compile-fail-migration/warn-path-statement.rs rename to src/test/ui/warn-path-statement.rs diff --git a/src/test/ui/compile-fail-migration/warn-path-statement.stderr b/src/test/ui/warn-path-statement.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/warn-path-statement.stderr rename to src/test/ui/warn-path-statement.stderr diff --git a/src/test/ui/compile-fail-migration/weak-lang-item.rs b/src/test/ui/weak-lang-item.rs similarity index 100% rename from src/test/ui/compile-fail-migration/weak-lang-item.rs rename to src/test/ui/weak-lang-item.rs diff --git a/src/test/ui/compile-fail-migration/weak-lang-item.stderr b/src/test/ui/weak-lang-item.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/weak-lang-item.stderr rename to src/test/ui/weak-lang-item.stderr diff --git a/src/test/ui/compile-fail-migration/wf-array-elem-sized.rs b/src/test/ui/wf/wf-array-elem-sized.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-array-elem-sized.rs rename to src/test/ui/wf/wf-array-elem-sized.rs diff --git a/src/test/ui/compile-fail-migration/wf-array-elem-sized.stderr b/src/test/ui/wf/wf-array-elem-sized.stderr similarity index 96% rename from src/test/ui/compile-fail-migration/wf-array-elem-sized.stderr rename to src/test/ui/wf/wf-array-elem-sized.stderr index dc1391469e8..362b2861424 100644 --- a/src/test/ui/compile-fail-migration/wf-array-elem-sized.stderr +++ b/src/test/ui/wf/wf-array-elem-sized.stderr @@ -5,7 +5,7 @@ LL | foo: [[u8]], //~ ERROR E0277 | ^^^^^^^^^^^ doesn't have a size known at compile-time | = help: the trait `std::marker::Sized` is not implemented for `[u8]` - = note: to learn more, visit + = note: to learn more, visit = note: slice and array elements must have `Sized` type error: aborting due to previous error diff --git a/src/test/ui/compile-fail-migration/wf-const-type.rs b/src/test/ui/wf/wf-const-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-const-type.rs rename to src/test/ui/wf/wf-const-type.rs diff --git a/src/test/ui/compile-fail-migration/wf-const-type.stderr b/src/test/ui/wf/wf-const-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-const-type.stderr rename to src/test/ui/wf/wf-const-type.stderr diff --git a/src/test/ui/compile-fail-migration/wf-enum-bound.rs b/src/test/ui/wf/wf-enum-bound.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-enum-bound.rs rename to src/test/ui/wf/wf-enum-bound.rs diff --git a/src/test/ui/compile-fail-migration/wf-enum-bound.stderr b/src/test/ui/wf/wf-enum-bound.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-enum-bound.stderr rename to src/test/ui/wf/wf-enum-bound.stderr diff --git a/src/test/ui/compile-fail-migration/wf-enum-fields-struct-variant.rs b/src/test/ui/wf/wf-enum-fields-struct-variant.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-enum-fields-struct-variant.rs rename to src/test/ui/wf/wf-enum-fields-struct-variant.rs diff --git a/src/test/ui/compile-fail-migration/wf-enum-fields-struct-variant.stderr b/src/test/ui/wf/wf-enum-fields-struct-variant.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-enum-fields-struct-variant.stderr rename to src/test/ui/wf/wf-enum-fields-struct-variant.stderr diff --git a/src/test/ui/compile-fail-migration/wf-enum-fields.rs b/src/test/ui/wf/wf-enum-fields.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-enum-fields.rs rename to src/test/ui/wf/wf-enum-fields.rs diff --git a/src/test/ui/compile-fail-migration/wf-enum-fields.stderr b/src/test/ui/wf/wf-enum-fields.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-enum-fields.stderr rename to src/test/ui/wf/wf-enum-fields.stderr diff --git a/src/test/ui/compile-fail-migration/wf-fn-where-clause.rs b/src/test/ui/wf/wf-fn-where-clause.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-fn-where-clause.rs rename to src/test/ui/wf/wf-fn-where-clause.rs diff --git a/src/test/ui/compile-fail-migration/wf-fn-where-clause.stderr b/src/test/ui/wf/wf-fn-where-clause.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-fn-where-clause.stderr rename to src/test/ui/wf/wf-fn-where-clause.stderr diff --git a/src/test/ui/compile-fail-migration/wf-impl-associated-type-region.rs b/src/test/ui/wf/wf-impl-associated-type-region.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-impl-associated-type-region.rs rename to src/test/ui/wf/wf-impl-associated-type-region.rs diff --git a/src/test/ui/compile-fail-migration/wf-impl-associated-type-region.stderr b/src/test/ui/wf/wf-impl-associated-type-region.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-impl-associated-type-region.stderr rename to src/test/ui/wf/wf-impl-associated-type-region.stderr diff --git a/src/test/ui/compile-fail-migration/wf-impl-associated-type-trait.rs b/src/test/ui/wf/wf-impl-associated-type-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-impl-associated-type-trait.rs rename to src/test/ui/wf/wf-impl-associated-type-trait.rs diff --git a/src/test/ui/compile-fail-migration/wf-impl-associated-type-trait.stderr b/src/test/ui/wf/wf-impl-associated-type-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-impl-associated-type-trait.stderr rename to src/test/ui/wf/wf-impl-associated-type-trait.stderr diff --git a/src/test/ui/compile-fail-migration/wf-in-fn-arg.rs b/src/test/ui/wf/wf-in-fn-arg.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-in-fn-arg.rs rename to src/test/ui/wf/wf-in-fn-arg.rs diff --git a/src/test/ui/compile-fail-migration/wf-in-fn-arg.stderr b/src/test/ui/wf/wf-in-fn-arg.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-in-fn-arg.stderr rename to src/test/ui/wf/wf-in-fn-arg.stderr diff --git a/src/test/ui/compile-fail-migration/wf-in-fn-ret.rs b/src/test/ui/wf/wf-in-fn-ret.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-in-fn-ret.rs rename to src/test/ui/wf/wf-in-fn-ret.rs diff --git a/src/test/ui/compile-fail-migration/wf-in-fn-ret.stderr b/src/test/ui/wf/wf-in-fn-ret.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-in-fn-ret.stderr rename to src/test/ui/wf/wf-in-fn-ret.stderr diff --git a/src/test/ui/compile-fail-migration/wf-in-fn-type-arg.rs b/src/test/ui/wf/wf-in-fn-type-arg.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-in-fn-type-arg.rs rename to src/test/ui/wf/wf-in-fn-type-arg.rs diff --git a/src/test/ui/compile-fail-migration/wf-in-fn-type-arg.stderr b/src/test/ui/wf/wf-in-fn-type-arg.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-in-fn-type-arg.stderr rename to src/test/ui/wf/wf-in-fn-type-arg.stderr diff --git a/src/test/ui/compile-fail-migration/wf-in-fn-type-ret.rs b/src/test/ui/wf/wf-in-fn-type-ret.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-in-fn-type-ret.rs rename to src/test/ui/wf/wf-in-fn-type-ret.rs diff --git a/src/test/ui/compile-fail-migration/wf-in-fn-type-ret.stderr b/src/test/ui/wf/wf-in-fn-type-ret.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-in-fn-type-ret.stderr rename to src/test/ui/wf/wf-in-fn-type-ret.stderr diff --git a/src/test/ui/compile-fail-migration/wf-in-fn-type-static.rs b/src/test/ui/wf/wf-in-fn-type-static.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-in-fn-type-static.rs rename to src/test/ui/wf/wf-in-fn-type-static.rs diff --git a/src/test/ui/compile-fail-migration/wf-in-fn-type-static.stderr b/src/test/ui/wf/wf-in-fn-type-static.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-in-fn-type-static.stderr rename to src/test/ui/wf/wf-in-fn-type-static.stderr diff --git a/src/test/ui/compile-fail-migration/wf-in-fn-where-clause.rs b/src/test/ui/wf/wf-in-fn-where-clause.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-in-fn-where-clause.rs rename to src/test/ui/wf/wf-in-fn-where-clause.rs diff --git a/src/test/ui/compile-fail-migration/wf-in-fn-where-clause.stderr b/src/test/ui/wf/wf-in-fn-where-clause.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-in-fn-where-clause.stderr rename to src/test/ui/wf/wf-in-fn-where-clause.stderr diff --git a/src/test/ui/compile-fail-migration/wf-in-obj-type-static.rs b/src/test/ui/wf/wf-in-obj-type-static.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-in-obj-type-static.rs rename to src/test/ui/wf/wf-in-obj-type-static.rs diff --git a/src/test/ui/compile-fail-migration/wf-in-obj-type-static.stderr b/src/test/ui/wf/wf-in-obj-type-static.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-in-obj-type-static.stderr rename to src/test/ui/wf/wf-in-obj-type-static.stderr diff --git a/src/test/ui/compile-fail-migration/wf-in-obj-type-trait.rs b/src/test/ui/wf/wf-in-obj-type-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-in-obj-type-trait.rs rename to src/test/ui/wf/wf-in-obj-type-trait.rs diff --git a/src/test/ui/compile-fail-migration/wf-in-obj-type-trait.stderr b/src/test/ui/wf/wf-in-obj-type-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-in-obj-type-trait.stderr rename to src/test/ui/wf/wf-in-obj-type-trait.stderr diff --git a/src/test/ui/compile-fail-migration/wf-inherent-impl-method-where-clause.rs b/src/test/ui/wf/wf-inherent-impl-method-where-clause.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-inherent-impl-method-where-clause.rs rename to src/test/ui/wf/wf-inherent-impl-method-where-clause.rs diff --git a/src/test/ui/compile-fail-migration/wf-inherent-impl-method-where-clause.stderr b/src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-inherent-impl-method-where-clause.stderr rename to src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr diff --git a/src/test/ui/compile-fail-migration/wf-inherent-impl-where-clause.rs b/src/test/ui/wf/wf-inherent-impl-where-clause.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-inherent-impl-where-clause.rs rename to src/test/ui/wf/wf-inherent-impl-where-clause.rs diff --git a/src/test/ui/compile-fail-migration/wf-inherent-impl-where-clause.stderr b/src/test/ui/wf/wf-inherent-impl-where-clause.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-inherent-impl-where-clause.stderr rename to src/test/ui/wf/wf-inherent-impl-where-clause.stderr diff --git a/src/test/ui/compile-fail-migration/wf-misc-methods-issue-28609.nll.stderr b/src/test/ui/wf/wf-misc-methods-issue-28609.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-misc-methods-issue-28609.nll.stderr rename to src/test/ui/wf/wf-misc-methods-issue-28609.nll.stderr diff --git a/src/test/ui/compile-fail-migration/wf-misc-methods-issue-28609.rs b/src/test/ui/wf/wf-misc-methods-issue-28609.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-misc-methods-issue-28609.rs rename to src/test/ui/wf/wf-misc-methods-issue-28609.rs diff --git a/src/test/ui/compile-fail-migration/wf-misc-methods-issue-28609.stderr b/src/test/ui/wf/wf-misc-methods-issue-28609.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-misc-methods-issue-28609.stderr rename to src/test/ui/wf/wf-misc-methods-issue-28609.stderr diff --git a/src/test/ui/compile-fail-migration/wf-object-safe.rs b/src/test/ui/wf/wf-object-safe.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-object-safe.rs rename to src/test/ui/wf/wf-object-safe.rs diff --git a/src/test/ui/compile-fail-migration/wf-object-safe.stderr b/src/test/ui/wf/wf-object-safe.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-object-safe.stderr rename to src/test/ui/wf/wf-object-safe.stderr diff --git a/src/test/ui/compile-fail-migration/wf-outlives-ty-in-fn-or-trait.rs b/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-outlives-ty-in-fn-or-trait.rs rename to src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.rs diff --git a/src/test/ui/compile-fail-migration/wf-outlives-ty-in-fn-or-trait.stderr b/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-outlives-ty-in-fn-or-trait.stderr rename to src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr diff --git a/src/test/ui/compile-fail-migration/wf-static-method.nll.stderr b/src/test/ui/wf/wf-static-method.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-static-method.nll.stderr rename to src/test/ui/wf/wf-static-method.nll.stderr diff --git a/src/test/ui/compile-fail-migration/wf-static-method.rs b/src/test/ui/wf/wf-static-method.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-static-method.rs rename to src/test/ui/wf/wf-static-method.rs diff --git a/src/test/ui/compile-fail-migration/wf-static-method.stderr b/src/test/ui/wf/wf-static-method.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-static-method.stderr rename to src/test/ui/wf/wf-static-method.stderr diff --git a/src/test/ui/compile-fail-migration/wf-static-type.rs b/src/test/ui/wf/wf-static-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-static-type.rs rename to src/test/ui/wf/wf-static-type.rs diff --git a/src/test/ui/compile-fail-migration/wf-static-type.stderr b/src/test/ui/wf/wf-static-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-static-type.stderr rename to src/test/ui/wf/wf-static-type.stderr diff --git a/src/test/ui/compile-fail-migration/wf-struct-bound.rs b/src/test/ui/wf/wf-struct-bound.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-struct-bound.rs rename to src/test/ui/wf/wf-struct-bound.rs diff --git a/src/test/ui/compile-fail-migration/wf-struct-bound.stderr b/src/test/ui/wf/wf-struct-bound.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-struct-bound.stderr rename to src/test/ui/wf/wf-struct-bound.stderr diff --git a/src/test/ui/compile-fail-migration/wf-struct-field.rs b/src/test/ui/wf/wf-struct-field.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-struct-field.rs rename to src/test/ui/wf/wf-struct-field.rs diff --git a/src/test/ui/compile-fail-migration/wf-struct-field.stderr b/src/test/ui/wf/wf-struct-field.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-struct-field.stderr rename to src/test/ui/wf/wf-struct-field.stderr diff --git a/src/test/ui/compile-fail-migration/wf-trait-associated-type-bound.rs b/src/test/ui/wf/wf-trait-associated-type-bound.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-associated-type-bound.rs rename to src/test/ui/wf/wf-trait-associated-type-bound.rs diff --git a/src/test/ui/compile-fail-migration/wf-trait-associated-type-bound.stderr b/src/test/ui/wf/wf-trait-associated-type-bound.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-associated-type-bound.stderr rename to src/test/ui/wf/wf-trait-associated-type-bound.stderr diff --git a/src/test/ui/compile-fail-migration/wf-trait-associated-type-region.rs b/src/test/ui/wf/wf-trait-associated-type-region.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-associated-type-region.rs rename to src/test/ui/wf/wf-trait-associated-type-region.rs diff --git a/src/test/ui/compile-fail-migration/wf-trait-associated-type-region.stderr b/src/test/ui/wf/wf-trait-associated-type-region.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-associated-type-region.stderr rename to src/test/ui/wf/wf-trait-associated-type-region.stderr diff --git a/src/test/ui/compile-fail-migration/wf-trait-associated-type-trait.rs b/src/test/ui/wf/wf-trait-associated-type-trait.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-associated-type-trait.rs rename to src/test/ui/wf/wf-trait-associated-type-trait.rs diff --git a/src/test/ui/compile-fail-migration/wf-trait-associated-type-trait.stderr b/src/test/ui/wf/wf-trait-associated-type-trait.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-associated-type-trait.stderr rename to src/test/ui/wf/wf-trait-associated-type-trait.stderr diff --git a/src/test/ui/compile-fail-migration/wf-trait-bound.rs b/src/test/ui/wf/wf-trait-bound.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-bound.rs rename to src/test/ui/wf/wf-trait-bound.rs diff --git a/src/test/ui/compile-fail-migration/wf-trait-bound.stderr b/src/test/ui/wf/wf-trait-bound.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-bound.stderr rename to src/test/ui/wf/wf-trait-bound.stderr diff --git a/src/test/ui/compile-fail-migration/wf-trait-default-fn-arg.rs b/src/test/ui/wf/wf-trait-default-fn-arg.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-default-fn-arg.rs rename to src/test/ui/wf/wf-trait-default-fn-arg.rs diff --git a/src/test/ui/compile-fail-migration/wf-trait-default-fn-arg.stderr b/src/test/ui/wf/wf-trait-default-fn-arg.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-default-fn-arg.stderr rename to src/test/ui/wf/wf-trait-default-fn-arg.stderr diff --git a/src/test/ui/compile-fail-migration/wf-trait-default-fn-ret.rs b/src/test/ui/wf/wf-trait-default-fn-ret.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-default-fn-ret.rs rename to src/test/ui/wf/wf-trait-default-fn-ret.rs diff --git a/src/test/ui/compile-fail-migration/wf-trait-default-fn-ret.stderr b/src/test/ui/wf/wf-trait-default-fn-ret.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-default-fn-ret.stderr rename to src/test/ui/wf/wf-trait-default-fn-ret.stderr diff --git a/src/test/ui/compile-fail-migration/wf-trait-default-fn-where-clause.rs b/src/test/ui/wf/wf-trait-default-fn-where-clause.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-default-fn-where-clause.rs rename to src/test/ui/wf/wf-trait-default-fn-where-clause.rs diff --git a/src/test/ui/compile-fail-migration/wf-trait-default-fn-where-clause.stderr b/src/test/ui/wf/wf-trait-default-fn-where-clause.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-default-fn-where-clause.stderr rename to src/test/ui/wf/wf-trait-default-fn-where-clause.stderr diff --git a/src/test/ui/compile-fail-migration/wf-trait-fn-arg.rs b/src/test/ui/wf/wf-trait-fn-arg.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-fn-arg.rs rename to src/test/ui/wf/wf-trait-fn-arg.rs diff --git a/src/test/ui/compile-fail-migration/wf-trait-fn-arg.stderr b/src/test/ui/wf/wf-trait-fn-arg.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-fn-arg.stderr rename to src/test/ui/wf/wf-trait-fn-arg.stderr diff --git a/src/test/ui/compile-fail-migration/wf-trait-fn-ret.rs b/src/test/ui/wf/wf-trait-fn-ret.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-fn-ret.rs rename to src/test/ui/wf/wf-trait-fn-ret.rs diff --git a/src/test/ui/compile-fail-migration/wf-trait-fn-ret.stderr b/src/test/ui/wf/wf-trait-fn-ret.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-fn-ret.stderr rename to src/test/ui/wf/wf-trait-fn-ret.stderr diff --git a/src/test/ui/compile-fail-migration/wf-trait-fn-where-clause.rs b/src/test/ui/wf/wf-trait-fn-where-clause.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-fn-where-clause.rs rename to src/test/ui/wf/wf-trait-fn-where-clause.rs diff --git a/src/test/ui/compile-fail-migration/wf-trait-fn-where-clause.stderr b/src/test/ui/wf/wf-trait-fn-where-clause.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-fn-where-clause.stderr rename to src/test/ui/wf/wf-trait-fn-where-clause.stderr diff --git a/src/test/ui/compile-fail-migration/wf-trait-superbound.rs b/src/test/ui/wf/wf-trait-superbound.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-superbound.rs rename to src/test/ui/wf/wf-trait-superbound.rs diff --git a/src/test/ui/compile-fail-migration/wf-trait-superbound.stderr b/src/test/ui/wf/wf-trait-superbound.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wf-trait-superbound.stderr rename to src/test/ui/wf/wf-trait-superbound.stderr diff --git a/src/test/ui/compile-fail-migration/where-clause-constraints-are-local-for-inherent-impl.rs b/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/where-clause-constraints-are-local-for-inherent-impl.rs rename to src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.rs diff --git a/src/test/ui/compile-fail-migration/where-clause-constraints-are-local-for-inherent-impl.stderr b/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/where-clause-constraints-are-local-for-inherent-impl.stderr rename to src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr diff --git a/src/test/ui/compile-fail-migration/where-clause-constraints-are-local-for-trait-impl.rs b/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.rs similarity index 100% rename from src/test/ui/compile-fail-migration/where-clause-constraints-are-local-for-trait-impl.rs rename to src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.rs diff --git a/src/test/ui/compile-fail-migration/where-clause-constraints-are-local-for-trait-impl.stderr b/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/where-clause-constraints-are-local-for-trait-impl.stderr rename to src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr diff --git a/src/test/ui/compile-fail-migration/where-clause-method-substituion.rs b/src/test/ui/where-clauses/where-clause-method-substituion.rs similarity index 100% rename from src/test/ui/compile-fail-migration/where-clause-method-substituion.rs rename to src/test/ui/where-clauses/where-clause-method-substituion.rs diff --git a/src/test/ui/compile-fail-migration/where-clause-method-substituion.stderr b/src/test/ui/where-clauses/where-clause-method-substituion.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/where-clause-method-substituion.stderr rename to src/test/ui/where-clauses/where-clause-method-substituion.stderr diff --git a/src/test/ui/compile-fail-migration/where-clauses-method-unsatisfied.rs b/src/test/ui/where-clauses/where-clauses-method-unsatisfied.rs similarity index 100% rename from src/test/ui/compile-fail-migration/where-clauses-method-unsatisfied.rs rename to src/test/ui/where-clauses/where-clauses-method-unsatisfied.rs diff --git a/src/test/ui/compile-fail-migration/where-clauses-method-unsatisfied.stderr b/src/test/ui/where-clauses/where-clauses-method-unsatisfied.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/where-clauses-method-unsatisfied.stderr rename to src/test/ui/where-clauses/where-clauses-method-unsatisfied.stderr diff --git a/src/test/ui/compile-fail-migration/where-clauses-unsatisfied.rs b/src/test/ui/where-clauses/where-clauses-unsatisfied.rs similarity index 100% rename from src/test/ui/compile-fail-migration/where-clauses-unsatisfied.rs rename to src/test/ui/where-clauses/where-clauses-unsatisfied.rs diff --git a/src/test/ui/compile-fail-migration/where-clauses-unsatisfied.stderr b/src/test/ui/where-clauses/where-clauses-unsatisfied.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/where-clauses-unsatisfied.stderr rename to src/test/ui/where-clauses/where-clauses-unsatisfied.stderr diff --git a/src/test/ui/compile-fail-migration/where-equality-constraints.rs b/src/test/ui/where-clauses/where-equality-constraints.rs similarity index 100% rename from src/test/ui/compile-fail-migration/where-equality-constraints.rs rename to src/test/ui/where-clauses/where-equality-constraints.rs diff --git a/src/test/ui/compile-fail-migration/where-equality-constraints.stderr b/src/test/ui/where-clauses/where-equality-constraints.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/where-equality-constraints.stderr rename to src/test/ui/where-clauses/where-equality-constraints.stderr diff --git a/src/test/ui/compile-fail-migration/where-for-self-2.rs b/src/test/ui/where-clauses/where-for-self-2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/where-for-self-2.rs rename to src/test/ui/where-clauses/where-for-self-2.rs diff --git a/src/test/ui/compile-fail-migration/where-for-self-2.stderr b/src/test/ui/where-clauses/where-for-self-2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/where-for-self-2.stderr rename to src/test/ui/where-clauses/where-for-self-2.stderr diff --git a/src/test/ui/compile-fail-migration/where-for-self.rs b/src/test/ui/where-clauses/where-for-self.rs similarity index 100% rename from src/test/ui/compile-fail-migration/where-for-self.rs rename to src/test/ui/where-clauses/where-for-self.rs diff --git a/src/test/ui/compile-fail-migration/where-for-self.stderr b/src/test/ui/where-clauses/where-for-self.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/where-for-self.stderr rename to src/test/ui/where-clauses/where-for-self.stderr diff --git a/src/test/ui/compile-fail-migration/where-lifetime-resolution.rs b/src/test/ui/where-clauses/where-lifetime-resolution.rs similarity index 100% rename from src/test/ui/compile-fail-migration/where-lifetime-resolution.rs rename to src/test/ui/where-clauses/where-lifetime-resolution.rs diff --git a/src/test/ui/compile-fail-migration/where-lifetime-resolution.stderr b/src/test/ui/where-clauses/where-lifetime-resolution.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/where-lifetime-resolution.stderr rename to src/test/ui/where-clauses/where-lifetime-resolution.stderr diff --git a/src/test/ui/compile-fail-migration/while-let.rs b/src/test/ui/while-let.rs similarity index 100% rename from src/test/ui/compile-fail-migration/while-let.rs rename to src/test/ui/while-let.rs diff --git a/src/test/ui/compile-fail-migration/while-let.stderr b/src/test/ui/while-let.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/while-let.stderr rename to src/test/ui/while-let.stderr diff --git a/src/test/ui/compile-fail-migration/while-type-error.rs b/src/test/ui/while-type-error.rs similarity index 100% rename from src/test/ui/compile-fail-migration/while-type-error.rs rename to src/test/ui/while-type-error.rs diff --git a/src/test/ui/compile-fail-migration/while-type-error.stderr b/src/test/ui/while-type-error.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/while-type-error.stderr rename to src/test/ui/while-type-error.stderr diff --git a/src/test/ui/compile-fail-migration/windows-subsystem-invalid.rs b/src/test/ui/windows-subsystem-invalid.rs similarity index 100% rename from src/test/ui/compile-fail-migration/windows-subsystem-invalid.rs rename to src/test/ui/windows-subsystem-invalid.rs diff --git a/src/test/ui/compile-fail-migration/windows-subsystem-invalid.stderr b/src/test/ui/windows-subsystem-invalid.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/windows-subsystem-invalid.stderr rename to src/test/ui/windows-subsystem-invalid.stderr diff --git a/src/test/ui/compile-fail-migration/write-to-static-mut-in-static.rs b/src/test/ui/write-to-static-mut-in-static.rs similarity index 100% rename from src/test/ui/compile-fail-migration/write-to-static-mut-in-static.rs rename to src/test/ui/write-to-static-mut-in-static.rs diff --git a/src/test/ui/compile-fail-migration/write-to-static-mut-in-static.stderr b/src/test/ui/write-to-static-mut-in-static.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/write-to-static-mut-in-static.stderr rename to src/test/ui/write-to-static-mut-in-static.stderr diff --git a/src/test/ui/compile-fail-migration/writing-to-immutable-vec.nll.stderr b/src/test/ui/writing-to-immutable-vec.nll.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/writing-to-immutable-vec.nll.stderr rename to src/test/ui/writing-to-immutable-vec.nll.stderr diff --git a/src/test/ui/compile-fail-migration/writing-to-immutable-vec.rs b/src/test/ui/writing-to-immutable-vec.rs similarity index 100% rename from src/test/ui/compile-fail-migration/writing-to-immutable-vec.rs rename to src/test/ui/writing-to-immutable-vec.rs diff --git a/src/test/ui/compile-fail-migration/writing-to-immutable-vec.stderr b/src/test/ui/writing-to-immutable-vec.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/writing-to-immutable-vec.stderr rename to src/test/ui/writing-to-immutable-vec.stderr diff --git a/src/test/ui/compile-fail-migration/wrong-mul-method-signature.rs b/src/test/ui/wrong-mul-method-signature.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wrong-mul-method-signature.rs rename to src/test/ui/wrong-mul-method-signature.rs diff --git a/src/test/ui/compile-fail-migration/wrong-mul-method-signature.stderr b/src/test/ui/wrong-mul-method-signature.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wrong-mul-method-signature.stderr rename to src/test/ui/wrong-mul-method-signature.stderr diff --git a/src/test/ui/compile-fail-migration/wrong-ret-type.rs b/src/test/ui/wrong-ret-type.rs similarity index 100% rename from src/test/ui/compile-fail-migration/wrong-ret-type.rs rename to src/test/ui/wrong-ret-type.rs diff --git a/src/test/ui/compile-fail-migration/wrong-ret-type.stderr b/src/test/ui/wrong-ret-type.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/wrong-ret-type.stderr rename to src/test/ui/wrong-ret-type.stderr diff --git a/src/test/ui/compile-fail-migration/xc-private-method.rs b/src/test/ui/xc-private-method.rs similarity index 100% rename from src/test/ui/compile-fail-migration/xc-private-method.rs rename to src/test/ui/xc-private-method.rs diff --git a/src/test/ui/compile-fail-migration/xc-private-method.stderr b/src/test/ui/xc-private-method.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/xc-private-method.stderr rename to src/test/ui/xc-private-method.stderr diff --git a/src/test/ui/compile-fail-migration/xc-private-method2.rs b/src/test/ui/xc-private-method2.rs similarity index 100% rename from src/test/ui/compile-fail-migration/xc-private-method2.rs rename to src/test/ui/xc-private-method2.rs diff --git a/src/test/ui/compile-fail-migration/xc-private-method2.stderr b/src/test/ui/xc-private-method2.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/xc-private-method2.stderr rename to src/test/ui/xc-private-method2.stderr diff --git a/src/test/ui/xcrate/auxiliary/static_priv_by_default.rs b/src/test/ui/xcrate/auxiliary/static_priv_by_default.rs new file mode 100644 index 00000000000..73597e51f08 --- /dev/null +++ b/src/test/ui/xcrate/auxiliary/static_priv_by_default.rs @@ -0,0 +1,61 @@ +// Copyright 2013 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![crate_type = "lib"] + +static private: isize = 0; +pub static public: isize = 0; + +pub struct A(()); + +impl A { + fn foo() {} +} + +mod foo { + pub static a: isize = 0; + pub fn b() {} + pub struct c; + pub enum d {} + pub type e = isize; + + pub struct A(()); + + impl A { + fn foo() {} + } + + // these are public so the parent can re-export them. + pub static reexported_a: isize = 0; + pub fn reexported_b() {} + pub struct reexported_c; + pub enum reexported_d {} + pub type reexported_e = isize; +} + +pub mod bar { + pub use foo::reexported_a as e; + pub use foo::reexported_b as f; + pub use foo::reexported_c as g; + pub use foo::reexported_d as h; + pub use foo::reexported_e as i; +} + +pub static a: isize = 0; +pub fn b() {} +pub struct c; +pub enum d {} +pub type e = isize; + +static j: isize = 0; +fn k() {} +struct l; +enum m {} +type n = isize; diff --git a/src/test/ui/compile-fail-migration/auxiliary/xcrate_unit_struct.rs b/src/test/ui/xcrate/auxiliary/xcrate_unit_struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/auxiliary/xcrate_unit_struct.rs rename to src/test/ui/xcrate/auxiliary/xcrate_unit_struct.rs diff --git a/src/test/ui/compile-fail-migration/xcrate-private-by-default.rs b/src/test/ui/xcrate/xcrate-private-by-default.rs similarity index 100% rename from src/test/ui/compile-fail-migration/xcrate-private-by-default.rs rename to src/test/ui/xcrate/xcrate-private-by-default.rs diff --git a/src/test/ui/compile-fail-migration/xcrate-private-by-default.stderr b/src/test/ui/xcrate/xcrate-private-by-default.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/xcrate-private-by-default.stderr rename to src/test/ui/xcrate/xcrate-private-by-default.stderr diff --git a/src/test/ui/compile-fail-migration/xcrate-unit-struct.rs b/src/test/ui/xcrate/xcrate-unit-struct.rs similarity index 100% rename from src/test/ui/compile-fail-migration/xcrate-unit-struct.rs rename to src/test/ui/xcrate/xcrate-unit-struct.rs diff --git a/src/test/ui/compile-fail-migration/xcrate-unit-struct.stderr b/src/test/ui/xcrate/xcrate-unit-struct.stderr similarity index 100% rename from src/test/ui/compile-fail-migration/xcrate-unit-struct.stderr rename to src/test/ui/xcrate/xcrate-unit-struct.stderr