6584 files changed, 884 insertions, 762 deletions

diff --git a/src/test/ui/compile-fail-migration/.gitattributes b/src/test/ui/.gitattributes
index 825f664bf9f..825f664bf9f 100644
--- a/src/test/ui/compile-fail-migration/.gitattributes
+++ b/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
index a9abc79400e..a9abc79400e 100644
--- a/src/test/ui/compile-fail-migration/E0501.ast.nll.stderr
+++ b/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
index 229b1665017..229b1665017 100644
--- a/src/test/ui/compile-fail-migration/E0501.ast.stderr
+++ b/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
index a9abc79400e..a9abc79400e 100644
--- a/src/test/ui/compile-fail-migration/E0501.mir.stderr
+++ b/src/test/ui/E0501.mir.stderr
diff --git a/src/test/ui/compile-fail-migration/E0501.rs b/src/test/ui/E0501.rs
index 5643e1ef091..5643e1ef091 100644
--- a/src/test/ui/compile-fail-migration/E0501.rs
+++ b/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
index cf6b8d9c8d1..cf6b8d9c8d1 100644
--- a/src/test/ui/compile-fail-migration/E0506.ast.nll.stderr
+++ b/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
index 54b4e163681..54b4e163681 100644
--- a/src/test/ui/compile-fail-migration/E0506.ast.stderr
+++ b/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
index cf6b8d9c8d1..cf6b8d9c8d1 100644
--- a/src/test/ui/compile-fail-migration/E0506.mir.stderr
+++ b/src/test/ui/E0506.mir.stderr
diff --git a/src/test/ui/compile-fail-migration/E0506.rs b/src/test/ui/E0506.rs
index c4a7f257394..c4a7f257394 100644
--- a/src/test/ui/compile-fail-migration/E0506.rs
+++ b/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
index 0c3dce6b034..0c3dce6b034 100644
--- a/src/test/ui/compile-fail-migration/E0508.rs
+++ b/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
index 5878b795b77..5878b795b77 100644
--- a/src/test/ui/compile-fail-migration/E0508.ast.stderr
+++ b/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
index 5878b795b77..5878b795b77 100644
--- a/src/test/ui/compile-fail-migration/E0508.mir.stderr
+++ b/src/test/ui/E0508.mir.stderr
diff --git a/src/test/ui/compile-fail-migration/E0583.rs b/src/test/ui/E0583.rs
index 3a5255d0f5f..3a5255d0f5f 100644
--- a/src/test/ui/compile-fail-migration/E0583.rs
+++ b/src/test/ui/E0583.rs
diff --git a/src/test/ui/compile-fail-migration/E0583.stderr b/src/test/ui/E0583.stderr
index 82e1cccbb68..82e1cccbb68 100644
--- a/src/test/ui/compile-fail-migration/E0583.stderr
+++ b/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
index f96eb01abe4..f96eb01abe4 100644
--- a/src/test/ui/compile-fail-migration/E0594.ast.nll.stderr
+++ b/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
index f84c1f56ad0..f84c1f56ad0 100644
--- a/src/test/ui/compile-fail-migration/E0594.ast.stderr
+++ b/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
index f96eb01abe4..f96eb01abe4 100644
--- a/src/test/ui/compile-fail-migration/E0594.mir.stderr
+++ b/src/test/ui/E0594.mir.stderr
diff --git a/src/test/ui/compile-fail-migration/E0594.rs b/src/test/ui/E0594.rs
index e5e96451d13..e5e96451d13 100644
--- a/src/test/ui/compile-fail-migration/E0594.rs
+++ b/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
index 589db4a032d..589db4a032d 100644
--- a/src/test/ui/compile-fail-migration/E0596.ast.nll.stderr
+++ b/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
index d88530b2164..d88530b2164 100644
--- a/src/test/ui/compile-fail-migration/E0596.ast.stderr
+++ b/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
index 589db4a032d..589db4a032d 100644
--- a/src/test/ui/compile-fail-migration/E0596.mir.stderr
+++ b/src/test/ui/E0596.mir.stderr
diff --git a/src/test/ui/compile-fail-migration/E0596.rs b/src/test/ui/E0596.rs
index 52bdff55d86..52bdff55d86 100644
--- a/src/test/ui/compile-fail-migration/E0596.rs
+++ b/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
index fe052f2f47f..fe052f2f47f 100644
--- 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
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
index e88d26718a0..e88d26718a0 100644
--- 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
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
index 2aa8f1c3813..2aa8f1c3813 100644
--- a/src/test/ui/compile-fail-migration/access-mode-in-closures.nll.stderr
+++ b/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
index bad192fc2cf..bad192fc2cf 100644
--- a/src/test/ui/compile-fail-migration/access-mode-in-closures.rs
+++ b/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
index daecbb6ed29..daecbb6ed29 100644
--- a/src/test/ui/compile-fail-migration/access-mode-in-closures.stderr
+++ b/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
index e398f16a065..e398f16a065 100644
--- 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
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
index 6dd905ceab4..6dd905ceab4 100644
--- 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
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
index 4fee9d27e51..4fee9d27e51 100644
--- 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
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
index c1fcdc75833..c1fcdc75833 100644
--- 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
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
index 828a78055d5..828a78055d5 100644
--- 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
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
index 9b792c46c24..9b792c46c24 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/allocator/auxiliary/system-allocator.rs b/src/test/ui/allocator/auxiliary/system-allocator.rs
index e5650d5b7b0..e5650d5b7b0 100644
--- a/src/test/ui/compile-fail-migration/allocator/auxiliary/system-allocator.rs
+++ b/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
index e5650d5b7b0..e5650d5b7b0 100644
--- a/src/test/ui/compile-fail-migration/allocator/auxiliary/system-allocator2.rs
+++ b/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
index 989c102b86e..989c102b86e 100644
--- a/src/test/ui/compile-fail-migration/allocator/function-allocator.rs
+++ b/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
index 8649b6b1244..8649b6b1244 100644
--- a/src/test/ui/compile-fail-migration/allocator/function-allocator.stderr
+++ b/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
index 6559335960a..6559335960a 100644
--- a/src/test/ui/compile-fail-migration/allocator/not-an-allocator.rs
+++ b/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
index 757c5066a66..757c5066a66 100644
--- a/src/test/ui/compile-fail-migration/allocator/not-an-allocator.stderr
+++ b/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
index 7a97a11df20..7a97a11df20 100644
--- a/src/test/ui/compile-fail-migration/allocator/two-allocators.rs
+++ b/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
index 5285ee93f2d..5285ee93f2d 100644
--- a/src/test/ui/compile-fail-migration/allocator/two-allocators.stderr
+++ b/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
index e747140dfe5..e747140dfe5 100644
--- a/src/test/ui/compile-fail-migration/allocator/two-allocators2.rs
+++ b/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
index 2b23ce38ede..2b23ce38ede 100644
--- a/src/test/ui/compile-fail-migration/allocator/two-allocators2.stderr
+++ b/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
index dd86b02bd20..dd86b02bd20 100644
--- a/src/test/ui/compile-fail-migration/allocator/two-allocators3.rs
+++ b/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
index 86e385a96a1..86e385a96a1 100644
--- a/src/test/ui/compile-fail-migration/allocator/two-allocators3.stderr
+++ b/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
index 4d37ba920f3..4d37ba920f3 100644
--- a/src/test/ui/compile-fail-migration/anon-params-deprecated.rs
+++ b/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
index fa13b8d97e5..fa13b8d97e5 100644
--- a/src/test/ui/compile-fail-migration/anon-params-deprecated.stderr
+++ b/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
index 673314ec4c9..673314ec4c9 100644
--- a/src/test/ui/compile-fail-migration/arg-count-mismatch.rs
+++ b/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
index 699e36f3472..699e36f3472 100644
--- a/src/test/ui/compile-fail-migration/arg-count-mismatch.stderr
+++ b/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
index 1f657ca5832..1f657ca5832 100644
--- a/src/test/ui/compile-fail-migration/arg-type-mismatch.rs
+++ b/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
index 2b24d9db3f5..2b24d9db3f5 100644
--- a/src/test/ui/compile-fail-migration/arg-type-mismatch.stderr
+++ b/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
index 47e1c09f380..47e1c09f380 100644
--- a/src/test/ui/compile-fail-migration/array-not-vector.rs
+++ b/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
index 83bf058c449..83bf058c449 100644
--- a/src/test/ui/compile-fail-migration/array-not-vector.stderr
+++ b/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
index 91007fcd63a..91007fcd63a 100644
--- a/src/test/ui/compile-fail-migration/array_const_index-0.rs
+++ b/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
index b71d224f4f0..b71d224f4f0 100644
--- a/src/test/ui/compile-fail-migration/array_const_index-0.stderr
+++ b/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
index 66739d308a7..66739d308a7 100644
--- a/src/test/ui/compile-fail-migration/array_const_index-1.rs
+++ b/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
index 02f86a693af..02f86a693af 100644
--- a/src/test/ui/compile-fail-migration/array_const_index-1.stderr
+++ b/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
index c2b54e37e39..c2b54e37e39 100644
--- a/src/test/ui/compile-fail-migration/asm-bad-clobber.rs
+++ b/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
index 81ab006a18a..81ab006a18a 100644
--- a/src/test/ui/compile-fail-migration/asm-bad-clobber.stderr
+++ b/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
index 2eefd4235bc..2eefd4235bc 100644
--- a/src/test/ui/compile-fail-migration/asm-in-bad-modifier.rs
+++ b/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
index dcb11bd1e76..dcb11bd1e76 100644
--- a/src/test/ui/compile-fail-migration/asm-in-bad-modifier.stderr
+++ b/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
index bfc1fd68fe0..bfc1fd68fe0 100644
--- a/src/test/ui/compile-fail-migration/asm-misplaced-option.rs
+++ b/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
index 46723918a3a..46723918a3a 100644
--- a/src/test/ui/compile-fail-migration/asm-misplaced-option.stderr
+++ b/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
index 45b0c84275b..45b0c84275b 100644
--- a/src/test/ui/asm-out-assign-imm.nll.stderr
+++ b/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
index 73143f11546..73143f11546 100644
--- a/src/test/ui/asm-out-assign-imm.rs
+++ b/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
index 83cb8092e16..83cb8092e16 100644
--- a/src/test/ui/asm-out-assign-imm.stderr
+++ b/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
index 40d2ded8a88..40d2ded8a88 100644
--- a/src/test/ui/compile-fail-migration/asm-out-no-modifier.rs
+++ b/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
index 4e9d7b884b3..4e9d7b884b3 100644
--- a/src/test/ui/compile-fail-migration/asm-out-no-modifier.stderr
+++ b/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
index 5f6685e5c1c..5f6685e5c1c 100644
--- a/src/test/ui/compile-fail-migration/asm-out-read-uninit.ast.stderr
+++ b/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
index 5f6685e5c1c..5f6685e5c1c 100644
--- a/src/test/ui/compile-fail-migration/asm-out-read-uninit.mir.stderr
+++ b/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
index c308a9f0850..c308a9f0850 100644
--- a/src/test/ui/compile-fail-migration/asm-out-read-uninit.rs
+++ b/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
index 6c5c5b00776..6c5c5b00776 100644
--- a/src/test/ui/compile-fail-migration/asm-src-loc-codegen-units.rs
+++ b/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
index 5bd42690156..5bd42690156 100644
--- a/src/test/ui/compile-fail-migration/asm-src-loc-codegen-units.stderr
+++ b/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
index 59b47c2408d..59b47c2408d 100644
--- a/src/test/ui/compile-fail-migration/asm-src-loc.rs
+++ b/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
index 4f79ec6ad64..4f79ec6ad64 100644
--- a/src/test/ui/compile-fail-migration/asm-src-loc.stderr
+++ b/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
index 6d415eb7333..6d415eb7333 100644
--- 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
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
index 32752621e14..32752621e14 100644
--- a/src/test/ui/compile-fail-migration/assign-imm-local-twice.ast.stderr
+++ b/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
index 6d415eb7333..6d415eb7333 100644
--- a/src/test/ui/compile-fail-migration/assign-imm-local-twice.mir.stderr
+++ b/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
index ee9dafdd49e..ee9dafdd49e 100644
--- a/src/test/ui/compile-fail-migration/assign-imm-local-twice.rs
+++ b/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
index 4518ce36b6d..4518ce36b6d 100644
--- a/src/test/ui/compile-fail-migration/assign-to-method.rs
+++ b/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
index 930b4512572..930b4512572 100644
--- a/src/test/ui/compile-fail-migration/assign-to-method.stderr
+++ b/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
index 5b24c6bd79f..5b24c6bd79f 100644
--- a/src/test/ui/compile-fail-migration/assignment-operator-unimplemented.rs
+++ b/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
index 983d698c63e..983d698c63e 100644
--- a/src/test/ui/compile-fail-migration/assignment-operator-unimplemented.stderr
+++ b/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
index 7eab831258f..7eab831258f 100644
--- a/src/test/ui/compile-fail-migration/assoc-inherent.rs
+++ b/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
index 11497cba0ff..11497cba0ff 100644
--- a/src/test/ui/compile-fail-migration/assoc-inherent.stderr
+++ b/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
index 5051e78d1ba..5051e78d1ba 100644
--- a/src/test/ui/compile-fail-migration/associated-const-ambiguity-report.rs
+++ b/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
index 0832b1a2605..0832b1a2605 100644
--- a/src/test/ui/compile-fail-migration/associated-const-ambiguity-report.stderr
+++ b/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
index 2cc10f0f956..2cc10f0f956 100644
--- a/src/test/ui/compile-fail-migration/associated-const-array-len.rs
+++ b/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
index 5504af8fecd..5504af8fecd 100644
--- a/src/test/ui/compile-fail-migration/associated-const-array-len.stderr
+++ b/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
index 42db13f4f3b..42db13f4f3b 100644
--- a/src/test/ui/compile-fail-migration/associated-const-dead-code.rs
+++ b/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
index ee065812183..ee065812183 100644
--- a/src/test/ui/compile-fail-migration/associated-const-dead-code.stderr
+++ b/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
index 45f53418dca..45f53418dca 100644
--- a/src/test/ui/compile-fail-migration/associated-const-generic-obligations.rs
+++ b/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
index 97986a27c64..97986a27c64 100644
--- a/src/test/ui/compile-fail-migration/associated-const-generic-obligations.stderr
+++ b/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
index 77653b27fb5..77653b27fb5 100644
--- a/src/test/ui/associated-const-impl-wrong-lifetime.rs
+++ b/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
index f8375899e3e..f8375899e3e 100644
--- a/src/test/ui/associated-const-impl-wrong-lifetime.stderr
+++ b/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
index 240dfd16097..240dfd16097 100644
--- a/src/test/ui/associated-const-impl-wrong-type.rs
+++ b/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
index cfccacaee28..cfccacaee28 100644
--- a/src/test/ui/associated-const-impl-wrong-type.stderr
+++ b/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
index f837d9ab8e5..f837d9ab8e5 100644
--- a/src/test/ui/compile-fail-migration/associated-const-in-trait.rs
+++ b/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
index 7804e44f2d7..7804e44f2d7 100644
--- a/src/test/ui/compile-fail-migration/associated-const-in-trait.stderr
+++ b/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
index f9a57cd6d75..f9a57cd6d75 100644
--- a/src/test/ui/compile-fail-migration/associated-const-no-item.rs
+++ b/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
index a09c04ea0b2..a09c04ea0b2 100644
--- a/src/test/ui/compile-fail-migration/associated-const-no-item.stderr
+++ b/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
index b5accfff5bb..b5accfff5bb 100644
--- a/src/test/ui/compile-fail-migration/associated-const-private-impl.rs
+++ b/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
index 65be3753bac..65be3753bac 100644
--- a/src/test/ui/compile-fail-migration/associated-const-private-impl.stderr
+++ b/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
index 630a234fa66..630a234fa66 100644
--- 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
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
index a88dd4d9955..a88dd4d9955 100644
--- 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
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
index d196cf22156..d196cf22156 100644
--- 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
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
index a440f1f82f1..a440f1f82f1 100644
--- 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
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
index 0b24cab2a68..0b24cab2a68 100644
--- 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
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
index 48891546360..48891546360 100644
--- 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
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
index 497ff426b2f..497ff426b2f 100644
--- 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
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
index 7a5cad69094..7a5cad69094 100644
--- 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
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
index 85ea949b9c8..85ea949b9c8 100644
--- 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
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
index 3b9be8976b4..3b9be8976b4 100644
--- 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
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
index 12cab13d0b9..12cab13d0b9 100644
--- 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
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
index 3edf59f2010..3edf59f2010 100644
--- 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
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
index a2fc1bc0177..a2fc1bc0177 100644
--- a/src/test/ui/compile-fail-migration/associated-item-duplicate-names.rs
+++ b/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
index 4b060a991f9..4b060a991f9 100644
--- a/src/test/ui/compile-fail-migration/associated-item-duplicate-names.stderr
+++ b/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
index 7daf0d3c4e2..7daf0d3c4e2 100644
--- a/src/test/ui/compile-fail-migration/associated-path-shl.rs
+++ b/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
index fa41d4abff4..fa41d4abff4 100644
--- a/src/test/ui/compile-fail-migration/associated-path-shl.stderr
+++ b/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
index ce97019a2b2..ce97019a2b2 100644
--- 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
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
index 2706dda1c52..2706dda1c52 100644
--- 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
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
index 5536566c619..5536566c619 100644
--- a/src/test/ui/associated-type-projection-from-multiple-supertraits.rs
+++ b/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
index 7a10b6d021f..7a10b6d021f 100644
--- a/src/test/ui/associated-type-projection-from-multiple-supertraits.stderr
+++ b/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
index b388b6a28e3..b388b6a28e3 100644
--- 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
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
index 4bc09b624c8..4bc09b624c8 100644
--- 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
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
index 75b60aa8d10..75b60aa8d10 100644
--- 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
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
index 7924ab74444..7924ab74444 100644
--- 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
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
index b1194154911..b1194154911 100644
--- 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
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
index c43ff1ae4cb..c43ff1ae4cb 100644
--- 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
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
index cd21fb949cb..cd21fb949cb 100644
--- a/src/test/ui/compile-fail-migration/associated-types-bound-failure.rs
+++ b/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
index 067dfeb454c..067dfeb454c 100644
--- a/src/test/ui/compile-fail-migration/associated-types-bound-failure.stderr
+++ b/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
index 786a25500a8..786a25500a8 100644
--- a/src/test/ui/compile-fail-migration/associated-types-coherence-failure.rs
+++ b/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
index 85d4bf78458..85d4bf78458 100644
--- a/src/test/ui/compile-fail-migration/associated-types-coherence-failure.stderr
+++ b/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
index 6f2ee854543..6f2ee854543 100644
--- a/src/test/ui/compile-fail-migration/associated-types-eq-1.rs
+++ b/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
index 81bb2ae4ce2..81bb2ae4ce2 100644
--- a/src/test/ui/compile-fail-migration/associated-types-eq-1.stderr
+++ b/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
index 755a9f2d73f..755a9f2d73f 100644
--- a/src/test/ui/compile-fail-migration/associated-types-eq-2.rs
+++ b/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
index 0b80f3472dc..0b80f3472dc 100644
--- a/src/test/ui/compile-fail-migration/associated-types-eq-2.stderr
+++ b/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
index cb952f6534f..cb952f6534f 100644
--- a/src/test/ui/compile-fail-migration/associated-types-eq-3.rs
+++ b/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
index d8b2be0e1b0..d8b2be0e1b0 100644
--- a/src/test/ui/compile-fail-migration/associated-types-eq-3.stderr
+++ b/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
index 847393ba2b8..847393ba2b8 100644
--- 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
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
index 36c31cd3f05..36c31cd3f05 100644
--- 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
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
index 52a2ca9082d..52a2ca9082d 100644
--- a/src/test/ui/compile-fail-migration/associated-types-eq-hr.rs
+++ b/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
index 5081a2649d1..5081a2649d1 100644
--- a/src/test/ui/compile-fail-migration/associated-types-eq-hr.stderr
+++ b/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
index a6fcb9cff13..a6fcb9cff13 100644
--- 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
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
index e6c15e465b6..e6c15e465b6 100644
--- 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
diff --git a/src/test/ui/associated-types-in-ambiguous-context.rs b/src/test/ui/associated-types/associated-types-in-ambiguous-context.rs
index becbc27138b..becbc27138b 100644
--- a/src/test/ui/associated-types-in-ambiguous-context.rs
+++ b/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
index c45873ffd53..c45873ffd53 100644
--- a/src/test/ui/associated-types-in-ambiguous-context.stderr
+++ b/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
index c1feb8ac459..c1feb8ac459 100644
--- a/src/test/ui/compile-fail-migration/associated-types-incomplete-object.rs
+++ b/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
index 95b1c631250..95b1c631250 100644
--- a/src/test/ui/compile-fail-migration/associated-types-incomplete-object.stderr
+++ b/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
index 83726a1676d..83726a1676d 100644
--- 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
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
index 40cba5e6834..40cba5e6834 100644
--- 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
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
index 82258f124d3..82258f124d3 100644
--- a/src/test/ui/compile-fail-migration/associated-types-issue-17359.rs
+++ b/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
index 8ba8194bded..8ba8194bded 100644
--- a/src/test/ui/compile-fail-migration/associated-types-issue-17359.stderr
+++ b/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
index a00aa8364bd..a00aa8364bd 100644
--- a/src/test/ui/compile-fail-migration/associated-types-issue-20346.rs
+++ b/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
index 6f3dfbe0898..6f3dfbe0898 100644
--- a/src/test/ui/compile-fail-migration/associated-types-issue-20346.stderr
+++ b/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
index 9436f825de8..9436f825de8 100644
--- 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
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
index c38a5f6e7f4..c38a5f6e7f4 100644
--- 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
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
index baf56ffec86..baf56ffec86 100644
--- 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
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
index 84802d49caa..84802d49caa 100644
--- 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
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
index e0f0f3c47ae..e0f0f3c47ae 100644
--- 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
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
index 712b95f8e54..712b95f8e54 100644
--- 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
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
index ec38595e8fe..ec38595e8fe 100644
--- 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
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
index 6927146ffbc..6927146ffbc 100644
--- 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
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
index 384ed8f3284..384ed8f3284 100644
--- a/src/test/ui/compile-fail-migration/associated-types-outlives.nll.stderr
+++ b/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
index f070ab6799c..f070ab6799c 100644
--- a/src/test/ui/compile-fail-migration/associated-types-outlives.rs
+++ b/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
index 6d46392d94b..6d46392d94b 100644
--- a/src/test/ui/compile-fail-migration/associated-types-outlives.stderr
+++ b/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
index 946a4b2f73a..946a4b2f73a 100644
--- a/src/test/ui/compile-fail-migration/associated-types-overridden-default.rs
+++ b/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
index e9a480be067..e9a480be067 100644
--- a/src/test/ui/compile-fail-migration/associated-types-overridden-default.stderr
+++ b/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
index ab061ca4d8d..ab061ca4d8d 100644
--- a/src/test/ui/compile-fail-migration/associated-types-path-1.rs
+++ b/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
index 04147922d9c..04147922d9c 100644
--- a/src/test/ui/compile-fail-migration/associated-types-path-1.stderr
+++ b/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
index d62f6b0f1a3..d62f6b0f1a3 100644
--- a/src/test/ui/compile-fail-migration/associated-types-path-2.rs
+++ b/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
index 403b4fd4d8e..403b4fd4d8e 100644
--- a/src/test/ui/compile-fail-migration/associated-types-path-2.stderr
+++ b/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
index 5b8223ff292..5b8223ff292 100644
--- 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
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
index 5451a20d816..5451a20d816 100644
--- 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
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
index 12bbfb24910..12bbfb24910 100644
--- 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
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
index a79d5c4649a..a79d5c4649a 100644
--- 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
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
index 399f4d9409a..399f4d9409a 100644
--- 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
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
index e6251a0d318..e6251a0d318 100644
--- 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
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
index 05c0c38c79f..05c0c38c79f 100644
--- 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
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
index af46a1b42d0..af46a1b42d0 100644
--- 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
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
index ccd568b6253..ccd568b6253 100644
--- 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
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
index 3f72391ff90..3f72391ff90 100644
--- 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
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
index e7e68dcf852..e7e68dcf852 100644
--- 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
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
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: <T as Trait<'a>>::Type = loop { };
     let b: <T as Trait<'b>>::Type = loop { };
-    let _: <T as Trait<'a>>::Type = a;
+    let _c: <T as Trait<'a>>::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: <T as Trait<'a>>::Type = loop { };
     let b: <T as Trait<'b>>::Type = loop { };
-    let _: <T as Trait<'b>>::Type = a; //~ ERROR E0623
+    let _c: <T as Trait<'b>>::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: <T as Trait<'a>>::Type = loop { };
     let b: <T as Trait<'b>>::Type = loop { };
-    let _: <T as Trait<'a>>::Type = b; //~ ERROR E0623
+    let _c: <T as Trait<'a>>::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: <T as Trait<'a>>::Type = loop { };
     let b: <T as Trait<'b>>::Type = loop { };
-    let _: <T as Trait<'b>>::Type = b;
+    let _c: <T as Trait<'b>>::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
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 _: <T as Trait<'b>>::Type = a; //~ ERROR E0623
-   |                                     ^ ...but data from `y` flows into `x` here
+LL |     let _c: <T as Trait<'b>>::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 _: <T as Trait<'a>>::Type = b; //~ ERROR E0623
-   |                                     ^ ...but data from `y` flows into `x` here
+LL |     let _c: <T as Trait<'a>>::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
index aecbf217a5b..aecbf217a5b 100644
--- a/src/test/ui/compile-fail-migration/associated-types-unconstrained.rs
+++ b/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
index abb220c96c6..abb220c96c6 100644
--- a/src/test/ui/compile-fail-migration/associated-types-unconstrained.stderr
+++ b/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
index c561ae861ed..c561ae861ed 100644
--- a/src/test/ui/compile-fail-migration/associated-types-unsized.rs
+++ b/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
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 `<T as Get>::Value`
-   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = help: consider adding a `where <T as Get>::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
index 23a67b5b064..23a67b5b064 100644
--- 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
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
index c969baeaefe..c969baeaefe 100644
--- 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
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
index f24fed0f02e..f24fed0f02e 100644
--- 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
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
index 9ba5045f2a0..9ba5045f2a0 100644
--- a/src/test/ui/compile-fail-migration/associated-types/bound-lifetime-constrained.rs
+++ b/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
index 5df8a828012..5df8a828012 100644
--- 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
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
index 0a12aa76a78..0a12aa76a78 100644
--- 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
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
index 53594cb83fc..53594cb83fc 100644
--- 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
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
index 39a5366080b..39a5366080b 100644
--- 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
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
index 7cb0623315e..7cb0623315e 100644
--- 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
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
index 8fefdfd4d19..8fefdfd4d19 100644
--- 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
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
index ce2cfa6765d..ce2cfa6765d 100644
--- 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
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
index 21bef7e5e52..21bef7e5e52 100644
--- 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
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
index b9b1317cef5..b9b1317cef5 100644
--- 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
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
index 26a1585463a..26a1585463a 100644
--- 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
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
index db52e4de69b..db52e4de69b 100644
--- 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
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
index a753527ea53..a753527ea53 100644
--- a/src/test/ui/compile-fail-migration/associated-types/cache/chrono-scan.rs
+++ b/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
index 99281e74565..99281e74565 100644
--- a/src/test/ui/compile-fail-migration/associated-types/cache/chrono-scan.stderr
+++ b/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
index d1117328c86..d1117328c86 100644
--- a/src/test/ui/compile-fail-migration/associated-types/cache/elision.rs
+++ b/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
index c5314b58002..c5314b58002 100644
--- a/src/test/ui/compile-fail-migration/associated-types/cache/elision.stderr
+++ b/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
index 89a7bb00f74..89a7bb00f74 100644
--- 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
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
index 6cecf68ffff..6cecf68ffff 100644
--- 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
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
index c92aa37a60f..c92aa37a60f 100644
--- 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
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
index c92aa37a60f..c92aa37a60f 100644
--- 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
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
index a5e8f4068e6..a5e8f4068e6 100644
--- 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
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
index 793209b7cbc..793209b7cbc 100644
--- 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
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
index 9d42c8e3c63..9d42c8e3c63 100644
--- 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
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
index dedce312156..dedce312156 100644
--- 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
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
index e867ac4baac..e867ac4baac 100644
--- 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
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
index e3e620ea3a0..e3e620ea3a0 100644
--- 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
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
index a669c7ac73b..a669c7ac73b 100644
--- 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
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
index 7c86e20fe64..7c86e20fe64 100644
--- 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
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
index 6e4bdd4b21c..6e4bdd4b21c 100644
--- 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
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
index ed3f2a07aa2..ed3f2a07aa2 100644
--- 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
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
index 6432ab9e57d..6432ab9e57d 100644
--- 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
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
index 1351d14fe00..1351d14fe00 100644
--- 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
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
index 861827f329b..861827f329b 100644
--- 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
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
index 12341fa8db3..12341fa8db3 100644
--- a/src/test/ui/compile-fail-migration/associated-types/higher-ranked-projection.rs
+++ b/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
index b5b3ecbb580..b5b3ecbb580 100644
--- a/src/test/ui/compile-fail-migration/associated-types/issue-36499.rs
+++ b/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
index 5167c47a6cf..5167c47a6cf 100644
--- a/src/test/ui/compile-fail-migration/associated-types/issue-36499.stderr
+++ b/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
index 3d6c46f5ce3..3d6c46f5ce3 100644
--- a/src/test/ui/compile-fail-migration/attempted-access-non-fatal.rs
+++ b/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
index d056a3eff6f..d056a3eff6f 100644
--- a/src/test/ui/compile-fail-migration/attempted-access-non-fatal.stderr
+++ b/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
index 4ab07f4fa99..4ab07f4fa99 100644
--- a/src/test/ui/compile-fail-migration/attr-bad-crate-attr.rc
+++ b/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
index 250905dbdcd..250905dbdcd 100644
--- a/src/test/ui/compile-fail-migration/attr-usage-inline.rs
+++ b/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
index 171bd949e10..171bd949e10 100644
--- a/src/test/ui/compile-fail-migration/attr-usage-inline.stderr
+++ b/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
index ec7885f1f44..ec7885f1f44 100644
--- 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
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
index afab999b02e..afab999b02e 100644
--- 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
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
index efe2d5561a8..efe2d5561a8 100644
--- 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
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
index 8bff45ea989..8bff45ea989 100644
--- 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
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
index e7d5b94d242..e7d5b94d242 100644
--- 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
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
index 351c788f84f..351c788f84f 100644
--- 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
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
index 324e9259647..324e9259647 100644
--- a/src/test/ui/compile-fail-migration/auto-ref-slice-plus-ref.rs
+++ b/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
index f62ac84a185..f62ac84a185 100644
--- a/src/test/ui/compile-fail-migration/auto-ref-slice-plus-ref.stderr
+++ b/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
index 92b222e1322..92b222e1322 100644
--- a/src/test/ui/compile-fail-migration/auto-trait-validation.rs
+++ b/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
index a6bd887021e..a6bd887021e 100644
--- a/src/test/ui/compile-fail-migration/auto-trait-validation.stderr
+++ b/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
index c152fdd9296..c152fdd9296 100644
--- a/src/test/ui/compile-fail-migration/autoderef-full-lval.rs
+++ b/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
index df8eeb5d171..df8eeb5d171 100644
--- a/src/test/ui/compile-fail-migration/autoderef-full-lval.stderr
+++ b/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
index a3d0222a14c..a3d0222a14c 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/cdylib-dep.rs
+++ b/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
index 050f2fe7329..050f2fe7329 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/crateresolve1-1.rs
+++ b/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
index d19b3bafba5..d19b3bafba5 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/crateresolve1-2.rs
+++ b/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
index c5096ac49a8..c5096ac49a8 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/crateresolve1-3.rs
+++ b/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
index 4bd8ecacb96..4bd8ecacb96 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/auxiliary/define_macro.rs b/src/test/ui/auxiliary/define_macro.rs
index 6b6b14a896b..6b6b14a896b 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/define_macro.rs
+++ b/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
index 07f70b177b3..07f70b177b3 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/extern-statics.rs
+++ b/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
index ea09327bd19..ea09327bd19 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/lto-duplicate-symbols1.rs
+++ b/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
index ea09327bd19..ea09327bd19 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/lto-duplicate-symbols2.rs
+++ b/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
index 3bf39b788db..3bf39b788db 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/namespaced_enums.rs
+++ b/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
index 5ae8e0d298e..5ae8e0d298e 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/noexporttypelib.rs
+++ b/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
index cf3e9903b5a..cf3e9903b5a 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/orphan_check_diagnostics.rs
+++ b/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
index 4207fc2373b..4207fc2373b 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/rmeta_meta.rs
+++ b/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
index 6096c4df05b..6096c4df05b 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/rmeta_rlib.rs
+++ b/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
index a59f4b4e8f4..a59f4b4e8f4 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/stability_cfg2.rs
+++ b/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
index 6434e62b6f7..6434e62b6f7 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/weak-lang-items.rs
+++ b/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
index 5e7bc61943b..5e7bc61943b 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/xc_private_method_lib.rs
+++ b/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
index 5547d19868d..5547d19868d 100644
--- a/src/test/ui/compile-fail-migration/bad-const-type.rs
+++ b/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
index fbde1573200..fbde1573200 100644
--- a/src/test/ui/compile-fail-migration/bad-const-type.stderr
+++ b/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
index 70e1806a20b..70e1806a20b 100644
--- a/src/test/ui/bad-crate-name.rs
+++ b/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
index 8348badeeeb..8348badeeeb 100644
--- a/src/test/ui/bad-crate-name.stderr
+++ b/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
index 6a5e4cfef89..6a5e4cfef89 100644
--- a/src/test/ui/compile-fail-migration/bad-env-capture.rs
+++ b/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
index bf460d2a81e..bf460d2a81e 100644
--- a/src/test/ui/compile-fail-migration/bad-env-capture.stderr
+++ b/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
index cf67c73c539..cf67c73c539 100644
--- a/src/test/ui/compile-fail-migration/bad-env-capture2.rs
+++ b/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
index 8d5703d29f5..8d5703d29f5 100644
--- a/src/test/ui/compile-fail-migration/bad-env-capture2.stderr
+++ b/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
index a30c6770b87..a30c6770b87 100644
--- a/src/test/ui/compile-fail-migration/bad-env-capture3.rs
+++ b/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
index 258f7d43b56..258f7d43b56 100644
--- a/src/test/ui/compile-fail-migration/bad-env-capture3.stderr
+++ b/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
index c7d2f2c472f..c7d2f2c472f 100644
--- a/src/test/ui/compile-fail-migration/bad-expr-lhs.rs
+++ b/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
index 5937beef9c7..5937beef9c7 100644
--- a/src/test/ui/compile-fail-migration/bad-expr-lhs.stderr
+++ b/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
index bd62dc66377..bd62dc66377 100644
--- a/src/test/ui/compile-fail-migration/bad-expr-path.rs
+++ b/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
index a1ac17c78d6..a1ac17c78d6 100644
--- a/src/test/ui/compile-fail-migration/bad-expr-path.stderr
+++ b/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
index 06b72d1ed47..06b72d1ed47 100644
--- a/src/test/ui/compile-fail-migration/bad-expr-path2.rs
+++ b/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
index bb7d01c72fe..bb7d01c72fe 100644
--- a/src/test/ui/compile-fail-migration/bad-expr-path2.stderr
+++ b/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
index ff63d4b739a..ff63d4b739a 100644
--- a/src/test/ui/compile-fail-migration/bad-extern-link-attrs.rs
+++ b/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
index 5e58bcd0094..5e58bcd0094 100644
--- a/src/test/ui/compile-fail-migration/bad-extern-link-attrs.stderr
+++ b/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
index 2fe94d43acd..2fe94d43acd 100644
--- a/src/test/ui/compile-fail-migration/bad-intrinsic-monomorphization.rs
+++ b/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
index a088dd0aa43..a088dd0aa43 100644
--- a/src/test/ui/compile-fail-migration/bad-intrinsic-monomorphization.stderr
+++ b/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
index cb9c347af60..cb9c347af60 100644
--- a/src/test/ui/compile-fail-migration/bad-lint-cap.rs
+++ b/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
index f284dbf8479..f284dbf8479 100644
--- a/src/test/ui/compile-fail-migration/bad-lint-cap.stderr
+++ b/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
index cb9fb973a01..cb9fb973a01 100644
--- a/src/test/ui/compile-fail-migration/bad-lint-cap2.rs
+++ b/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
index 7471aa21e58..7471aa21e58 100644
--- a/src/test/ui/compile-fail-migration/bad-lint-cap2.stderr
+++ b/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
index c9394954c5f..c9394954c5f 100644
--- a/src/test/ui/compile-fail-migration/bad-lint-cap3.rs
+++ b/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
index d3224607314..d3224607314 100644
--- a/src/test/ui/compile-fail-migration/bad-lint-cap3.stderr
+++ b/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
index b73b4a6af6e..b73b4a6af6e 100644
--- a/src/test/ui/compile-fail-migration/bad-main.rs
+++ b/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
index 3388e0866e5..3388e0866e5 100644
--- a/src/test/ui/compile-fail-migration/bad-main.stderr
+++ b/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
index 7cef3f13dfc..7cef3f13dfc 100644
--- a/src/test/ui/compile-fail-migration/bad-method-typaram-kind.rs
+++ b/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
index ed0c49a4f66..ed0c49a4f66 100644
--- a/src/test/ui/compile-fail-migration/bad-method-typaram-kind.stderr
+++ b/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
index 20ac757354f..20ac757354f 100644
--- a/src/test/ui/compile-fail-migration/bad-mid-path-type-params.rs
+++ b/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
index d2b002ebee9..d2b002ebee9 100644
--- a/src/test/ui/compile-fail-migration/bad-mid-path-type-params.stderr
+++ b/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
index 6987d06ef12..6987d06ef12 100644
--- a/src/test/ui/compile-fail-migration/bad-module.rs
+++ b/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
index 8c19922dcab..8c19922dcab 100644
--- a/src/test/ui/compile-fail-migration/bad-module.stderr
+++ b/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
index a58aebee77b..a58aebee77b 100644
--- a/src/test/ui/compile-fail-migration/bad-sized.rs
+++ b/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
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<Trait + Sized> = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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<Trait + Sized> = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = note: required by `<std::vec::Vec<T>>::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
index c1547dd82b3..c1547dd82b3 100644
--- a/src/test/ui/compile-fail-migration/bad-type-env-capture.rs
+++ b/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
index 3cb087ab09a..3cb087ab09a 100644
--- a/src/test/ui/compile-fail-migration/bad-type-env-capture.stderr
+++ b/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
index 2a5c7136dc3..2a5c7136dc3 100644
--- 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
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
index 2f05755eabd..2f05755eabd 100644
--- 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
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
index 3d3ccb606bf..3d3ccb606bf 100644
--- 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
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
index a573b9a04ba..a573b9a04ba 100644
--- 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
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
index 8c7542fbe6b..8c7542fbe6b 100644
--- 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
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
index e38916b8b27..e38916b8b27 100644
--- 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
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
index bb6060f2543..bb6060f2543 100644
--- 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
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
index ed516cd559e..ed516cd559e 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/binop-bitxor-str.rs b/src/test/ui/binop/binop-bitxor-str.rs
index 3f26e3ce904..3f26e3ce904 100644
--- a/src/test/ui/compile-fail-migration/binop-bitxor-str.rs
+++ b/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
index a6804a6d42c..a6804a6d42c 100644
--- a/src/test/ui/compile-fail-migration/binop-bitxor-str.stderr
+++ b/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
index c525a67c7e9..c525a67c7e9 100644
--- a/src/test/ui/compile-fail-migration/binop-consume-args.rs
+++ b/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
index 07627d3711b..07627d3711b 100644
--- a/src/test/ui/compile-fail-migration/binop-consume-args.stderr
+++ b/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
index f3fb5a08c85..f3fb5a08c85 100644
--- a/src/test/ui/compile-fail-migration/binop-logic-float.rs
+++ b/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
index 947ee4e2427..947ee4e2427 100644
--- a/src/test/ui/compile-fail-migration/binop-logic-float.stderr
+++ b/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
index f5e53f84c16..f5e53f84c16 100644
--- a/src/test/ui/compile-fail-migration/binop-logic-int.rs
+++ b/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
index 56f7601ace2..56f7601ace2 100644
--- a/src/test/ui/compile-fail-migration/binop-logic-int.stderr
+++ b/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
index 98762a0f6cf..98762a0f6cf 100644
--- a/src/test/ui/compile-fail-migration/binop-move-semantics.nll.stderr
+++ b/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
index cff0064497a..cff0064497a 100644
--- a/src/test/ui/compile-fail-migration/binop-move-semantics.rs
+++ b/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
index 81b8a336a20..81b8a336a20 100644
--- a/src/test/ui/compile-fail-migration/binop-move-semantics.stderr
+++ b/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
index a36477fc183..a36477fc183 100644
--- a/src/test/ui/compile-fail-migration/binop-mul-bool.rs
+++ b/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
index 1df50876c26..1df50876c26 100644
--- a/src/test/ui/compile-fail-migration/binop-mul-bool.stderr
+++ b/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
index 8f17288e991..8f17288e991 100644
--- a/src/test/ui/compile-fail-migration/binop-typeck.rs
+++ b/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
index 1ff81779f3d..1ff81779f3d 100644
--- a/src/test/ui/compile-fail-migration/binop-typeck.stderr
+++ b/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
index eeadecf627d..eeadecf627d 100644
--- a/src/test/ui/compile-fail-migration/blind-item-block-item-shadow.rs
+++ b/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
index 5adc953e405..5adc953e405 100644
--- a/src/test/ui/compile-fail-migration/blind-item-block-item-shadow.stderr
+++ b/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
index a501a5cd3ec..a501a5cd3ec 100644
--- a/src/test/ui/compile-fail-migration/blind-item-block-middle.rs
+++ b/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
index 0123fd01173..0123fd01173 100644
--- a/src/test/ui/compile-fail-migration/blind-item-block-middle.stderr
+++ b/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
index 38f9a552e1b..38f9a552e1b 100644
--- a/src/test/ui/blind-item-item-shadow.rs
+++ b/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
index 240ea6061b9..240ea6061b9 100644
--- a/src/test/ui/blind-item-item-shadow.stderr
+++ b/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
index 631add3e62d..631add3e62d 100644
--- a/src/test/ui/compile-fail-migration/borrow-immutable-upvar-mutation.nll.stderr
+++ b/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
index 00f51973a41..00f51973a41 100644
--- a/src/test/ui/compile-fail-migration/borrow-immutable-upvar-mutation.rs
+++ b/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
index 740e1820f4f..740e1820f4f 100644
--- a/src/test/ui/compile-fail-migration/borrow-immutable-upvar-mutation.stderr
+++ b/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
index 4337f569fa4..4337f569fa4 100644
--- a/src/test/ui/compile-fail-migration/borrow-tuple-fields.rs
+++ b/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
index d010d1d989c..d010d1d989c 100644
--- a/src/test/ui/compile-fail-migration/borrow-tuple-fields.stderr
+++ b/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
index 0df5e0c6e66..0df5e0c6e66 100644
--- 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
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
index b17245673e0..b17245673e0 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-access-permissions.ast.stderr
+++ b/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
index 0df5e0c6e66..0df5e0c6e66 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-access-permissions.mir.stderr
+++ b/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
index 00a3da86074..00a3da86074 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-access-permissions.rs
+++ b/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
index 0b1b157f3e0..0b1b157f3e0 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-and-init.nll.stderr
+++ b/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
index 92f16d8ffce..92f16d8ffce 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-and-init.rs
+++ b/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
index 2cbc57d66e9..2cbc57d66e9 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-and-init.stderr
+++ b/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
index 0fe9106249b..0fe9106249b 100644
--- 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
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
index 5ee2b89dd98..5ee2b89dd98 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-struct.rs
+++ b/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
index e635a2392e1..e635a2392e1 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-struct.stderr
+++ b/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
index 015174a9e45..015174a9e45 100644
--- 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
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
index ebaed01756f..ebaed01756f 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-tuple.rs
+++ b/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
index d05d1c31f9d..d05d1c31f9d 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-tuple.stderr
+++ b/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
index e4b9f2f2329..e4b9f2f2329 100644
--- 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
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
index 4e1b85283a6..4e1b85283a6 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-variant.rs
+++ b/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
index 817d0154a63..817d0154a63 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-anon-fields-variant.stderr
+++ b/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
index 4470566eabb..4470566eabb 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-argument.nll.stderr
+++ b/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
index 3230689e53c..3230689e53c 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-argument.rs
+++ b/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
index 2a7a7b3ffee..2a7a7b3ffee 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-argument.stderr
+++ b/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
index 6936d32a789..6936d32a789 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-asm.ast.nll.stderr
+++ b/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
index e2e54aa9b8a..e2e54aa9b8a 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-asm.ast.stderr
+++ b/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
index 6936d32a789..6936d32a789 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-asm.mir.stderr
+++ b/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
index d9816401b33..d9816401b33 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-asm.rs
+++ b/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
index f4568d7c9eb..f4568d7c9eb 100644
--- 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
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
index 1e665a12a19..1e665a12a19 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp-idx.rs
+++ b/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
index 69a69b36fc7..69a69b36fc7 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp-idx.stderr
+++ b/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
index 2a1fbfd43bf..2a1fbfd43bf 100644
--- 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
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
index 9e5e0e197a9..9e5e0e197a9 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp.ast.stderr
+++ b/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
index 2a1fbfd43bf..2a1fbfd43bf 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp.mir.stderr
+++ b/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
index d68420eb205..d68420eb205 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-comp.rs
+++ b/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
index eb4c1ff025b..eb4c1ff025b 100644
--- 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
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
index d66cdb99a74..d66cdb99a74 100644
--- 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
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
index 4fb65988eee..4fb65988eee 100644
--- 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
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
index 8ca7229b42a..8ca7229b42a 100644
--- 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
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
index 77aa57ef1b5..77aa57ef1b5 100644
--- 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
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
index 9a7c8330505..9a7c8330505 100644
--- 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
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
index 861fe2f2c50..861fe2f2c50 100644
--- 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
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
index 09ddf8387ce..09ddf8387ce 100644
--- 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
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
index 861fe2f2c50..861fe2f2c50 100644
--- 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
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
index 57002dd40fc..57002dd40fc 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-assign-to-constants.rs
+++ b/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
index b41d5cd3623..b41d5cd3623 100644
--- 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
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
index ea020dc0685..ea020dc0685 100644
--- 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
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
index ca6b86e5ca6..ca6b86e5ca6 100644
--- 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
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
index eb26676cde2..eb26676cde2 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-autoref-3261.nll.stderr
+++ b/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
index d5f09305808..d5f09305808 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-autoref-3261.rs
+++ b/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
index c9e649dee0c..c9e649dee0c 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-autoref-3261.stderr
+++ b/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
index 73f533a6b96..73f533a6b96 100644
--- 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
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
index 7913f9ac903..7913f9ac903 100644
--- 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
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
index 461d2fec589..461d2fec589 100644
--- 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
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
index ecb70068fed..ecb70068fed 100644
--- 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
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
index e24d4e87add..e24d4e87add 100644
--- 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
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
index 7ed1f2c6583..7ed1f2c6583 100644
--- 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
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
index f3246c12bd9..f3246c12bd9 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-block-unint.nll.stderr
+++ b/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
index a09ee439245..a09ee439245 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-block-unint.rs
+++ b/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
index 53aa8919fd8..53aa8919fd8 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-block-unint.stderr
+++ b/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
index 08d66eb0344..08d66eb0344 100644
--- 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
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
index e5091a92581..e5091a92581 100644
--- 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
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
index 9fc030f604c..9fc030f604c 100644
--- 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
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
index 8d1b9ca672a..8d1b9ca672a 100644
--- 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
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
index 440be93dfdc..440be93dfdc 100644
--- 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
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
index cd0d6aa4ca3..cd0d6aa4ca3 100644
--- 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
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
index f7514df800d..f7514df800d 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-temporary.rs
+++ b/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
index 7dcfb3e3c87..7dcfb3e3c87 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-from-temporary.stderr
+++ b/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
index c2b7d790eea..c2b7d790eea 100644
--- 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
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
index 3662e23a412..3662e23a412 100644
--- 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
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
index d852125a775..d852125a775 100644
--- 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
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
index 8c30e6ac002..8c30e6ac002 100644
--- 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
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
index d60751eddc7..d60751eddc7 100644
--- 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
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
index f90ffa8c35a..f90ffa8c35a 100644
--- 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
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
index 910851a1030..910851a1030 100644
--- 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
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
index e0ea39a2491..e0ea39a2491 100644
--- 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
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
index 522cdfd94d7..522cdfd94d7 100644
--- 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
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
index 693ed29bd05..693ed29bd05 100644
--- 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
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
index 31563fbaa1c..31563fbaa1c 100644
--- 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
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
index 1e8d81fe76e..1e8d81fe76e 100644
--- 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
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
index 5b916243b9e..5b916243b9e 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-overloaded-deref.rs
+++ b/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
index 641f943b6ce..641f943b6ce 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-overloaded-deref.stderr
+++ b/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
index 8f42fb45627..8f42fb45627 100644
--- 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
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
index 9178aadeeeb..9178aadeeeb 100644
--- 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
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
index 890b2894943..890b2894943 100644
--- 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
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
index 04f74af4114..04f74af4114 100644
--- 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
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
index f58eca7c8ae..f58eca7c8ae 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrowed-uniq-rvalue.rs
+++ b/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
index 7defd1ee936..7defd1ee936 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-borrowed-uniq-rvalue.stderr
+++ b/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
index 8c961838ca4..8c961838ca4 100644
--- 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
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
index 82a6c92abaf..82a6c92abaf 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-break-uninit-2.rs
+++ b/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
index 4d7d1a0ed22..4d7d1a0ed22 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-break-uninit-2.stderr
+++ b/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
index 4441c727539..4441c727539 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-break-uninit.nll.stderr
+++ b/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
index 8a6a036945b..8a6a036945b 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-break-uninit.rs
+++ b/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
index 9d5a21319ab..9d5a21319ab 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-break-uninit.stderr
+++ b/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
index f24d0ed046a..f24d0ed046a 100644
--- 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
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
index 628fbbd1901..628fbbd1901 100644
--- 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
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
index f24d0ed046a..f24d0ed046a 100644
--- 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
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
index 9057ba07907..9057ba07907 100644
--- 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
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
index e8fae63a5d6..e8fae63a5d6 100644
--- 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
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
index dc2f0e8395f..dc2f0e8395f 100644
--- 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
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
index 87eb52b6aa6..87eb52b6aa6 100644
--- 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
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
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
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
index 9fefbe2bdc6..9fefbe2bdc6 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-unique-imm.rs
+++ b/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
index a166b6292e6..a166b6292e6 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-unique-imm.stderr
+++ b/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
index 9a74f188a54..9a74f188a54 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-unique.rs
+++ b/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
index 27163bde34f..27163bde34f 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-closures-unique.stderr
+++ b/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
index dc73929989c..dc73929989c 100644
--- 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
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
index bb474342a7c..bb474342a7c 100644
--- 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
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
index 7beb31f3944..7beb31f3944 100644
--- 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
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
index 32490e0dc7d..32490e0dc7d 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-consume-unsize-vec.rs
+++ b/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
index 8199ce70e2a..8199ce70e2a 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-consume-unsize-vec.stderr
+++ b/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
index b999e092847..b999e092847 100644
--- 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
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
index 5bcafa675c7..5bcafa675c7 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-consume-upcast-box.rs
+++ b/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
index 159933a6155..159933a6155 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-consume-upcast-box.stderr
+++ b/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
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
index ca9b2dda8bc..ca9b2dda8bc 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-describe-lvalue.ast.stderr
+++ b/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
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
index b821c7cfa34..b821c7cfa34 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-describe-lvalue.rs
+++ b/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
index 496aa84b593..496aa84b593 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-drop-from-guard.rs
+++ b/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
index e28b500ce63..e28b500ce63 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-drop-from-guard.stderr
+++ b/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
index fb300d32b05..fb300d32b05 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-field-sensitivity.nll.stderr
+++ b/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
index 13fd5fce955..13fd5fce955 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-field-sensitivity.rs
+++ b/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
index e5eba3790a0..e5eba3790a0 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-field-sensitivity.stderr
+++ b/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
index 4d0c762ca77..4d0c762ca77 100644
--- 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
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
index 4d0c762ca77..4d0c762ca77 100644
--- 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
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
index 33b78cb26d8..33b78cb26d8 100644
--- 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
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
index 827b66cf068..827b66cf068 100644
--- 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
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
index e607397e920..e607397e920 100644
--- 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
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
index 1dda8d41860..1dda8d41860 100644
--- 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
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
index f9e517def14..f9e517def14 100644
--- 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
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
index 31ec5aea7f3..31ec5aea7f3 100644
--- 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
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
index baa8a668cd9..baa8a668cd9 100644
--- 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
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
index c3f71d60072..c3f71d60072 100644
--- 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
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
index b79fc5b2bf6..b79fc5b2bf6 100644
--- 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
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
index fd00138356d..fd00138356d 100644
--- 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
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
index 74b542800b9..74b542800b9 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-if-no-else.rs
+++ b/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
index 6c4a53a37d9..6c4a53a37d9 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-if-no-else.stderr
+++ b/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
index f3b02d12854..f3b02d12854 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-if-with-else.rs
+++ b/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
index 097d11e387e..097d11e387e 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-if-with-else.stderr
+++ b/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
index 0a1bc2c1959..0a1bc2c1959 100644
--- 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
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
index cb6d9875a92..cb6d9875a92 100644
--- 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
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
index 0a1bc2c1959..0a1bc2c1959 100644
--- 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
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
index 6f0e0f43f60..6f0e0f43f60 100644
--- 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
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
index 5b32fd2d198..5b32fd2d198 100644
--- 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
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
index e55603c451f..e55603c451f 100644
--- 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
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
index 65f1a1fa098..65f1a1fa098 100644
--- 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
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
index 406fb5e6834..406fb5e6834 100644
--- 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
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
index cac9d890dae..cac9d890dae 100644
--- 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
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
index a5c1ef7f4f5..a5c1ef7f4f5 100644
--- 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
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
index cac9d890dae..cac9d890dae 100644
--- 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
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
index 1ec0f980774..1ec0f980774 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-init-in-fru.rs
+++ b/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
index e0d93fd1d47..e0d93fd1d47 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-init-op-equal.rs
+++ b/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
index b8e91e356c1..b8e91e356c1 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-init-op-equal.stderr
+++ b/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
index a036286f363..a036286f363 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-init-plus-equal.rs
+++ b/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
index f49c06c0c86..f49c06c0c86 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-init-plus-equal.stderr
+++ b/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
index e403b076ab4..e403b076ab4 100644
--- 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
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
index 8499ebb8ac3..8499ebb8ac3 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-insert-during-each.rs
+++ b/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
index 30648edffd8..30648edffd8 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-insert-during-each.stderr
+++ b/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
index d90eda41164..d90eda41164 100644
--- 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
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
index ffb793e48df..ffb793e48df 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-14498.ast.stderr
+++ b/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
index d90eda41164..d90eda41164 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-14498.mir.stderr
+++ b/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
index 3c5f932af47..3c5f932af47 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-14498.rs
+++ b/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
index 500de9865dc..500de9865dc 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-2657-1.rs
+++ b/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
index 532f0e6fb00..532f0e6fb00 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-2657-1.stderr
+++ b/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
index 55c6a40d281..55c6a40d281 100644
--- 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
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
index a389a4a5593..a389a4a5593 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-2657-2.rs
+++ b/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
index 42baecd7943..42baecd7943 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-2657-2.stderr
+++ b/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
index e3bbfd9d5fe..e3bbfd9d5fe 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-48962.rs
+++ b/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
index 4448cedda69..4448cedda69 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-issue-48962.stderr
+++ b/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
index 3df174b4fb8..3df174b4fb8 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-if.rs
+++ b/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
index c53c4e46d4f..c53c4e46d4f 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-if.stderr
+++ b/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
index c46e94866ab..c46e94866ab 100644
--- 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
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
index f09e7ffd7e4..f09e7ffd7e4 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-loop.rs
+++ b/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
index 534e30b564d..534e30b564d 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-loop.stderr
+++ b/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
index 0b6eabfb7ed..0b6eabfb7ed 100644
--- 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
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
index 0fcc6bbbc83..0fcc6bbbc83 100644
--- 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
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
index 0b6eabfb7ed..0b6eabfb7ed 100644
--- 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
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
index f2f3e791422..f2f3e791422 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-match.rs
+++ b/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
index 27a21f0e40a..27a21f0e40a 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow.rs
+++ b/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
index abb83c8dfc8..abb83c8dfc8 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow.stderr
+++ b/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
index e57575d8f03..e57575d8f03 100644
--- 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
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
index a1d633e54f0..a1d633e54f0 100644
--- 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
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
index dc83dc731b3..dc83dc731b3 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-move.rs
+++ b/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
index fb5657f6928..fb5657f6928 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-move.stderr
+++ b/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
index 5c3cd46a87d..5c3cd46a87d 100644
--- 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
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
index 32d8088549d..32d8088549d 100644
--- 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
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
index 752322dec87..752322dec87 100644
--- 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
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
index 03ddfb4c903..03ddfb4c903 100644
--- 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
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
index a9079cfc27d..a9079cfc27d 100644
--- 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
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
index 7cd54e293b0..7cd54e293b0 100644
--- 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
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
index eb9e72a6c5c..eb9e72a6c5c 100644
--- 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
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
index 228e71025fd..228e71025fd 100644
--- 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
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
index 3f5e09b7443..3f5e09b7443 100644
--- 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
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
index b7c87162587..b7c87162587 100644
--- 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
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
index cce55b6c941..cce55b6c941 100644
--- 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
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
index 4db1d1f298e..4db1d1f298e 100644
--- 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
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
index a5b81027c2f..a5b81027c2f 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-rcvr.nll.stderr
+++ b/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
index 014b27f9659..014b27f9659 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-rcvr.rs
+++ b/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
index f5d3cfb3834..f5d3cfb3834 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-rcvr.stderr
+++ b/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
index 492e90914ea..492e90914ea 100644
--- 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
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
index c5de95f8fc0..c5de95f8fc0 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-vec-content.rs
+++ b/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
index 2fcfd1fb08d..2fcfd1fb08d 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-loan-vec-content.stderr
+++ b/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
index 97bf509a458..97bf509a458 100644
--- 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
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
index af1d294c387..af1d294c387 100644
--- 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
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
index 97bf509a458..97bf509a458 100644
--- 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
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
index 0d5feb6b9cc..0d5feb6b9cc 100644
--- 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
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
index 5e2b469e68f..5e2b469e68f 100644
--- 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
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
index 0c61c13345c..0c61c13345c 100644
--- 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
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
index 5e2b469e68f..5e2b469e68f 100644
--- 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
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
index 2c9ace4825d..2c9ace4825d 100644
--- 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
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
index 8dec40520c4..8dec40520c4 100644
--- 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
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
index 2e49f90a169..2e49f90a169 100644
--- 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
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
index 8dec40520c4..8dec40520c4 100644
--- 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
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
index c2136e62a7b..c2136e62a7b 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-match-already-borrowed.rs
+++ b/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
index 0191e0765b3..0191e0765b3 100644
--- 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
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
index 0d776f44daa..0d776f44daa 100644
--- 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
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
index 0191e0765b3..0191e0765b3 100644
--- 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
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
index 30047f84041..30047f84041 100644
--- 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
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
index f5b7ca22278..f5b7ca22278 100644
--- 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
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
index bad52121043..bad52121043 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-by-capture.rs
+++ b/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
index a88af1596ef..a88af1596ef 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-by-capture.stderr
+++ b/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
index 8423b4cc9b0..8423b4cc9b0 100644
--- 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
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
index e5557eca6de..e5557eca6de 100644
--- 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
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
index 4f692bfc55e..4f692bfc55e 100644
--- 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
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
index 9a39ff6206b..9a39ff6206b 100644
--- 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
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
index cad155103f0..cad155103f0 100644
--- 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
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
index f670936dbac..f670936dbac 100644
--- 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
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
index fa7fb649c8d..fa7fb649c8d 100644
--- 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
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
index f670936dbac..f670936dbac 100644
--- 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
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
index 5fdde484f82..5fdde484f82 100644
--- 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
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
index d896ff491c6..d896ff491c6 100644
--- 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
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
index c7576b1b32d..c7576b1b32d 100644
--- 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
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
index d896ff491c6..d896ff491c6 100644
--- 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
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
index 2bd6f75df1b..2bd6f75df1b 100644
--- 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
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
index d18f9623974..d18f9623974 100644
--- 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
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
index 33ccd148f5b..33ccd148f5b 100644
--- 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
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
index d67b63b5aa7..d67b63b5aa7 100644
--- 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
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
index d19c23dce5f..d19c23dce5f 100644
--- 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
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
index d67b63b5aa7..d67b63b5aa7 100644
--- 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
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
index 0db31cef0ed..0db31cef0ed 100644
--- 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
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
index 94f7eba63a1..94f7eba63a1 100644
--- 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
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
index 94f7eba63a1..94f7eba63a1 100644
--- 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
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
index af9202d8d77..af9202d8d77 100644
--- 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
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
index fffcf575ab0..fffcf575ab0 100644
--- 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
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
index df5d911f6a8..df5d911f6a8 100644
--- 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
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
index 65f70a7984f..65f70a7984f 100644
--- 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
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
index 65f70a7984f..65f70a7984f 100644
--- 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
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
index 79eb68c95a0..79eb68c95a0 100644
--- 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
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
index 15c7011d716..15c7011d716 100644
--- 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
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
index 4384f046d16..4384f046d16 100644
--- 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
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
index 15c7011d716..15c7011d716 100644
--- 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
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
index 4bb66ace026..4bb66ace026 100644
--- 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
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
index c69ae8755a9..c69ae8755a9 100644
--- 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
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
index f5fedb8d487..f5fedb8d487 100644
--- 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
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
index 78a065b60da..78a065b60da 100644
--- 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
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
index cd8d0cdfee2..cd8d0cdfee2 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-subcomponent.nll.stderr
+++ b/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
index 88871dda659..88871dda659 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-subcomponent.rs
+++ b/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
index f249f0f22cd..f249f0f22cd 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-move-subcomponent.stderr
+++ b/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
index ce1880c584a..ce1880c584a 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-multiple-captures.nll.stderr
+++ b/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
index 042b914ce41..042b914ce41 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-multiple-captures.rs
+++ b/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
index 3163ca63452..3163ca63452 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-multiple-captures.stderr
+++ b/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
index 352ace41d93..352ace41d93 100644
--- 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
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
index b6626a835e4..b6626a835e4 100644
--- 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
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
index 0859a4e0f55..0859a4e0f55 100644
--- 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
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
index b3c86a56091..b3c86a56091 100644
--- 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
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
index 7a43cf15422..7a43cf15422 100644
--- 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
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
index b3c86a56091..b3c86a56091 100644
--- 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
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
index 7b0a71815a5..7b0a71815a5 100644
--- 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
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
index 5b73ca8e49a..5b73ca8e49a 100644
--- 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
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
index e7d41dd4602..e7d41dd4602 100644
--- 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
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
index 7c151da3c36..7c151da3c36 100644
--- 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
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
index 4e0304e20c0..4e0304e20c0 100644
--- 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
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
index e2fd9d771f1..e2fd9d771f1 100644
--- 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
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
index e35edca639e..e35edca639e 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-mutate-in-guard.rs
+++ b/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
index 7a111a1bbcc..7a111a1bbcc 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-mutate-in-guard.stderr
+++ b/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
index 9bb1e825f25..9bb1e825f25 100644
--- 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
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
index 8cb7423f3cb..8cb7423f3cb 100644
--- 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
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
index 693f25e243c..693f25e243c 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-object-lifetime.rs b/src/test/ui/borrowck/borrowck-object-lifetime.rs
index 23148304d6c..23148304d6c 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-object-lifetime.rs
+++ b/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
index 56800075795..56800075795 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-object-lifetime.stderr
+++ b/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
index dd8bf879735..dd8bf879735 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-or-init.nll.stderr
+++ b/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
index 27871a6ab16..27871a6ab16 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-or-init.rs
+++ b/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
index bc1c3a51667..bc1c3a51667 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-or-init.stderr
+++ b/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
index dc8d731dede..dc8d731dede 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-call.nll.stderr
+++ b/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
index 41f3e472cd1..41f3e472cd1 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-call.rs
+++ b/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
index 213d78339e2..213d78339e2 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-call.stderr
+++ b/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
index 874e6d74b64..874e6d74b64 100644
--- 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
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
index 8343b60dfbf..8343b60dfbf 100644
--- 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
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
index 874e6d74b64..874e6d74b64 100644
--- 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
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
index 931d053ae7b..931d053ae7b 100644
--- 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
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
index 51d154c0f3a..51d154c0f3a 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-autoderef.rs
+++ b/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
index d269ce5ec34..d269ce5ec34 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-autoderef.stderr
+++ b/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
index 4a72d7f3302..4a72d7f3302 100644
--- 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
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
index df72c2b0af7..df72c2b0af7 100644
--- 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
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
index 56246cbf770..56246cbf770 100644
--- 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
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
index 824d8298ecb..824d8298ecb 100644
--- 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
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
index d8615d19053..d8615d19053 100644
--- 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
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
index cfa5a6e317d..cfa5a6e317d 100644
--- 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
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
index 3a2bfb18cb9..3a2bfb18cb9 100644
--- 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
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
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
index 3a2bfb18cb9..3a2bfb18cb9 100644
--- 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
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
index f4f40e0407f..f4f40e0407f 100644
--- 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
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
index 0444bf97c65..0444bf97c65 100644
--- 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
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
index 1ee040a0705..1ee040a0705 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-1.rs
+++ b/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
index c03921cd3dd..c03921cd3dd 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-1.stderr
+++ b/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
index 14272fa3ed5..14272fa3ed5 100644
--- 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
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
index c9cdeff9c7a..c9cdeff9c7a 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-2.rs
+++ b/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
index 4ed87b95292..4ed87b95292 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-2.stderr
+++ b/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
index 3979f1e6753..3979f1e6753 100644
--- 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
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
index 0aa73892b82..0aa73892b82 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-3.rs
+++ b/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
index 66465c07374..66465c07374 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-3.stderr
+++ b/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
index e1ede72a7c9..e1ede72a7c9 100644
--- 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
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
index 774e04ecb29..774e04ecb29 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-4.rs
+++ b/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
index 229a53ad827..229a53ad827 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-partial-reinit-4.stderr
+++ b/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
index cfcf177efa3..cfcf177efa3 100644
--- 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
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
index fdc04e226a5..fdc04e226a5 100644
--- 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
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
index cfcf177efa3..cfcf177efa3 100644
--- 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
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
index d917a0abb88..d917a0abb88 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-pat-reassign-binding.rs
+++ b/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
index 4c81bb8eb30..4c81bb8eb30 100644
--- 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
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
index 6f5dfa67be5..6f5dfa67be5 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-reborrow-from-mut.rs
+++ b/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
index 00660ff8484..00660ff8484 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-reborrow-from-mut.stderr
+++ b/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
index 43c2a84c957..43c2a84c957 100644
--- 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
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
index af85e68f5de..af85e68f5de 100644
--- 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
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
index 52dabfaa1d4..52dabfaa1d4 100644
--- 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
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
index ccea5d9565b..ccea5d9565b 100644
--- 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
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
index 1784b72a699..1784b72a699 100644
--- 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
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
index 2e2a1224306..2e2a1224306 100644
--- 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
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
index 93436d0ca97..93436d0ca97 100644
--- 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
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
index 7529943f0bc..7529943f0bc 100644
--- 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
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
index 69d5229244b..69d5229244b 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/borrowck/borrowck-return.rs b/src/test/ui/borrowck/borrowck-return.rs
index 74d435b35e7..74d435b35e7 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-return.rs
+++ b/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
index 7223289b376..7223289b376 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-return.stderr
+++ b/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
index bc01088696d..bc01088696d 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-storage-dead.rs
+++ b/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
index edb7c13cf8b..edb7c13cf8b 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-storage-dead.stderr
+++ b/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
index a811f5d4def..a811f5d4def 100644
--- 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
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
index aebee2c3321..aebee2c3321 100644
--- 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
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
index a811f5d4def..a811f5d4def 100644
--- 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
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
index f90651687a5..f90651687a5 100644
--- 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
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
index cf9fab9f0a1..cf9fab9f0a1 100644
--- 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
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
index f9e4a580ccc..f9e4a580ccc 100644
--- 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
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
index 27e0dba5095..27e0dba5095 100644
--- 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
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
index 7aa02558446..7aa02558446 100644
--- 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
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
index caeaa173bb8..caeaa173bb8 100644
--- 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
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
index 968fbb4526d..968fbb4526d 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-unary-move.ast.stderr
+++ b/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
index caeaa173bb8..caeaa173bb8 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-unary-move.mir.stderr
+++ b/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
index 8163ce29939..8163ce29939 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-unary-move.rs
+++ b/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
index 3fbb747db24..3fbb747db24 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-unboxed-closures.nll.stderr
+++ b/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
index 4813b4b6a72..4813b4b6a72 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-unboxed-closures.rs
+++ b/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
index 03b835d3077..03b835d3077 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-unboxed-closures.stderr
+++ b/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
index acd827d6c62..acd827d6c62 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-after-item.rs
+++ b/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
index 17f9c0197ab..17f9c0197ab 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-after-item.stderr
+++ b/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
index 9c7dbd7e778..9c7dbd7e778 100644
--- 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
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
index 8536bf22de9..8536bf22de9 100644
--- 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
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
index 9c7dbd7e778..9c7dbd7e778 100644
--- 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
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
index eec7df84c82..eec7df84c82 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-field-access.rs
+++ b/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
index e253ecc74b9..e253ecc74b9 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-in-assignop.rs
+++ b/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
index 7d905f64761..7d905f64761 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-in-assignop.stderr
+++ b/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
index bd9836e3174..bd9836e3174 100644
--- 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
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
index 6b51414e5a2..6b51414e5a2 100644
--- 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
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
index bd9836e3174..bd9836e3174 100644
--- 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
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
index c52b1f0bf64..c52b1f0bf64 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit-ref-chain.rs
+++ b/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
index f4b73bc889f..f4b73bc889f 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit.rs
+++ b/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
index ce78001dc64..ce78001dc64 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-uninit.stderr
+++ b/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
index f1c4e4c1869..f1c4e4c1869 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-borrow-nested.rs
+++ b/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
index 4e7392a4228..4e7392a4228 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-borrow-nested.stderr
+++ b/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
index 2f14826fa12..2f14826fa12 100644
--- 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
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
index 9a020705792..9a020705792 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-borrow.ast.stderr
+++ b/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
index 2f14826fa12..2f14826fa12 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-borrow.mir.stderr
+++ b/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
index 97193bd0191..97193bd0191 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-borrow.rs
+++ b/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
index 2a877050e4c..2a877050e4c 100644
--- 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
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
index d4d7bc6b0f7..d4d7bc6b0f7 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-move-assign.rs
+++ b/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
index b0924d28c9c..b0924d28c9c 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-move-assign.stderr
+++ b/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
index 6fd6a1c82a1..6fd6a1c82a1 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-move.nll.stderr
+++ b/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
index 5320244cf43..5320244cf43 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-move.rs
+++ b/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
index d3e441bbbf4..d3e441bbbf4 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-move.stderr
+++ b/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
index 49bc6d32636..49bc6d32636 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-uninitialized.nll.stderr
+++ b/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
index 81376a1a169..81376a1a169 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-uninitialized.rs
+++ b/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
index 901d1ecc506..901d1ecc506 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-union-uninitialized.stderr
+++ b/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
index 5a4e27768af..5a4e27768af 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-uniq-via-lend.rs
+++ b/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
index b731a6192d1..b731a6192d1 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-uniq-via-lend.stderr
+++ b/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
index d69693eb035..d69693eb035 100644
--- 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
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
index 3a33081dfcd..3a33081dfcd 100644
--- 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
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
index d69693eb035..d69693eb035 100644
--- 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
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
index eb99f78f461..eb99f78f461 100644
--- 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
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
index 2289dd688cf..2289dd688cf 100644
--- 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
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
index c11e58651aa..c11e58651aa 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-use-mut-borrow.rs
+++ b/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
index c5bfd813a79..c5bfd813a79 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-use-mut-borrow.stderr
+++ b/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
index b96379db650..b96379db650 100644
--- 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
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
index 47ea9f33b1e..47ea9f33b1e 100644
--- 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
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
index b96379db650..b96379db650 100644
--- 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
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
index 57c2d508356..57c2d508356 100644
--- 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
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
index 6eddbd934d5..6eddbd934d5 100644
--- 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
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
index 75109abad51..75109abad51 100644
--- 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
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
index 6eddbd934d5..6eddbd934d5 100644
--- 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
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
index dbc20d02057..dbc20d02057 100644
--- 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
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
index 374256c6bd6..374256c6bd6 100644
--- 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
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
index 0fd6923326a..0fd6923326a 100644
--- 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
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
index 656a25d14fc..656a25d14fc 100644
--- 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
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
index 9b73991ce30..9b73991ce30 100644
--- 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
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
index 505c8c6d535..505c8c6d535 100644
--- 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
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
index 7015923af0a..7015923af0a 100644
--- 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
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
index f99e2cec330..f99e2cec330 100644
--- 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
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
index 2b32de6944a..2b32de6944a 100644
--- 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
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
index a6aa9cd6d2a..a6aa9cd6d2a 100644
--- 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
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
index 94877b27d58..94877b27d58 100644
--- 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
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
index 6d45f1541a0..6d45f1541a0 100644
--- 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
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
index cd8f3ebefe6..cd8f3ebefe6 100644
--- 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
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
index 36343c1bde6..36343c1bde6 100644
--- 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
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
index de2ba578962..de2ba578962 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-while-break.nll.stderr
+++ b/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
index 8cdf1da5c93..8cdf1da5c93 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-while-break.rs
+++ b/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
index eaaecdb5bbb..eaaecdb5bbb 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-while-break.stderr
+++ b/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
index 27d42d666ea..27d42d666ea 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-while-cond.rs
+++ b/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
index 41ef9e800bd..41ef9e800bd 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-while-cond.stderr
+++ b/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
index e3566e9bb92..e3566e9bb92 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-while.rs
+++ b/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
index 9fb2dcaa436..9fb2dcaa436 100644
--- a/src/test/ui/compile-fail-migration/borrowck/borrowck-while.stderr
+++ b/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
index 4c399ab6014..4c399ab6014 100644
--- 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
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
index 4c399ab6014..4c399ab6014 100644
--- 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
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
index 508e09318ae..508e09318ae 100644
--- 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
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
index e03a0355b48..e03a0355b48 100644
--- a/src/test/ui/compile-fail-migration/borrowck/two-phase-across-loop.rs
+++ b/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
index 65c3d27923e..65c3d27923e 100644
--- a/src/test/ui/compile-fail-migration/borrowck/two-phase-across-loop.stderr
+++ b/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
index 5a7f33e5b56..5a7f33e5b56 100644
--- 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
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
index 77b237e34f2..77b237e34f2 100644
--- 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
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
index 45cfc836017..45cfc836017 100644
--- 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
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
index 5deabf93764..5deabf93764 100644
--- 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
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
index 15700a1d61a..15700a1d61a 100644
--- 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
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
index 942a38febdd..942a38febdd 100644
--- 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
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
index a8651c0e741..a8651c0e741 100644
--- 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
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
index b64323a5cc4..b64323a5cc4 100644
--- 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
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
index a8651c0e741..a8651c0e741 100644
--- 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
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
index 30752e8ddb1..30752e8ddb1 100644
--- a/src/test/ui/compile-fail-migration/borrowck/two-phase-nonrecv-autoref.rs
+++ b/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
index f9326d944b8..f9326d944b8 100644
--- 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
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
index 2ac10a82f7b..2ac10a82f7b 100644
--- 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
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
index 62a548af62b..62a548af62b 100644
--- 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
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
index 1e86603c19e..1e86603c19e 100644
--- 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
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
index 26a6271bbde..26a6271bbde 100644
--- a/src/test/ui/compile-fail-migration/borrowck/two-phase-sneaky.nll.stderr
+++ b/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
index eec4b470d75..eec4b470d75 100644
--- a/src/test/ui/compile-fail-migration/borrowck/two-phase-sneaky.rs
+++ b/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
index 1ab9c188482..1ab9c188482 100644
--- a/src/test/ui/compile-fail-migration/borrowck/two-phase-sneaky.stderr
+++ b/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
index 5bfaa6c54fa..5bfaa6c54fa 100644
--- a/src/test/ui/compile-fail-migration/bounds-lifetime.rs
+++ b/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
index cbd140c13be..cbd140c13be 100644
--- a/src/test/ui/compile-fail-migration/bounds-lifetime.stderr
+++ b/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
index 1f257b8a5cb..1f257b8a5cb 100644
--- a/src/test/ui/compile-fail-migration/break-outside-loop.rs
+++ b/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
index 820272d7e80..820272d7e80 100644
--- a/src/test/ui/compile-fail-migration/break-outside-loop.stderr
+++ b/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
index 0fa2d3459f4..0fa2d3459f4 100644
--- 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
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
index 3f7f2adabdf..3f7f2adabdf 100644
--- a/src/test/ui/compile-fail-migration/builtin-superkinds-double-superkind.rs
+++ b/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
index a462fcf4de4..a462fcf4de4 100644
--- a/src/test/ui/compile-fail-migration/builtin-superkinds-double-superkind.stderr
+++ b/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
index 88b5a3fbb55..88b5a3fbb55 100644
--- a/src/test/ui/compile-fail-migration/builtin-superkinds-in-metadata.rs
+++ b/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
index dcc7e3cd350..dcc7e3cd350 100644
--- a/src/test/ui/compile-fail-migration/builtin-superkinds-in-metadata.stderr
+++ b/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
index 3065ecfaa30..3065ecfaa30 100644
--- a/src/test/ui/compile-fail-migration/builtin-superkinds-self-type.rs
+++ b/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
index f96393d4b85..f96393d4b85 100644
--- a/src/test/ui/compile-fail-migration/builtin-superkinds-self-type.stderr
+++ b/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
index 22dc9598d29..22dc9598d29 100644
--- a/src/test/ui/compile-fail-migration/builtin-superkinds-simple.rs
+++ b/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
index 043953e7a2b..043953e7a2b 100644
--- a/src/test/ui/compile-fail-migration/builtin-superkinds-simple.stderr
+++ b/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
index e0b2043c110..e0b2043c110 100644
--- 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
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
index 00bad2e80ef..00bad2e80ef 100644
--- 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
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
index 4ba9b3aeb5d..4ba9b3aeb5d 100644
--- a/src/test/ui/compile-fail-migration/by-move-pattern-binding.nll.stderr
+++ b/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
index a49256d1bfc..a49256d1bfc 100644
--- a/src/test/ui/compile-fail-migration/by-move-pattern-binding.rs
+++ b/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
index a20de4ba42a..a20de4ba42a 100644
--- a/src/test/ui/compile-fail-migration/by-move-pattern-binding.stderr
+++ b/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
index 583befed1e8..583befed1e8 100644
--- 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
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
index 84ed8d15a42..84ed8d15a42 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/can-begin-expr-check.rs b/src/test/ui/can-begin-expr-check.rs
index 68f219c6ed9..68f219c6ed9 100644
--- a/src/test/ui/compile-fail-migration/can-begin-expr-check.rs
+++ b/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
index ddcb69c5ee3..ddcb69c5ee3 100644
--- a/src/test/ui/compile-fail-migration/can-begin-expr-check.stderr
+++ b/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
index a7ffc06872c..a7ffc06872c 100644
--- 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
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
index 02d57ca48f2..02d57ca48f2 100644
--- 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
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
index a7ffc06872c..a7ffc06872c 100644
--- 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
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
index 6bd52f00788..6bd52f00788 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/capture1.rs b/src/test/ui/capture1.rs
index 984385f4cc0..984385f4cc0 100644
--- a/src/test/ui/compile-fail-migration/capture1.rs
+++ b/src/test/ui/capture1.rs
diff --git a/src/test/ui/compile-fail-migration/capture1.stderr b/src/test/ui/capture1.stderr
index 82eb1b64cfc..82eb1b64cfc 100644
--- a/src/test/ui/compile-fail-migration/capture1.stderr
+++ b/src/test/ui/capture1.stderr
diff --git a/src/test/ui/cast-as-bool.rs b/src/test/ui/cast/cast-as-bool.rs
index 68e26c23e44..68e26c23e44 100644
--- a/src/test/ui/cast-as-bool.rs
+++ b/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
index 050a18ec9d3..050a18ec9d3 100644
--- a/src/test/ui/cast-as-bool.stderr
+++ b/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
index 65b391205e3..65b391205e3 100644
--- a/src/test/ui/cast-errors-issue-43825.rs
+++ b/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
index 6dbbadde5c6..6dbbadde5c6 100644
--- a/src/test/ui/cast-errors-issue-43825.stderr
+++ b/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
index ab22d352480..ab22d352480 100644
--- a/src/test/ui/compile-fail-migration/cast-from-nil.rs
+++ b/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
index 4400007f93d..4400007f93d 100644
--- a/src/test/ui/compile-fail-migration/cast-from-nil.stderr
+++ b/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
index 8764cb72b8c..8764cb72b8c 100644
--- a/src/test/ui/compile-fail-migration/cast-ptr-to-int-const.rs
+++ b/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
index 7c3b4e42138..7c3b4e42138 100644
--- a/src/test/ui/compile-fail-migration/cast-ptr-to-int-const.stderr
+++ b/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
index 0dac707688d..0dac707688d 100644
--- a/src/test/ui/cast-rfc0401-2.rs
+++ b/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
index f7ffa245959..f7ffa245959 100644
--- a/src/test/ui/cast-rfc0401-2.stderr
+++ b/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
index d5a998c6e4b..d5a998c6e4b 100644
--- a/src/test/ui/compile-fail-migration/cast-to-bare-fn.rs
+++ b/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
index ed07f37f4f1..ed07f37f4f1 100644
--- a/src/test/ui/compile-fail-migration/cast-to-bare-fn.stderr
+++ b/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
index 27d9e8a42b1..27d9e8a42b1 100644
--- a/src/test/ui/compile-fail-migration/cast-to-nil.rs
+++ b/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
index f7ee68e3d2b..f7ee68e3d2b 100644
--- a/src/test/ui/compile-fail-migration/cast-to-nil.stderr
+++ b/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
index 010b5a1b106..010b5a1b106 100644
--- a/src/test/ui/cast-to-unsized-trait-object-suggestion.rs
+++ b/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
index 1e871d47284..1e871d47284 100644
--- a/src/test/ui/cast-to-unsized-trait-object-suggestion.stderr
+++ b/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
index dd1595f9315..dd1595f9315 100644
--- a/src/test/ui/compile-fail-migration/catch-bad-lifetime.nll.stderr
+++ b/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
index f332ffd4494..f332ffd4494 100644
--- a/src/test/ui/compile-fail-migration/catch-bad-lifetime.rs
+++ b/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
index 2ea54d1fb24..2ea54d1fb24 100644
--- a/src/test/ui/compile-fail-migration/catch-bad-lifetime.stderr
+++ b/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
index b369847699b..b369847699b 100644
--- a/src/test/ui/compile-fail-migration/catch-bad-type.rs
+++ b/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
index f7405e5e5c8..f7405e5e5c8 100644
--- a/src/test/ui/compile-fail-migration/catch-bad-type.stderr
+++ b/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
index 10130ef1e5d..10130ef1e5d 100644
--- a/src/test/ui/catch-block-type-error.rs
+++ b/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
index 288168c6992..288168c6992 100644
--- a/src/test/ui/catch-block-type-error.stderr
+++ b/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
index 9f9968e8124..9f9968e8124 100644
--- a/src/test/ui/compile-fail-migration/catch-in-match.rs
+++ b/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
index 1542989cc35..1542989cc35 100644
--- a/src/test/ui/compile-fail-migration/catch-in-match.stderr
+++ b/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
index cb8613ee60b..cb8613ee60b 100644
--- a/src/test/ui/compile-fail-migration/catch-in-while.rs
+++ b/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
index 9316bbcd4bc..9316bbcd4bc 100644
--- a/src/test/ui/compile-fail-migration/catch-in-while.stderr
+++ b/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
index 157793160ce..157793160ce 100644
--- a/src/test/ui/compile-fail-migration/catch-maybe-bad-lifetime.nll.stderr
+++ b/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
index faefb5ef18a..faefb5ef18a 100644
--- a/src/test/ui/compile-fail-migration/catch-maybe-bad-lifetime.rs
+++ b/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
index 21fe1049f43..21fe1049f43 100644
--- a/src/test/ui/compile-fail-migration/catch-maybe-bad-lifetime.stderr
+++ b/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
index ea8c8ebdcb7..ea8c8ebdcb7 100644
--- a/src/test/ui/compile-fail-migration/catch-opt-init.nll.stderr
+++ b/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
index 0c41102e3be..0c41102e3be 100644
--- a/src/test/ui/compile-fail-migration/catch-opt-init.rs
+++ b/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
index 6a14ba17f9e..6a14ba17f9e 100644
--- a/src/test/ui/compile-fail-migration/catch-opt-init.stderr
+++ b/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
index 0a06e01cab0..0a06e01cab0 100644
--- a/src/test/ui/compile-fail-migration/cdylib-deps-must-be-static.rs
+++ b/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
index a1dc8e985da..a1dc8e985da 100644
--- a/src/test/ui/compile-fail-migration/cdylib-deps-must-be-static.stderr
+++ b/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
index 404630399c6..404630399c6 100644
--- a/src/test/ui/compile-fail-migration/cfg-arg-invalid.rs
+++ b/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
index 58a62d45ea5..58a62d45ea5 100644
--- a/src/test/ui/compile-fail-migration/cfg-attr-cfg-2.rs
+++ b/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
index db3c7acff15..db3c7acff15 100644
--- a/src/test/ui/compile-fail-migration/cfg-attr-cfg-2.stderr
+++ b/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
index a79c7663861..a79c7663861 100644
--- a/src/test/ui/compile-fail-migration/cfg-attr-crate-2.rs
+++ b/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
index 7b66c8f5e40..7b66c8f5e40 100644
--- a/src/test/ui/compile-fail-migration/cfg-attr-crate-2.stderr
+++ b/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
index 09fe6cec49c..09fe6cec49c 100644
--- a/src/test/ui/compile-fail-migration/cfg-attr-invalid-predicate.rs
+++ b/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
index 5a89f9766d1..5a89f9766d1 100644
--- a/src/test/ui/compile-fail-migration/cfg-attr-invalid-predicate.stderr
+++ b/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
index afcb896b43c..afcb896b43c 100644
--- 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
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
index 33fe52366db..33fe52366db 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/cfg-empty-codemap.rs b/src/test/ui/cfg-empty-codemap.rs
index 8868a5a9549..8868a5a9549 100644
--- a/src/test/ui/compile-fail-migration/cfg-empty-codemap.rs
+++ b/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
index bbccf2bcd0f..bbccf2bcd0f 100644
--- a/src/test/ui/compile-fail-migration/cfg-in-crate-1.rs
+++ b/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
index c6d42c732c9..c6d42c732c9 100644
--- a/src/test/ui/compile-fail-migration/cfg-in-crate-1.stderr
+++ b/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
index a4b24fa8b4b..a4b24fa8b4b 100644
--- a/src/test/ui/compile-fail-migration/cfg-non-opt-expr.rs
+++ b/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
index 0511c575546..0511c575546 100644
--- a/src/test/ui/compile-fail-migration/cfg-non-opt-expr.stderr
+++ b/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
index 7d799850a65..7d799850a65 100644
--- a/src/test/ui/compile-fail-migration/cfg_attr_path.rs
+++ b/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
index 67e59d054d5..67e59d054d5 100644
--- a/src/test/ui/compile-fail-migration/cfg_attr_path.stderr
+++ b/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
index 1804b9e04c2..1804b9e04c2 100644
--- a/src/test/ui/compile-fail-migration/check-static-immutable-mut-slices.rs
+++ b/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
index b0a7cd1221b..b0a7cd1221b 100644
--- a/src/test/ui/compile-fail-migration/check-static-immutable-mut-slices.stderr
+++ b/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
index b265ec8bdda..b265ec8bdda 100644
--- a/src/test/ui/compile-fail-migration/check-static-values-constraints.nll.stderr
+++ b/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
index 37f665960c8..37f665960c8 100644
--- a/src/test/ui/compile-fail-migration/check-static-values-constraints.rs
+++ b/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
index ac979a3fa7c..ac979a3fa7c 100644
--- a/src/test/ui/compile-fail-migration/check-static-values-constraints.stderr
+++ b/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
index af83b0ecbf2..af83b0ecbf2 100644
--- a/src/test/ui/compile-fail-migration/class-cast-to-trait.rs
+++ b/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
index c1e08807f97..c1e08807f97 100644
--- a/src/test/ui/compile-fail-migration/class-cast-to-trait.stderr
+++ b/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
index 46b100a4d39..46b100a4d39 100644
--- a/src/test/ui/compile-fail-migration/class-method-missing.rs
+++ b/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
index c1da06e3a3a..c1da06e3a3a 100644
--- a/src/test/ui/compile-fail-migration/class-method-missing.stderr
+++ b/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
index 372bf4cac87..372bf4cac87 100644
--- a/src/test/ui/compile-fail-migration/class-missing-self.rs
+++ b/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
index 33bf62e7087..33bf62e7087 100644
--- a/src/test/ui/compile-fail-migration/class-missing-self.stderr
+++ b/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
index 0f83bf80d24..0f83bf80d24 100644
--- a/src/test/ui/compile-fail-migration/cleanup-rvalue-scopes-cf.rs
+++ b/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
index e1de4a2a8d4..e1de4a2a8d4 100644
--- a/src/test/ui/compile-fail-migration/cleanup-rvalue-scopes-cf.stderr
+++ b/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
index 9995b00a9a7..9995b00a9a7 100644
--- a/src/test/ui/compile-fail-migration/closure-expected-type/README.md
+++ b/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
index 32efb01c0fe..32efb01c0fe 100644
--- 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
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
index fe857001bfa..fe857001bfa 100644
--- 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
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
index 63284c98020..63284c98020 100644
--- 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
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
index 4dca5922910..4dca5922910 100644
--- 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
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
index bef69a4b0b9..bef69a4b0b9 100644
--- 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
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
index 51dcf5eb3da..51dcf5eb3da 100644
--- 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
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
index 6767aa62f78..6767aa62f78 100644
--- 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
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
index aea5cb21e63..aea5cb21e63 100644
--- 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
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
index 377eaadbd6a..377eaadbd6a 100644
--- 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
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
index 273fb2a2dd2..273fb2a2dd2 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/closure_promotion.rs b/src/test/ui/closure_promotion.rs
index 8826661f84a..8826661f84a 100644
--- a/src/test/ui/compile-fail-migration/closure_promotion.rs
+++ b/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
index 8f08796b5c6..8f08796b5c6 100644
--- a/src/test/ui/compile-fail-migration/closure_promotion.stderr
+++ b/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
index 8be5b925a39..8be5b925a39 100644
--- a/src/test/ui/closure-array-break-length.rs
+++ b/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
index f62b1354370..f62b1354370 100644
--- a/src/test/ui/closure-array-break-length.stderr
+++ b/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
index 12e9fb30902..12e9fb30902 100644
--- 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
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
index e1b18b1d49e..e1b18b1d49e 100644
--- 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
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
index ca82020a2cc..ca82020a2cc 100644
--- 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
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
index 1ffba68263a..1ffba68263a 100644
--- 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
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
index 825f469c330..825f469c330 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/closure-bounds-subtype.rs b/src/test/ui/closures/closure-bounds-subtype.rs
index db26535b004..db26535b004 100644
--- a/src/test/ui/compile-fail-migration/closure-bounds-subtype.rs
+++ b/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
index ffe486d4468..ffe486d4468 100644
--- a/src/test/ui/compile-fail-migration/closure-bounds-subtype.stderr
+++ b/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
index 8658c618bf2..8658c618bf2 100644
--- 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
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
index a464c5853e1..a464c5853e1 100644
--- 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
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
index 56b43bbd7d3..56b43bbd7d3 100644
--- 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
diff --git a/src/test/ui/closure-immutable-outer-variable.fixed b/src/test/ui/closures/closure-immutable-outer-variable.fixed
index b3a0d592f76..b3a0d592f76 100644
--- a/src/test/ui/closure-immutable-outer-variable.fixed
+++ b/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
index d91c1199b3f..d91c1199b3f 100644
--- a/src/test/ui/closure-immutable-outer-variable.nll.stderr
+++ b/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
index e162678460c..e162678460c 100644
--- a/src/test/ui/closure-immutable-outer-variable.rs
+++ b/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
index 80a5a45a305..80a5a45a305 100644
--- a/src/test/ui/closure-immutable-outer-variable.rs.fixed
+++ b/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
index 0ee11d8cf15..0ee11d8cf15 100644
--- a/src/test/ui/closure-immutable-outer-variable.stderr
+++ b/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
index e096e7ca3a0..e096e7ca3a0 100644
--- a/src/test/ui/closure-move-sync.rs
+++ b/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
index 076bae8dbd7..076bae8dbd7 100644
--- a/src/test/ui/closure-move-sync.stderr
+++ b/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
index 10c99703a97..10c99703a97 100644
--- a/src/test/ui/compile-fail-migration/closure-no-fn-1.rs
+++ b/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
index 4786a6836cd..4786a6836cd 100644
--- a/src/test/ui/compile-fail-migration/closure-no-fn-1.stderr
+++ b/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
index a6438bb5f24..a6438bb5f24 100644
--- a/src/test/ui/compile-fail-migration/closure-no-fn-2.rs
+++ b/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
index 1aad49777dc..1aad49777dc 100644
--- a/src/test/ui/compile-fail-migration/closure-no-fn-2.stderr
+++ b/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
index 6584c16c9de..6584c16c9de 100644
--- a/src/test/ui/compile-fail-migration/closure-no-fn-3.rs
+++ b/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
index bd28045c1b9..bd28045c1b9 100644
--- a/src/test/ui/compile-fail-migration/closure-no-fn-3.stderr
+++ b/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
index 9357d0e7615..9357d0e7615 100644
--- a/src/test/ui/compile-fail-migration/closure-referencing-itself-issue-25954.rs
+++ b/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
index fa00d9fd9a4..fa00d9fd9a4 100644
--- a/src/test/ui/compile-fail-migration/closure-referencing-itself-issue-25954.stderr
+++ b/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
index 490734d463d..490734d463d 100644
--- a/src/test/ui/compile-fail-migration/closure-reform-bad.rs
+++ b/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
index a4e18175369..a4e18175369 100644
--- a/src/test/ui/compile-fail-migration/closure-reform-bad.stderr
+++ b/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
index a387e4c5ece..a387e4c5ece 100644
--- a/src/test/ui/compile-fail-migration/closure-wrong-kind.rs
+++ b/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
index 636f30770a9..636f30770a9 100644
--- a/src/test/ui/compile-fail-migration/closure-wrong-kind.stderr
+++ b/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
index ef65927fc5d..ef65927fc5d 100644
--- a/src/test/ui/compile-fail-migration/coerce-expect-unsized-ascribed.rs
+++ b/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
index 894fbbf202a..894fbbf202a 100644
--- a/src/test/ui/compile-fail-migration/coerce-expect-unsized-ascribed.stderr
+++ b/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
index bc3d58ef33d..bc3d58ef33d 100644
--- a/src/test/ui/compile-fail-migration/coerce-mut.rs
+++ b/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
index 5e460b199a1..5e460b199a1 100644
--- a/src/test/ui/compile-fail-migration/coerce-mut.stderr
+++ b/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
index 29b6f057562..29b6f057562 100644
--- a/src/test/ui/compile-fail-migration/coerce-overloaded-autoderef.ast.nll.stderr
+++ b/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
index 3bb5ec72002..3bb5ec72002 100644
--- a/src/test/ui/compile-fail-migration/coerce-overloaded-autoderef.ast.stderr
+++ b/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
index 29b6f057562..29b6f057562 100644
--- a/src/test/ui/compile-fail-migration/coerce-overloaded-autoderef.mir.nll.stderr
+++ b/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
index fbc49a7e91f..fbc49a7e91f 100644
--- a/src/test/ui/compile-fail-migration/coerce-overloaded-autoderef.mir.stderr
+++ b/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
index 5a05f59c6f4..5a05f59c6f4 100644
--- a/src/test/ui/compile-fail-migration/coerce-overloaded-autoderef.rs
+++ b/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
index 14a06b306d8..14a06b306d8 100644
--- a/src/test/ui/compile-fail-migration/coerce-to-bang-cast.rs
+++ b/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
index fde94144512..fde94144512 100644
--- a/src/test/ui/compile-fail-migration/coerce-to-bang-cast.stderr
+++ b/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
index 8b4e2c3c051..8b4e2c3c051 100644
--- a/src/test/ui/compile-fail-migration/coerce-to-bang.rs
+++ b/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
index bf490cd20aa..bf490cd20aa 100644
--- a/src/test/ui/compile-fail-migration/coerce-to-bang.stderr
+++ b/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
index 90cbbf242aa..90cbbf242aa 100644
--- a/src/test/ui/compile-fail-migration/coerce-unsafe-to-closure.rs
+++ b/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
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
index b235a0f2136..b235a0f2136 100644
--- a/src/test/ui/coercion-missing-tail-expected-type.rs
+++ b/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
index 84b6c961a25..84b6c961a25 100644
--- a/src/test/ui/coercion-missing-tail-expected-type.stderr
+++ b/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
index 7c5a4e0c3c6..7c5a4e0c3c6 100644
--- a/src/test/ui/compile-fail-migration/coercion-slice.rs
+++ b/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
index 47a77d42773..47a77d42773 100644
--- a/src/test/ui/compile-fail-migration/coercion-slice.stderr
+++ b/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
index d3d389c6a8b..d3d389c6a8b 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/coherence_copy_like_lib.rs
+++ b/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
index 0458636a401..0458636a401 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/coherence_inherent_cc_lib.rs
+++ b/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
index daa123849e4..daa123849e4 100644
--- a/src/test/ui/auxiliary/coherence_lib.rs
+++ b/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
index b22d12300c7..b22d12300c7 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/coherence_orphan_lib.rs
+++ b/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
index 044bb606b40..044bb606b40 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/go_trait.rs
+++ b/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
index 3190ce430ad..3190ce430ad 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/trait_impl_conflict.rs
+++ b/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
index 7a5340041c2..7a5340041c2 100644
--- a/src/test/ui/compile-fail-migration/coherence-all-remote.rs
+++ b/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
index 1f71969989b..1f71969989b 100644
--- a/src/test/ui/compile-fail-migration/coherence-all-remote.stderr
+++ b/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
index 32c5b669381..32c5b669381 100644
--- a/src/test/ui/compile-fail-migration/coherence-bigint-param.rs
+++ b/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
index 7d2796ee690..7d2796ee690 100644
--- a/src/test/ui/compile-fail-migration/coherence-bigint-param.stderr
+++ b/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
index 434d77828b4..434d77828b4 100644
--- 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
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
index 7dbcda06511..7dbcda06511 100644
--- 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
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
index 7ad5cd71ca8..7ad5cd71ca8 100644
--- 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
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
index faabfb6c7c0..faabfb6c7c0 100644
--- 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
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
index b3ef79c6cc0..b3ef79c6cc0 100644
--- 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
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
index 38aff37bfcc..38aff37bfcc 100644
--- 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
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
index 1defe6c8b20..1defe6c8b20 100644
--- 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
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
index a5992406262..a5992406262 100644
--- 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
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
index 5c5c4d32d67..5c5c4d32d67 100644
--- 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
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
index 9a6e0071eb7..9a6e0071eb7 100644
--- 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
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
index 57d71b44b0f..57d71b44b0f 100644
--- a/src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific.rs
+++ b/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
index 955cd3b125f..955cd3b125f 100644
--- a/src/test/ui/compile-fail-migration/coherence-blanket-conflicts-with-specific.stderr
+++ b/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
index 8e9d1eff345..8e9d1eff345 100644
--- a/src/test/ui/compile-fail-migration/coherence-conflicting-negative-trait-impl.rs
+++ b/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
index a2a869daff0..a2a869daff0 100644
--- a/src/test/ui/compile-fail-migration/coherence-conflicting-negative-trait-impl.stderr
+++ b/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
index f05333348ec..f05333348ec 100644
--- a/src/test/ui/compile-fail-migration/coherence-cow.a.stderr
+++ b/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
index 269bcd576af..269bcd576af 100644
--- a/src/test/ui/compile-fail-migration/coherence-cow.b.stderr
+++ b/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
index e89308db054..e89308db054 100644
--- a/src/test/ui/compile-fail-migration/coherence-cow.c.stderr
+++ b/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
index 86ae5b44d9d..86ae5b44d9d 100644
--- a/src/test/ui/compile-fail-migration/coherence-cow.rs
+++ b/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
index aac870293fd..aac870293fd 100644
--- a/src/test/ui/compile-fail-migration/coherence-cross-crate-conflict.rs
+++ b/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
index ee11967cc0d..ee11967cc0d 100644
--- a/src/test/ui/compile-fail-migration/coherence-cross-crate-conflict.stderr
+++ b/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
index 751d0a14c57..751d0a14c57 100644
--- a/src/test/ui/compile-fail-migration/coherence-default-trait-impl.rs
+++ b/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
index b7d9364f237..b7d9364f237 100644
--- a/src/test/ui/compile-fail-migration/coherence-default-trait-impl.stderr
+++ b/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
index 56d2455ca21..56d2455ca21 100644
--- a/src/test/ui/coherence-error-suppression.rs
+++ b/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
index 8cf3fe760f1..8cf3fe760f1 100644
--- a/src/test/ui/coherence-error-suppression.stderr
+++ b/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
index 8bb9556fcc0..8bb9556fcc0 100644
--- 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
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
index 5d62a86b96f..5d62a86b96f 100644
--- 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
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
index cd75b0e34f2..cd75b0e34f2 100644
--- a/src/test/ui/compile-fail-migration/coherence-impl-trait-for-trait.rs
+++ b/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
index 26e702d1fde..26e702d1fde 100644
--- a/src/test/ui/compile-fail-migration/coherence-impl-trait-for-trait.stderr
+++ b/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
index f48790d1f40..f48790d1f40 100644
--- a/src/test/ui/coherence-impls-copy.rs
+++ b/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
index 24e7e85b1a9..24e7e85b1a9 100644
--- a/src/test/ui/coherence-impls-copy.stderr
+++ b/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
index 9caaee41aeb..9caaee41aeb 100644
--- a/src/test/ui/compile-fail-migration/coherence-impls-send.rs
+++ b/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
index 4e7e228b23f..4e7e228b23f 100644
--- a/src/test/ui/compile-fail-migration/coherence-impls-send.stderr
+++ b/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
index 60b5d14d158..60b5d14d158 100644
--- a/src/test/ui/compile-fail-migration/coherence-impls-sized.rs
+++ b/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
index 683fb0aaa68..683fb0aaa68 100644
--- a/src/test/ui/compile-fail-migration/coherence-impls-sized.stderr
+++ b/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
index 5db901b5ba1..5db901b5ba1 100644
--- 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
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
index 5dba448a963..5dba448a963 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/coherence-lone-type-parameter.rs b/src/test/ui/coherence/coherence-lone-type-parameter.rs
index e78f392b386..e78f392b386 100644
--- a/src/test/ui/compile-fail-migration/coherence-lone-type-parameter.rs
+++ b/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
index 6389bc0e7ab..6389bc0e7ab 100644
--- a/src/test/ui/compile-fail-migration/coherence-lone-type-parameter.stderr
+++ b/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
index 1ae07b64685..1ae07b64685 100644
--- a/src/test/ui/compile-fail-migration/coherence-negative-impls-safe.rs
+++ b/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
index 7373f79942f..7373f79942f 100644
--- a/src/test/ui/compile-fail-migration/coherence-negative-impls-safe.stderr
+++ b/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
index 47026cd32d4..47026cd32d4 100644
--- a/src/test/ui/compile-fail-migration/coherence-no-direct-lifetime-dispatch.rs
+++ b/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
index 669c5e3a4a6..669c5e3a4a6 100644
--- a/src/test/ui/compile-fail-migration/coherence-no-direct-lifetime-dispatch.stderr
+++ b/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
index 80efc7b75e2..80efc7b75e2 100644
--- a/src/test/ui/compile-fail-migration/coherence-orphan.rs
+++ b/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
index ee863533237..ee863533237 100644
--- a/src/test/ui/compile-fail-migration/coherence-orphan.stderr
+++ b/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
index 1fad608db6c..1fad608db6c 100644
--- 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
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
index 993de789ef5..993de789ef5 100644
--- 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
diff --git a/src/test/ui/coherence-overlap-downstream-inherent.rs b/src/test/ui/coherence/coherence-overlap-downstream-inherent.rs
index fd6e1d339f3..fd6e1d339f3 100644
--- a/src/test/ui/coherence-overlap-downstream-inherent.rs
+++ b/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
index 29df3f9c37a..29df3f9c37a 100644
--- a/src/test/ui/coherence-overlap-downstream-inherent.stderr
+++ b/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
index 63898ef9a20..63898ef9a20 100644
--- a/src/test/ui/coherence-overlap-downstream.rs
+++ b/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
index 8e14e4f9bda..8e14e4f9bda 100644
--- a/src/test/ui/coherence-overlap-downstream.stderr
+++ b/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
index 94a7bdbc69e..94a7bdbc69e 100644
--- a/src/test/ui/coherence-overlap-issue-23516-inherent.rs
+++ b/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
index d217a4d2cdf..d217a4d2cdf 100644
--- a/src/test/ui/coherence-overlap-issue-23516-inherent.stderr
+++ b/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
index 3cd184b9be9..3cd184b9be9 100644
--- a/src/test/ui/coherence-overlap-issue-23516.rs
+++ b/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
index ea2ecda6f0d..ea2ecda6f0d 100644
--- a/src/test/ui/coherence-overlap-issue-23516.stderr
+++ b/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
index a10deeafbe6..a10deeafbe6 100644
--- a/src/test/ui/compile-fail-migration/coherence-overlap-messages.rs
+++ b/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
index 60023c6c249..60023c6c249 100644
--- a/src/test/ui/compile-fail-migration/coherence-overlap-messages.stderr
+++ b/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
index a5a6a88a128..a5a6a88a128 100644
--- a/src/test/ui/coherence-overlap-upstream-inherent.rs
+++ b/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
index 6c6f0dc2483..6c6f0dc2483 100644
--- a/src/test/ui/coherence-overlap-upstream-inherent.stderr
+++ b/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
index f772848cb58..f772848cb58 100644
--- a/src/test/ui/coherence-overlap-upstream.rs
+++ b/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
index 794c830cc5b..794c830cc5b 100644
--- a/src/test/ui/coherence-overlap-upstream.stderr
+++ b/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
index ba9dc53e868..ba9dc53e868 100644
--- a/src/test/ui/compile-fail-migration/coherence-overlapping-pairs.rs
+++ b/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
index 41d47888554..41d47888554 100644
--- a/src/test/ui/compile-fail-migration/coherence-overlapping-pairs.stderr
+++ b/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
index f55efef14fa..f55efef14fa 100644
--- a/src/test/ui/compile-fail-migration/coherence-pair-covered-uncovered-1.rs
+++ b/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
index 3545593fb6d..3545593fb6d 100644
--- a/src/test/ui/compile-fail-migration/coherence-pair-covered-uncovered-1.stderr
+++ b/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
index 0642dff4b28..0642dff4b28 100644
--- a/src/test/ui/compile-fail-migration/coherence-pair-covered-uncovered.rs
+++ b/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
index f58cb4648cb..f58cb4648cb 100644
--- a/src/test/ui/compile-fail-migration/coherence-pair-covered-uncovered.stderr
+++ b/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
index 784ff0cd5e0..784ff0cd5e0 100644
--- a/src/test/ui/compile-fail-migration/coherence-projection-conflict-orphan.rs
+++ b/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
index a0fcf072fa8..a0fcf072fa8 100644
--- a/src/test/ui/compile-fail-migration/coherence-projection-conflict-orphan.stderr
+++ b/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
index 120d9046389..120d9046389 100644
--- a/src/test/ui/compile-fail-migration/coherence-projection-conflict-ty-param.rs
+++ b/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
index cfbf96bc1c8..cfbf96bc1c8 100644
--- a/src/test/ui/compile-fail-migration/coherence-projection-conflict-ty-param.stderr
+++ b/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
index 3c32ab38b93..3c32ab38b93 100644
--- a/src/test/ui/compile-fail-migration/coherence-projection-conflict.rs
+++ b/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
index 3832faf28d8..3832faf28d8 100644
--- a/src/test/ui/compile-fail-migration/coherence-projection-conflict.stderr
+++ b/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
index a52af0873a8..a52af0873a8 100644
--- a/src/test/ui/compile-fail-migration/coherence-projection-ok-orphan.rs
+++ b/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
index 1b9a32525bf..1b9a32525bf 100644
--- a/src/test/ui/compile-fail-migration/coherence-projection-ok-orphan.stderr
+++ b/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
index af88f3744ea..af88f3744ea 100644
--- a/src/test/ui/compile-fail-migration/coherence-projection-ok.rs
+++ b/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
index 945f3b396b7..945f3b396b7 100644
--- a/src/test/ui/compile-fail-migration/coherence-projection-ok.stderr
+++ b/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
index 7807f93df1a..7807f93df1a 100644
--- a/src/test/ui/compile-fail-migration/coherence-tuple-conflict.rs
+++ b/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
index 4ceafea0a70..4ceafea0a70 100644
--- a/src/test/ui/compile-fail-migration/coherence-tuple-conflict.stderr
+++ b/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
index 196c2f4ee3c..196c2f4ee3c 100644
--- a/src/test/ui/compile-fail-migration/coherence-vec-local-2.rs
+++ b/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
index 2980d4a3392..2980d4a3392 100644
--- a/src/test/ui/compile-fail-migration/coherence-vec-local-2.stderr
+++ b/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
index 49822dcfcb3..49822dcfcb3 100644
--- a/src/test/ui/compile-fail-migration/coherence-vec-local.rs
+++ b/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
index b3c26160fe5..b3c26160fe5 100644
--- a/src/test/ui/compile-fail-migration/coherence-vec-local.stderr
+++ b/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
index 9fbb7aa4cb1..9fbb7aa4cb1 100644
--- 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
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
index 675dc1b7004..675dc1b7004 100644
--- 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
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
index 2f6dca4f3c2..2f6dca4f3c2 100644
--- 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
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
index 5143d4e874b..5143d4e874b 100644
--- 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
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
index f424e887201..f424e887201 100644
--- 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
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
index c7c49fe1462..c7c49fe1462 100644
--- 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
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
index 04262e65c5a..04262e65c5a 100644
--- a/src/test/ui/compile-fail-migration/coherence_copy_like_err_struct.rs
+++ b/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
index 786a3df0503..786a3df0503 100644
--- a/src/test/ui/compile-fail-migration/coherence_copy_like_err_struct.stderr
+++ b/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
index 378a70864f0..378a70864f0 100644
--- a/src/test/ui/compile-fail-migration/coherence_copy_like_err_tuple.rs
+++ b/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
index 3708a38443c..3708a38443c 100644
--- a/src/test/ui/compile-fail-migration/coherence_copy_like_err_tuple.stderr
+++ b/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
index 087b8c14e35..087b8c14e35 100644
--- a/src/test/ui/compile-fail-migration/coherence_inherent.rs
+++ b/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
index 1708979ab11..1708979ab11 100644
--- a/src/test/ui/compile-fail-migration/coherence_inherent.stderr
+++ b/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
index 442c4c89de4..442c4c89de4 100644
--- a/src/test/ui/compile-fail-migration/coherence_inherent_cc.rs
+++ b/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
index a3c1b60d09a..a3c1b60d09a 100644
--- a/src/test/ui/compile-fail-migration/coherence_inherent_cc.stderr
+++ b/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
index 551577b6b4e..551577b6b4e 100644
--- a/src/test/ui/compile-fail-migration/coherence_local.rs
+++ b/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
index c4340e8d876..c4340e8d876 100644
--- a/src/test/ui/compile-fail-migration/coherence_local.stderr
+++ b/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
index 01f4c1cd8a5..01f4c1cd8a5 100644
--- a/src/test/ui/compile-fail-migration/coherence_local_err_struct.rs
+++ b/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
index c35e95040de..c35e95040de 100644
--- a/src/test/ui/compile-fail-migration/coherence_local_err_struct.stderr
+++ b/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
index 590f68cee59..590f68cee59 100644
--- a/src/test/ui/compile-fail-migration/coherence_local_err_tuple.rs
+++ b/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
index a3f9f2d32b8..a3f9f2d32b8 100644
--- a/src/test/ui/compile-fail-migration/coherence_local_err_tuple.stderr
+++ b/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
index f6e1aab5976..f6e1aab5976 100644
--- a/src/test/ui/compile-fail-migration/coherence_local_ref.rs
+++ b/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
index 13d6fdd80f8..13d6fdd80f8 100644
--- a/src/test/ui/compile-fail-migration/coherence_local_ref.stderr
+++ b/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
index e9c5993098c..e9c5993098c 100644
--- a/src/test/ui/compile-fail-migration/compile_error_macro.rs
+++ b/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
index 1abf5accc17..1abf5accc17 100644
--- a/src/test/ui/compile-fail-migration/compile_error_macro.stderr
+++ b/src/test/ui/compile_error_macro.stderr
diff --git a/src/test/ui/compile-fail-migration/concat.rs b/src/test/ui/concat.rs
index e29c6ac5d5e..e29c6ac5d5e 100644
--- a/src/test/ui/compile-fail-migration/concat.rs
+++ b/src/test/ui/concat.rs
diff --git a/src/test/ui/compile-fail-migration/concat.stderr b/src/test/ui/concat.stderr
index 0128811353f..0128811353f 100644
--- a/src/test/ui/compile-fail-migration/concat.stderr
+++ b/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
index 426f60c6b09..426f60c6b09 100644
--- a/src/test/ui/compile-fail-migration/conflicting-repr-hints.rs
+++ b/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
index 7a4e5a5488a..7a4e5a5488a 100644
--- a/src/test/ui/compile-fail-migration/conflicting-repr-hints.stderr
+++ b/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
index 30895bce357..30895bce357 100644
--- a/src/test/ui/compile-fail-migration/conservative_impl_trait.rs
+++ b/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
index 6fcd384566c..6fcd384566c 100644
--- a/src/test/ui/compile-fail-migration/conservative_impl_trait.stderr
+++ b/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
index 50db9707355..50db9707355 100644
--- a/src/test/ui/compile-fail-migration/constructor-lifetime-args.rs
+++ b/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
index 1710594d255..1710594d255 100644
--- a/src/test/ui/compile-fail-migration/constructor-lifetime-args.stderr
+++ b/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
index b0d5a6b1272..b0d5a6b1272 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/const_fn_lib.rs
+++ b/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
index 9c07abdc36d..9c07abdc36d 100644
--- a/src/test/ui/compile-fail-migration/const-array-oob-arith.rs
+++ b/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
index 5b5f9425e73..5b5f9425e73 100644
--- a/src/test/ui/compile-fail-migration/const-array-oob-arith.stderr
+++ b/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
index 22a3c5ceeb7..22a3c5ceeb7 100644
--- a/src/test/ui/compile-fail-migration/const-array-oob.rs
+++ b/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
index 09e4918bf6e..09e4918bf6e 100644
--- a/src/test/ui/compile-fail-migration/const-array-oob.stderr
+++ b/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
index f80d55cb342..f80d55cb342 100644
--- 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
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
index 580f7e039d1..580f7e039d1 100644
--- 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
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
index cfa4b778dde..cfa4b778dde 100644
--- 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
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
index 0124288d43d..0124288d43d 100644
--- 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
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
index f974a24c26f..f974a24c26f 100644
--- a/src/test/ui/compile-fail-migration/const-block-non-item-statement.rs
+++ b/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
index b367a9d9937..b367a9d9937 100644
--- a/src/test/ui/compile-fail-migration/const-block-non-item-statement.stderr
+++ b/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
index 02264228a6b..02264228a6b 100644
--- a/src/test/ui/compile-fail-migration/const-call.rs
+++ b/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
index efc3c58c681..efc3c58c681 100644
--- a/src/test/ui/compile-fail-migration/const-call.stderr
+++ b/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
index 397804566b4..397804566b4 100644
--- a/src/test/ui/compile-fail-migration/const-cast-different-types.rs
+++ b/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
index bc4d1358697..bc4d1358697 100644
--- a/src/test/ui/compile-fail-migration/const-cast-different-types.stderr
+++ b/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
index b3597441834..b3597441834 100644
--- a/src/test/ui/compile-fail-migration/const-cast-wrong-type.rs
+++ b/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
index d7ac89cc6a0..d7ac89cc6a0 100644
--- a/src/test/ui/compile-fail-migration/const-cast-wrong-type.stderr
+++ b/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
index 3d0477feb20..3d0477feb20 100644
--- a/src/test/ui/const-deref-ptr.rs
+++ b/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
index 94a383bcf16..94a383bcf16 100644
--- a/src/test/ui/const-deref-ptr.stderr
+++ b/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
index 39b1b342eac..39b1b342eac 100644
--- a/src/test/ui/compile-fail-migration/const-err-early.rs
+++ b/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
index 36f3ac1a9bc..36f3ac1a9bc 100644
--- a/src/test/ui/compile-fail-migration/const-err-early.stderr
+++ b/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
index f2ee8a7078c..f2ee8a7078c 100644
--- a/src/test/ui/compile-fail-migration/const-err-multi.rs
+++ b/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
index dd3eaa4c47b..dd3eaa4c47b 100644
--- a/src/test/ui/compile-fail-migration/const-err-multi.stderr
+++ b/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
index 8683f6a0231..8683f6a0231 100644
--- a/src/test/ui/compile-fail-migration/const-err.rs
+++ b/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
index 1674f99b682..1674f99b682 100644
--- a/src/test/ui/compile-fail-migration/const-err.stderr
+++ b/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
index 9a5cb5a4a83..9a5cb5a4a83 100644
--- a/src/test/ui/compile-fail-migration/const-err2.rs
+++ b/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
index 7201ecbc55d..7201ecbc55d 100644
--- a/src/test/ui/compile-fail-migration/const-err2.stderr
+++ b/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
index f5e43b57e77..f5e43b57e77 100644
--- a/src/test/ui/compile-fail-migration/const-err3.rs
+++ b/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
index 5be46248fa7..5be46248fa7 100644
--- a/src/test/ui/compile-fail-migration/const-err3.stderr
+++ b/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
index 10376d57809..10376d57809 100644
--- a/src/test/ui/compile-fail-migration/const-err4.rs
+++ b/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
index dc64737b22f..dc64737b22f 100644
--- a/src/test/ui/compile-fail-migration/const-err4.stderr
+++ b/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
index 86287e12997..86287e12997 100644
--- a/src/test/ui/const-eval/conditional_array_execution.nll.stderr
+++ b/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
index b3f56f27f63..b3f56f27f63 100644
--- a/src/test/ui/const-eval/conditional_array_execution.rs
+++ b/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
index 29f5f8e2ade..29f5f8e2ade 100644
--- a/src/test/ui/const-eval/conditional_array_execution.stderr
+++ b/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
index ce3d54ee46d..ce3d54ee46d 100644
--- a/src/test/ui/const-eval-overflow-2.rs
+++ b/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
index e99d409880e..e99d409880e 100644
--- a/src/test/ui/const-eval-overflow-2.stderr
+++ b/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
index d930cb77047..d930cb77047 100644
--- a/src/test/ui/compile-fail-migration/const-eval-overflow-3.rs
+++ b/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
index f2b4e6b3b56..f2b4e6b3b56 100644
--- a/src/test/ui/compile-fail-migration/const-eval-overflow-3.stderr
+++ b/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
index 719b21000f7..719b21000f7 100644
--- a/src/test/ui/compile-fail-migration/const-eval-overflow-3b.rs
+++ b/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
index 4f1163bf9a1..4f1163bf9a1 100644
--- a/src/test/ui/compile-fail-migration/const-eval-overflow-3b.stderr
+++ b/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
index 9fc31b7c727..9fc31b7c727 100644
--- a/src/test/ui/const-eval-overflow-4.rs
+++ b/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
index 058c8730d7c..058c8730d7c 100644
--- a/src/test/ui/const-eval-overflow-4.stderr
+++ b/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
index 6028df18839..6028df18839 100644
--- a/src/test/ui/compile-fail-migration/const-eval-overflow-4b.rs
+++ b/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
index d171e7f09d1..d171e7f09d1 100644
--- a/src/test/ui/compile-fail-migration/const-eval-overflow-4b.stderr
+++ b/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
index 88fc5182775..88fc5182775 100644
--- a/src/test/ui/compile-fail-migration/const-eval-overflow2.rs
+++ b/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
index 5cf5ce367e2..5cf5ce367e2 100644
--- a/src/test/ui/compile-fail-migration/const-eval-overflow2.stderr
+++ b/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
index 1878daea931..1878daea931 100644
--- a/src/test/ui/compile-fail-migration/const-eval-overflow2b.rs
+++ b/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
index 458a9e11e75..458a9e11e75 100644
--- a/src/test/ui/compile-fail-migration/const-eval-overflow2b.stderr
+++ b/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
index f3d28295bf8..f3d28295bf8 100644
--- a/src/test/ui/compile-fail-migration/const-eval-overflow2c.rs
+++ b/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
index 866860281cf..866860281cf 100644
--- a/src/test/ui/compile-fail-migration/const-eval-overflow2c.stderr
+++ b/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
index f0fa1c0b9b4..f0fa1c0b9b4 100644
--- a/src/test/ui/const-eval-span.rs
+++ b/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
index afe8d1bc0b5..afe8d1bc0b5 100644
--- a/src/test/ui/const-eval-span.stderr
+++ b/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
index 602d4da24f3..602d4da24f3 100644
--- a/src/test/ui/const-eval/const_let.rs
+++ b/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
index 86e3482fda6..86e3482fda6 100644
--- a/src/test/ui/const-eval/const_let.stderr
+++ b/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
index bea4fb76ed1..bea4fb76ed1 100644
--- a/src/test/ui/const-eval/const_prop_errors.rs
+++ b/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
index 2aff6a7c55c..2aff6a7c55c 100644
--- a/src/test/ui/const-eval/const_raw_ptr_ops.rs
+++ b/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
index a9442be081d..a9442be081d 100644
--- a/src/test/ui/const-eval/const_raw_ptr_ops.stderr
+++ b/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
index 008ebf13c63..008ebf13c63 100644
--- a/src/test/ui/const-eval/const_signed_pat.rs
+++ b/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
index 8dd1476d25a..8dd1476d25a 100644
--- a/src/test/ui/const-eval/const_transmute.rs
+++ b/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
index 684fa1c997b..684fa1c997b 100644
--- 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
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
index a590e569947..a590e569947 100644
--- 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
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
index 7963cbb4e45..7963cbb4e45 100644
--- 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
diff --git a/src/test/ui/const-eval/double_check.rs b/src/test/ui/consts/const-eval/double_check.rs
index 81f6e7ddd2d..81f6e7ddd2d 100644
--- a/src/test/ui/const-eval/double_check.rs
+++ b/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
index b661ee92475..b661ee92475 100644
--- a/src/test/ui/const-eval/double_check2.rs
+++ b/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
index 2a0a674e237..2a0a674e237 100644
--- a/src/test/ui/const-eval/double_check2.stderr
+++ b/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
index 4481b758404..4481b758404 100644
--- a/src/test/ui/const-eval/duration_conversion.rs
+++ b/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
index ba38a42092e..ba38a42092e 100644
--- a/src/test/ui/const-eval/enum_discr.rs
+++ b/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
index 071311430a8..071311430a8 100644
--- a/src/test/ui/const-eval/extern_fat_pointer.rs
+++ b/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
index 113046b0689..113046b0689 100644
--- 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
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
index 1e28f14165f..1e28f14165f 100644
--- 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
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
index 31e056b66bc..31e056b66bc 100644
--- a/src/test/ui/const-eval/ice-generic-assoc-const.rs
+++ b/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
index 1db12a06b03..1db12a06b03 100644
--- a/src/test/ui/const-eval/ice-packed.rs
+++ b/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
index e7ffbe81b9a..e7ffbe81b9a 100644
--- a/src/test/ui/const-eval/index_out_of_bounds.rs
+++ b/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
index a08d405d449..a08d405d449 100644
--- a/src/test/ui/const-eval/index_out_of_bounds.stderr
+++ b/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
index 7a7e2ef0b6b..7a7e2ef0b6b 100644
--- 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
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
index 97badc19c94..97badc19c94 100644
--- 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
diff --git a/src/test/ui/const-eval/infinite_loop.rs b/src/test/ui/consts/const-eval/infinite_loop.rs
index a1f8ab7f878..a1f8ab7f878 100644
--- a/src/test/ui/const-eval/infinite_loop.rs
+++ b/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
index f69aae29203..f69aae29203 100644
--- a/src/test/ui/const-eval/infinite_loop.stderr
+++ b/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
index 732fe459834..732fe459834 100644
--- a/src/test/ui/const-eval/issue-43197.nll.stderr
+++ b/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
index c0b45f0ba30..c0b45f0ba30 100644
--- a/src/test/ui/const-eval/issue-43197.rs
+++ b/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
index 66921dcd7c5..66921dcd7c5 100644
--- a/src/test/ui/const-eval/issue-43197.stderr
+++ b/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
index da040747991..da040747991 100644
--- a/src/test/ui/const-eval/issue-44578.nll.stderr
+++ b/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
index 59ac4ab311c..59ac4ab311c 100644
--- a/src/test/ui/const-eval/issue-44578.rs
+++ b/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
index 06174f37dca..06174f37dca 100644
--- a/src/test/ui/const-eval/issue-44578.stderr
+++ b/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
index f6a2db31d37..f6a2db31d37 100644
--- a/src/test/ui/const-eval/issue-47971.rs
+++ b/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
index 2b0082d95b3..2b0082d95b3 100644
--- a/src/test/ui/const-eval/issue-50706.rs
+++ b/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
index af627ee5fbe..af627ee5fbe 100644
--- a/src/test/ui/const-eval/issue-50814-2.rs
+++ b/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
index 1e37e949812..1e37e949812 100644
--- a/src/test/ui/const-eval/issue-50814-2.stderr
+++ b/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
index 8f2752453b5..8f2752453b5 100644
--- a/src/test/ui/const-eval/issue-50814.rs
+++ b/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
index 16160207c57..16160207c57 100644
--- a/src/test/ui/const-eval/issue-50814.stderr
+++ b/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
index f91711c3c0f..f91711c3c0f 100644
--- a/src/test/ui/const-eval/issue-51300.rs
+++ b/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
index 755dc153d40..755dc153d40 100644
--- a/src/test/ui/const-eval/issue-52442.rs
+++ b/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
index 586c9fa22ce..586c9fa22ce 100644
--- a/src/test/ui/const-eval/issue-52442.stderr
+++ b/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
index 2ae94f6d642..2ae94f6d642 100644
--- a/src/test/ui/const-eval/issue-52443.rs
+++ b/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
index 3a145ba78d9..3a145ba78d9 100644
--- a/src/test/ui/const-eval/issue-52443.stderr
+++ b/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
index 81fcd23fb78..81fcd23fb78 100644
--- a/src/test/ui/const-eval/match-test-ptr-null.rs
+++ b/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
index 26577948fae..26577948fae 100644
--- a/src/test/ui/const-eval/match-test-ptr-null.stderr
+++ b/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
index 41d5192d33d..41d5192d33d 100644
--- 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
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
index 922d7d3ab96..922d7d3ab96 100644
--- 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
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
index 19db07dd330..19db07dd330 100644
--- a/src/test/ui/const-eval/promoted_const_fn_fail.rs
+++ b/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
index a58c4be66c4..a58c4be66c4 100644
--- a/src/test/ui/const-eval/promoted_errors.rs
+++ b/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
index 85b5696be94..85b5696be94 100644
--- a/src/test/ui/const-eval/promoted_errors.stderr
+++ b/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
index 3b437f69d8d..3b437f69d8d 100644
--- a/src/test/ui/const-eval/promoted_raw_ptr_ops.rs
+++ b/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
index 90c73c095fb..90c73c095fb 100644
--- a/src/test/ui/const-eval/promoted_raw_ptr_ops.stderr
+++ b/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
index b7cfa949bac..b7cfa949bac 100644
--- a/src/test/ui/const-eval/pub_const_err.rs
+++ b/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
index fa3a79a5f17..fa3a79a5f17 100644
--- a/src/test/ui/const-eval/pub_const_err.stderr
+++ b/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
index bafa5b2f4da..bafa5b2f4da 100644
--- a/src/test/ui/const-eval/pub_const_err_bin.rs
+++ b/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
index 73229c60d14..73229c60d14 100644
--- a/src/test/ui/const-eval/pub_const_err_bin.stderr
+++ b/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
index 1758ac72b63..1758ac72b63 100644
--- a/src/test/ui/const-eval/ref_to_float_transmute.rs
+++ b/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
index cb942f465e4..cb942f465e4 100644
--- a/src/test/ui/const-eval/ref_to_int_match.rs
+++ b/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
index e82a16c066f..e82a16c066f 100644
--- a/src/test/ui/const-eval/ref_to_int_match.stderr
+++ b/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
index a2c6ed36d30..a2c6ed36d30 100644
--- a/src/test/ui/const-eval/shift_overflow.rs
+++ b/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
index 00a748249ea..00a748249ea 100644
--- a/src/test/ui/const-eval/shift_overflow.stderr
+++ b/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
index d18059fafd5..d18059fafd5 100644
--- a/src/test/ui/const-eval/simple_with_undef.rs
+++ b/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
index dfa41c491fa..dfa41c491fa 100644
--- a/src/test/ui/const-eval/strlen.rs
+++ b/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
index 8538dd14afe..8538dd14afe 100644
--- a/src/test/ui/const-eval/ub-enum-ptr.rs
+++ b/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
index 4b7ccc25c6c..4b7ccc25c6c 100644
--- a/src/test/ui/const-eval/ub-enum-ptr.stderr
+++ b/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
index b405f766f91..b405f766f91 100644
--- a/src/test/ui/const-eval/ub-ptr-in-usize.rs
+++ b/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
index a5e341524bc..a5e341524bc 100644
--- a/src/test/ui/const-eval/ub-uninhabit.rs
+++ b/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
index 623b98dc453..623b98dc453 100644
--- a/src/test/ui/const-eval/ub-uninhabit.stderr
+++ b/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
index aaff2f23381..aaff2f23381 100644
--- a/src/test/ui/const-eval/ub-usize-in-ref.rs
+++ b/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
index 5723f4a4159..5723f4a4159 100644
--- a/src/test/ui/const-eval/union-const-eval-field.rs
+++ b/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
index 811450c8cba..811450c8cba 100644
--- a/src/test/ui/const-eval/union-const-eval-field.stderr
+++ b/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
index 0cdb78c9780..0cdb78c9780 100644
--- a/src/test/ui/const-eval/union-ice.rs
+++ b/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
index e8a7b2f5005..e8a7b2f5005 100644
--- a/src/test/ui/const-eval/union-ice.stderr
+++ b/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
index db36764c4a3..db36764c4a3 100644
--- a/src/test/ui/const-eval/union-ub.rs
+++ b/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
index 2a04dae337b..2a04dae337b 100644
--- a/src/test/ui/const-eval/union-ub.stderr
+++ b/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
index 714d7a4fc8b..714d7a4fc8b 100644
--- a/src/test/ui/const-eval/union_promotion.rs
+++ b/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
index b4aa91f2de7..b4aa91f2de7 100644
--- a/src/test/ui/const-eval/union_promotion.stderr
+++ b/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
index f51cce5d4e0..f51cce5d4e0 100644
--- a/src/test/ui/const-expr-addr-operator.rs
+++ b/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
index fce1688716d..fce1688716d 100644
--- a/src/test/ui/compile-fail-migration/const-fn-destructuring-arg.rs
+++ b/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
index 029d63a7720..029d63a7720 100644
--- a/src/test/ui/compile-fail-migration/const-fn-destructuring-arg.stderr
+++ b/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
index 6eda41730b3..6eda41730b3 100644
--- a/src/test/ui/const-fn-error.rs
+++ b/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
index cdbf86f42ec..cdbf86f42ec 100644
--- a/src/test/ui/const-fn-error.stderr
+++ b/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
index 4e1fa6bd186..4e1fa6bd186 100644
--- a/src/test/ui/const-fn-mismatch.rs
+++ b/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
index 1c9728fec9e..1c9728fec9e 100644
--- a/src/test/ui/const-fn-mismatch.stderr
+++ b/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
index 1877929173d..1877929173d 100644
--- a/src/test/ui/const-fn-not-in-trait.rs
+++ b/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
index 5801f701ff8..5801f701ff8 100644
--- a/src/test/ui/const-fn-not-in-trait.stderr
+++ b/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
index 341cc7bb491..341cc7bb491 100644
--- 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
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
index 1e99a4378fa..1e99a4378fa 100644
--- 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
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
index 0f413b0bbc1..0f413b0bbc1 100644
--- a/src/test/ui/compile-fail-migration/const-fn-stability-calls-3.rs
+++ b/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
index 50c959d6805..50c959d6805 100644
--- a/src/test/ui/compile-fail-migration/const-fn-stability-calls-3.stderr
+++ b/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
index 29bc665a22e..29bc665a22e 100644
--- a/src/test/ui/compile-fail-migration/const-integer-bool-ops.rs
+++ b/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
index 8075a3f0863..8075a3f0863 100644
--- a/src/test/ui/compile-fail-migration/const-integer-bool-ops.stderr
+++ b/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
index 8db1411005e..8db1411005e 100644
--- a/src/test/ui/const-len-underflow-separate-spans.rs
+++ b/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
index cf97a0dc555..cf97a0dc555 100644
--- a/src/test/ui/const-len-underflow-separate-spans.stderr
+++ b/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
index 054c272a3d3..054c272a3d3 100644
--- a/src/test/ui/compile-fail-migration/const-len-underflow-subspans.rs
+++ b/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
index 860716c1f38..860716c1f38 100644
--- a/src/test/ui/compile-fail-migration/const-len-underflow-subspans.stderr
+++ b/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
index 3caf1491aba..3caf1491aba 100644
--- a/src/test/ui/compile-fail-migration/const-match-check.eval1.stderr
+++ b/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
index de85d4d73db..de85d4d73db 100644
--- a/src/test/ui/compile-fail-migration/const-match-check.eval2.stderr
+++ b/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
index bbf1169c577..bbf1169c577 100644
--- a/src/test/ui/compile-fail-migration/const-match-check.matchck.stderr
+++ b/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
index 304eef7847c..304eef7847c 100644
--- a/src/test/ui/compile-fail-migration/const-match-check.rs
+++ b/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
index bc944948f3d..bc944948f3d 100644
--- a/src/test/ui/compile-fail-migration/const-match-pattern-arm.rs
+++ b/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
index 201aa7cd5b7..201aa7cd5b7 100644
--- a/src/test/ui/compile-fail-migration/const-match-pattern-arm.stderr
+++ b/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
index af0b95e002d..af0b95e002d 100644
--- a/src/test/ui/const-pattern-irrefutable.rs
+++ b/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
index 6d5738f3328..6d5738f3328 100644
--- a/src/test/ui/const-pattern-irrefutable.stderr
+++ b/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
index 87d5e13df6e..87d5e13df6e 100644
--- a/src/test/ui/const-pattern-not-const-evaluable.rs
+++ b/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
index fed8e1885de..fed8e1885de 100644
--- a/src/test/ui/compile-fail-migration/const-size_of-cycle.rs
+++ b/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
index b10dd509e0b..b10dd509e0b 100644
--- a/src/test/ui/compile-fail-migration/const-size_of-cycle.stderr
+++ b/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
index 6d51ff30998..6d51ff30998 100644
--- a/src/test/ui/compile-fail-migration/const-slice-oob.rs
+++ b/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
index 30260c36ffd..30260c36ffd 100644
--- a/src/test/ui/compile-fail-migration/const-slice-oob.stderr
+++ b/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
index b42c440f87d..b42c440f87d 100644
--- a/src/test/ui/compile-fail-migration/const-tup-index-span.rs
+++ b/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
index e9248629656..e9248629656 100644
--- a/src/test/ui/compile-fail-migration/const-tup-index-span.stderr
+++ b/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
index ddad4e79cfd..ddad4e79cfd 100644
--- a/src/test/ui/const-type-mismatch.rs
+++ b/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
index 965995f82c5..965995f82c5 100644
--- a/src/test/ui/const-type-mismatch.stderr
+++ b/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
index 401125cef09..401125cef09 100644
--- a/src/test/ui/compile-fail-migration/const-typeid-of.rs
+++ b/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
index d13ced9a10a..d13ced9a10a 100644
--- a/src/test/ui/compile-fail-migration/const-typeid-of.stderr
+++ b/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
index 39ac969b80e..39ac969b80e 100644
--- a/src/test/ui/const-unsized.rs
+++ b/src/test/ui/consts/const-unsized.rs
diff --git a/src/test/ui/const-unsized.stderr b/src/test/ui/consts/const-unsized.stderr
index 83d23bcba04..83d23bcba04 100644
--- a/src/test/ui/const-unsized.stderr
+++ b/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
index 70633c92e64..70633c92e64 100644
--- a/src/test/ui/compile-fail-migration/copy-a-resource.rs
+++ b/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
index 6d8d4884d73..6d8d4884d73 100644
--- a/src/test/ui/compile-fail-migration/copy-a-resource.stderr
+++ b/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
index 589c0beb760..589c0beb760 100644
--- a/src/test/ui/compile-fail-migration/crate-name-mismatch.rs
+++ b/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
index 26ef91ba8e7..26ef91ba8e7 100644
--- a/src/test/ui/compile-fail-migration/crate-name-mismatch.stderr
+++ b/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
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
index 8c3dbda6802..8c3dbda6802 100644
--- a/src/test/ui/compile-fail-migration/crateresolve1.rs
+++ b/src/test/ui/crateresolve1.rs
diff --git a/src/test/ui/compile-fail-migration/crateresolve1.stderr b/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
index 7c76cf475d2..7c76cf475d2 100644
--- a/src/test/ui/compile-fail-migration/cross-borrow-trait.rs
+++ b/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
index d25316d542a..d25316d542a 100644
--- a/src/test/ui/compile-fail-migration/cross-borrow-trait.stderr
+++ b/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
index 598e9f0f53a..598e9f0f53a 100644
--- 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
diff --git a/src/test/ui/cross-crate-macro-backtrace/main.rs b/src/test/ui/cross/cross-crate-macro-backtrace/main.rs
index 9a6fa3e6920..9a6fa3e6920 100644
--- a/src/test/ui/cross-crate-macro-backtrace/main.rs
+++ b/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
index bffd76ca587..bffd76ca587 100644
--- a/src/test/ui/cross-crate-macro-backtrace/main.stderr
+++ b/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
index 659075acd88..659075acd88 100644
--- a/src/test/ui/cross-file-errors/main.rs
+++ b/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
index a64595fbb40..a64595fbb40 100644
--- a/src/test/ui/cross-file-errors/main.stderr
+++ b/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
index 312b3b8f4dd..312b3b8f4dd 100644
--- a/src/test/ui/cross-file-errors/underscore.rs
+++ b/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
index d437fc019fd..d437fc019fd 100644
--- a/src/test/ui/compile-fail-migration/cross-fn-cache-hole.rs
+++ b/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
index bfcb83204bb..bfcb83204bb 100644
--- a/src/test/ui/compile-fail-migration/cross-fn-cache-hole.stderr
+++ b/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
index eff734230ee..eff734230ee 100644
--- a/src/test/ui/compile-fail-migration/custom_attribute.rs
+++ b/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
index 7d2a23b7054..4adfe1e450e 100644
--- a/src/test/ui/compile-fail-migration/custom_attribute.stderr
+++ b/src/test/ui/custom_attribute.stderr
@@ -1,13 +1,13 @@
 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
+  --> $DIR/custom_attribute.rs:13:1
    |
-LL |     #[foo] //~ ERROR The attribute `foo`
-   |     ^^^^^^
+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:17:5
+  --> $DIR/custom_attribute.rs:15:5
    |
 LL |     #[foo] //~ ERROR The attribute `foo`
    |     ^^^^^^
@@ -15,10 +15,10 @@ 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
+  --> $DIR/custom_attribute.rs:17:5
    |
-LL | #[foo] //~ ERROR The attribute `foo`
-   | ^^^^^^
+LL |     #[foo] //~ ERROR The attribute `foo`
+   |     ^^^^^^
    |
    = help: add #![feature(custom_attribute)] to the crate attributes to enable
 
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
index 56ad1771e00..56ad1771e00 100644
--- 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
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
index c7147bcddc4..c7147bcddc4 100644
--- 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
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
index b8bae215456..b8bae215456 100644
--- 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
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
index 767a99a3265..767a99a3265 100644
--- 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
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
index b802463fcb0..b802463fcb0 100644
--- a/src/test/ui/compile-fail-migration/cycle-trait-supertrait-direct.rs
+++ b/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
index 724d4b1ec67..724d4b1ec67 100644
--- a/src/test/ui/compile-fail-migration/cycle-trait-supertrait-direct.stderr
+++ b/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
index f240a34817d..f240a34817d 100644
--- a/src/test/ui/cycle-trait-supertrait-indirect.rs
+++ b/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
index 85681b478e2..85681b478e2 100644
--- a/src/test/ui/cycle-trait-supertrait-indirect.stderr
+++ b/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
index d808d797272..d808d797272 100644
--- a/src/test/ui/compile-fail-migration/dead-code-closure-bang.rs
+++ b/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
index 250d22db374..250d22db374 100644
--- a/src/test/ui/compile-fail-migration/dead-code-ret.rs
+++ b/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
index 9f940166966..9f940166966 100644
--- a/src/test/ui/compile-fail-migration/dead-code-ret.stderr
+++ b/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
index ac8ac85824e..ac8ac85824e 100644
--- a/src/test/ui/compile-fail-migration/defaulted-never-note.rs
+++ b/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
index 32922354fe6..32922354fe6 100644
--- a/src/test/ui/compile-fail-migration/defaulted-never-note.stderr
+++ b/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
index c20cfbc7e23..c20cfbc7e23 100644
--- 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
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
index e00b3ccf281..e00b3ccf281 100644
--- 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
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
index 222c1972005..222c1972005 100644
--- a/src/test/ui/compile-fail-migration/dep-graph-caller-callee.rs
+++ b/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
index 8943b051c12..8943b051c12 100644
--- a/src/test/ui/compile-fail-migration/dep-graph-caller-callee.stderr
+++ b/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
index 647605ae438..647605ae438 100644
--- a/src/test/ui/compile-fail-migration/dep-graph-struct-signature.rs
+++ b/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
index cbb695d0cf2..cbb695d0cf2 100644
--- a/src/test/ui/compile-fail-migration/dep-graph-struct-signature.stderr
+++ b/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
index 7dd02f57b36..7dd02f57b36 100644
--- 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
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
index 877a056019f..877a056019f 100644
--- 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
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
index 6b3525333bc..6b3525333bc 100644
--- 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
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
index f939fac3146..f939fac3146 100644
--- 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
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
index 85b3e69065d..85b3e69065d 100644
--- a/src/test/ui/compile-fail-migration/dep-graph-trait-impl.rs
+++ b/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
index c569e8584e7..c569e8584e7 100644
--- a/src/test/ui/compile-fail-migration/dep-graph-trait-impl.stderr
+++ b/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
index dca1fa4d98f..dca1fa4d98f 100644
--- a/src/test/ui/compile-fail-migration/dep-graph-type-alias.rs
+++ b/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
index b018c250667..b018c250667 100644
--- a/src/test/ui/compile-fail-migration/dep-graph-type-alias.stderr
+++ b/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
index 18cfd001804..18cfd001804 100644
--- a/src/test/ui/compile-fail-migration/dep-graph-variance-alias.rs
+++ b/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
index a3b12013906..a3b12013906 100644
--- a/src/test/ui/compile-fail-migration/dep-graph-variance-alias.stderr
+++ b/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
index 17510289875..17510289875 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/deprecation-lint.rs
+++ b/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
index dce80698dea..dce80698dea 100644
--- a/src/test/ui/deprecated-macro_escape-inner.rs
+++ b/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
index 56c08383797..56c08383797 100644
--- a/src/test/ui/deprecated-macro_escape-inner.stderr
+++ b/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
index a234572343c..a234572343c 100644
--- a/src/test/ui/deprecated-macro_escape.rs
+++ b/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
index 09ff3285740..09ff3285740 100644
--- a/src/test/ui/deprecated-macro_escape.stderr
+++ b/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
index 38aaefd52b3..38aaefd52b3 100644
--- a/src/test/ui/compile-fail-migration/deprecated_no_stack_check.rs
+++ b/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
index 2f847a253e4..2f847a253e4 100644
--- a/src/test/ui/compile-fail-migration/deprecated_no_stack_check.stderr
+++ b/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
index 5c6facbf014..5c6facbf014 100644
--- a/src/test/ui/compile-fail-migration/deprecation-in-staged-api.rs
+++ b/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
index 9ad56585015..9ad56585015 100644
--- a/src/test/ui/compile-fail-migration/deprecation-in-staged-api.stderr
+++ b/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
index 2817e06652a..2817e06652a 100644
--- a/src/test/ui/compile-fail-migration/deprecation-lint-2.rs
+++ b/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
index fedc6b22f32..fedc6b22f32 100644
--- a/src/test/ui/compile-fail-migration/deprecation-lint-2.stderr
+++ b/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
index 7faaa181d39..7faaa181d39 100644
--- a/src/test/ui/compile-fail-migration/deprecation-lint-3.rs
+++ b/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
index 9dfc44ebc61..9dfc44ebc61 100644
--- a/src/test/ui/compile-fail-migration/deprecation-lint-3.stderr
+++ b/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
index eedbba59c6f..eedbba59c6f 100644
--- a/src/test/ui/compile-fail-migration/deprecation-lint-nested.rs
+++ b/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
index 4e2b462fd1b..4e2b462fd1b 100644
--- a/src/test/ui/compile-fail-migration/deprecation-lint-nested.stderr
+++ b/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
index 93eb6b6b115..93eb6b6b115 100644
--- a/src/test/ui/compile-fail-migration/deprecation-lint.rs
+++ b/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
index addca669917..addca669917 100644
--- a/src/test/ui/compile-fail-migration/deprecation-lint.stderr
+++ b/src/test/ui/deprecation/deprecation-lint.stderr
diff --git a/src/test/ui/deprecation-sanity.rs b/src/test/ui/deprecation/deprecation-sanity.rs
index af2ac79ea80..af2ac79ea80 100644
--- a/src/test/ui/deprecation-sanity.rs
+++ b/src/test/ui/deprecation/deprecation-sanity.rs
diff --git a/src/test/ui/deprecation-sanity.stderr b/src/test/ui/deprecation/deprecation-sanity.stderr
index 967eb6e23a3..967eb6e23a3 100644
--- a/src/test/ui/deprecation-sanity.stderr
+++ b/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
index 1c711c0145d..1c711c0145d 100644
--- a/src/test/ui/compile-fail-migration/deref-non-pointer.rs
+++ b/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
index 3e0ea06123d..3e0ea06123d 100644
--- a/src/test/ui/compile-fail-migration/deref-non-pointer.stderr
+++ b/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
index 553ad0a3341..553ad0a3341 100644
--- a/src/test/ui/compile-fail-migration/derived-errors/issue-30580.rs
+++ b/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
index bf9a5a299e3..bf9a5a299e3 100644
--- a/src/test/ui/compile-fail-migration/derived-errors/issue-30580.stderr
+++ b/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
index 2e1d3c55a8f..2e1d3c55a8f 100644
--- a/src/test/ui/compile-fail-migration/derived-errors/issue-31997.rs
+++ b/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
index 25088e8654b..25088e8654b 100644
--- a/src/test/ui/compile-fail-migration/derived-errors/issue-31997.stderr
+++ b/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
index 3799f2ffba4..3799f2ffba4 100644
--- a/src/test/ui/compile-fail-migration/derive-assoc-type-not-impl.rs
+++ b/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
index c49e3387661..c49e3387661 100644
--- a/src/test/ui/compile-fail-migration/derive-assoc-type-not-impl.stderr
+++ b/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
index 9ff1c14f54c..9ff1c14f54c 100644
--- 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
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
index 8246889b620..8246889b620 100644
--- 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
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
index 244acbf6605..244acbf6605 100644
--- 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
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
index fbe9d3f7d69..fbe9d3f7d69 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/derives-span-Clone-enum.rs b/src/test/ui/derives/derives-span-Clone-enum.rs
index 785a3d35430..785a3d35430 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Clone-enum.rs
+++ b/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
index b5b3c8bfc85..b5b3c8bfc85 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Clone-enum.stderr
+++ b/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
index b1b1dc7bed1..b1b1dc7bed1 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Clone-struct.rs
+++ b/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
index ebd1e666b38..ebd1e666b38 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Clone-struct.stderr
+++ b/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
index d56e21b9a8a..d56e21b9a8a 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Clone-tuple-struct.rs
+++ b/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
index 6867baad2c1..6867baad2c1 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Clone-tuple-struct.stderr
+++ b/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
index 4c25e482c2a..4c25e482c2a 100644
--- 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
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
index f5939a2e937..f5939a2e937 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/derives-span-Debug-enum.rs b/src/test/ui/derives/derives-span-Debug-enum.rs
index 0cb02aa54e6..0cb02aa54e6 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Debug-enum.rs
+++ b/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
index 566a5786de7..566a5786de7 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Debug-enum.stderr
+++ b/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
index 33fa82355ec..33fa82355ec 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Debug-struct.rs
+++ b/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
index 30145a78a26..30145a78a26 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Debug-struct.stderr
+++ b/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
index 760ed199f6a..760ed199f6a 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Debug-tuple-struct.rs
+++ b/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
index 963fc8a38f0..963fc8a38f0 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Debug-tuple-struct.stderr
+++ b/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
index 4adfe75adaf..4adfe75adaf 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Default-struct.rs
+++ b/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
index a9634e64fa9..a9634e64fa9 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Default-struct.stderr
+++ b/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
index a5e3a7cd49f..a5e3a7cd49f 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Default-tuple-struct.rs
+++ b/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
index eb0ef61a57d..eb0ef61a57d 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Default-tuple-struct.stderr
+++ b/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
index 6abd1d31e66..6abd1d31e66 100644
--- 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
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
index b230c014092..b230c014092 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/derives-span-Eq-enum.rs b/src/test/ui/derives/derives-span-Eq-enum.rs
index f361278a620..f361278a620 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Eq-enum.rs
+++ b/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
index 7f6d27a311d..7f6d27a311d 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Eq-enum.stderr
+++ b/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
index 7067caa6d5c..7067caa6d5c 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Eq-struct.rs
+++ b/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
index a9db0401959..a9db0401959 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Eq-struct.stderr
+++ b/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
index 1a09628b770..1a09628b770 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Eq-tuple-struct.rs
+++ b/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
index 70f39f30eed..70f39f30eed 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Eq-tuple-struct.stderr
+++ b/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
index 907045cce47..907045cce47 100644
--- 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
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
index bde7556f7ce..bde7556f7ce 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/derives-span-Hash-enum.rs b/src/test/ui/derives/derives-span-Hash-enum.rs
index 321b9e71a0f..321b9e71a0f 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Hash-enum.rs
+++ b/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
index 72b8f3ada02..72b8f3ada02 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Hash-enum.stderr
+++ b/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
index 7f69c3a8e25..7f69c3a8e25 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Hash-struct.rs
+++ b/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
index 3068bcfe0a0..3068bcfe0a0 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Hash-struct.stderr
+++ b/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
index 2dee63c4298..2dee63c4298 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Hash-tuple-struct.rs
+++ b/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
index a65fbd8b6e6..a65fbd8b6e6 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Hash-tuple-struct.stderr
+++ b/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
index 8f4e393c96a..8f4e393c96a 100644
--- 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
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
index 5968efd5ca1..5968efd5ca1 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/derives-span-Ord-enum.rs b/src/test/ui/derives/derives-span-Ord-enum.rs
index b8ceacf3753..b8ceacf3753 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Ord-enum.rs
+++ b/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
index 074a8f84cec..074a8f84cec 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Ord-enum.stderr
+++ b/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
index 2ff62bac2bc..2ff62bac2bc 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Ord-struct.rs
+++ b/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
index 2e584e6ca87..2e584e6ca87 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Ord-struct.stderr
+++ b/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
index 24eacb71d7b..24eacb71d7b 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Ord-tuple-struct.rs
+++ b/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
index 0da452f0a6a..0da452f0a6a 100644
--- a/src/test/ui/compile-fail-migration/derives-span-Ord-tuple-struct.stderr
+++ b/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
index 14d94f1599e..14d94f1599e 100644
--- 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
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
index cad446f8326..cad446f8326 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialEq-enum.rs b/src/test/ui/derives/derives-span-PartialEq-enum.rs
index ab58bb938b9..ab58bb938b9 100644
--- a/src/test/ui/compile-fail-migration/derives-span-PartialEq-enum.rs
+++ b/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
index e75d0693db5..e75d0693db5 100644
--- a/src/test/ui/compile-fail-migration/derives-span-PartialEq-enum.stderr
+++ b/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
index 05a0990ff03..05a0990ff03 100644
--- a/src/test/ui/compile-fail-migration/derives-span-PartialEq-struct.rs
+++ b/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
index c8cd509a824..c8cd509a824 100644
--- a/src/test/ui/compile-fail-migration/derives-span-PartialEq-struct.stderr
+++ b/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
index cdeb7ce45bc..cdeb7ce45bc 100644
--- a/src/test/ui/compile-fail-migration/derives-span-PartialEq-tuple-struct.rs
+++ b/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
index b66189fb567..b66189fb567 100644
--- a/src/test/ui/compile-fail-migration/derives-span-PartialEq-tuple-struct.stderr
+++ b/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
index a5df717e06b..a5df717e06b 100644
--- 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
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
index 7e55ba70c13..7e55ba70c13 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/derives-span-PartialOrd-enum.rs b/src/test/ui/derives/derives-span-PartialOrd-enum.rs
index 3411d2f3119..3411d2f3119 100644
--- a/src/test/ui/compile-fail-migration/derives-span-PartialOrd-enum.rs
+++ b/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
index d8b3bd9f1bc..d8b3bd9f1bc 100644
--- a/src/test/ui/compile-fail-migration/derives-span-PartialOrd-enum.stderr
+++ b/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
index 1feadc2fd83..1feadc2fd83 100644
--- a/src/test/ui/compile-fail-migration/derives-span-PartialOrd-struct.rs
+++ b/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
index afd93dce625..afd93dce625 100644
--- a/src/test/ui/compile-fail-migration/derives-span-PartialOrd-struct.stderr
+++ b/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
index 9db0fed2d9e..9db0fed2d9e 100644
--- a/src/test/ui/compile-fail-migration/derives-span-PartialOrd-tuple-struct.rs
+++ b/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
index a65ee40f220..a65ee40f220 100644
--- a/src/test/ui/compile-fail-migration/derives-span-PartialOrd-tuple-struct.stderr
+++ b/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
index 72d06274de4..72d06274de4 100644
--- a/src/test/ui/compile-fail-migration/deriving-bounds.rs
+++ b/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
index 2c42fd1b672..2c42fd1b672 100644
--- a/src/test/ui/compile-fail-migration/deriving-bounds.stderr
+++ b/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
index 92fb7c5737a..92fb7c5737a 100644
--- a/src/test/ui/compile-fail-migration/deriving-copyclone.rs
+++ b/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
index 2d0dc6649e7..2d0dc6649e7 100644
--- a/src/test/ui/compile-fail-migration/deriving-copyclone.stderr
+++ b/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
index cf4dfb947f4..cf4dfb947f4 100644
--- a/src/test/ui/deriving-meta-empty-trait-list.rs
+++ b/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
index f5532f7c561..f5532f7c561 100644
--- a/src/test/ui/deriving-meta-empty-trait-list.stderr
+++ b/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
index d388ece0844..d388ece0844 100644
--- a/src/test/ui/compile-fail-migration/deriving-meta-unknown-trait.rs
+++ b/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
index aa0f1e21213..aa0f1e21213 100644
--- a/src/test/ui/compile-fail-migration/deriving-meta-unknown-trait.stderr
+++ b/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
index 129c859b919..129c859b919 100644
--- 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
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
index 48d27ae1474..48d27ae1474 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/deriving-non-type.rs b/src/test/ui/derives/deriving-non-type.rs
index 84dd22435b8..84dd22435b8 100644
--- a/src/test/ui/compile-fail-migration/deriving-non-type.rs
+++ b/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
index d9da03afb03..d9da03afb03 100644
--- a/src/test/ui/compile-fail-migration/deriving-non-type.stderr
+++ b/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
index 04fdee5e3ed..04fdee5e3ed 100644
--- a/src/test/ui/compile-fail-migration/deriving-primitive.rs
+++ b/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
index bc2d3393290..bc2d3393290 100644
--- a/src/test/ui/compile-fail-migration/deriving-primitive.stderr
+++ b/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
index 43375098cb5..43375098cb5 100644
--- a/src/test/ui/deriving-with-repr-packed.rs
+++ b/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
index a7599c1e7db..a7599c1e7db 100644
--- a/src/test/ui/deriving-with-repr-packed.stderr
+++ b/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
index b5acdc12ca0..b5acdc12ca0 100644
--- a/src/test/ui/compile-fail-migration/destructure-trait-ref.rs
+++ b/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
index 0335fff7bce..0335fff7bce 100644
--- a/src/test/ui/compile-fail-migration/destructure-trait-ref.stderr
+++ b/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
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/ui/compile-fail-migration/directory_ownership/foo/compiletest-ignore-dir
+++ b/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
index fc4bca865c9..fc4bca865c9 100644
--- 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
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
index fc4bca865c9..fc4bca865c9 100644
--- 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
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
index 8e631a64f7a..8e631a64f7a 100644
--- a/src/test/ui/compile-fail-migration/directory_ownership/macro-expanded-mod.rs
+++ b/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
index a9efcd883c1..a9efcd883c1 100644
--- a/src/test/ui/compile-fail-migration/directory_ownership/macro-expanded-mod.stderr
+++ b/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
index 4ef92981314..4ef92981314 100644
--- 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
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
index 41a8c288e7c..41a8c288e7c 100644
--- 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
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
index ff93fddf9b3..ff93fddf9b3 100644
--- 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
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
index e2937573997..e2937573997 100644
--- 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
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
index 4ac94a92e37..4ac94a92e37 100644
--- 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
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
index e69de29bb2d..e69de29bb2d 100644
--- 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
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
index fc4bca865c9..fc4bca865c9 100644
--- 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
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
index 41401d640f6..41401d640f6 100644
--- 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
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
index 3a164fd55d9..3a164fd55d9 100644
--- 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
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
index c4ede12e820..c4ede12e820 100644
--- 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
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
index 93debdd675a..93debdd675a 100644
--- 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
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
index 0cffb7cc9e5..0cffb7cc9e5 100644
--- 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
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
index 0c0b4281434..0c0b4281434 100644
--- 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
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
index a8be048d7df..a8be048d7df 100644
--- 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
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
index 2621820c222..2621820c222 100644
--- 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
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
index cbf5fc61f93..cbf5fc61f93 100644
--- 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
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
index 9f0d2d5f0e1..9f0d2d5f0e1 100644
--- 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
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
index 38049209903..38049209903 100644
--- 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
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
index af2a1a06b56..af2a1a06b56 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/discrim-ill-typed.rs b/src/test/ui/discrim/discrim-ill-typed.rs
index 62e54c3f237..62e54c3f237 100644
--- a/src/test/ui/compile-fail-migration/discrim-ill-typed.rs
+++ b/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
index 50911037794..50911037794 100644
--- a/src/test/ui/compile-fail-migration/discrim-ill-typed.stderr
+++ b/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
index 9f77e77d158..9f77e77d158 100644
--- a/src/test/ui/discrim-overflow-2.rs
+++ b/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
index bd610bc7163..bd610bc7163 100644
--- a/src/test/ui/discrim-overflow-2.stderr
+++ b/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
index 16b417c61a5..16b417c61a5 100644
--- a/src/test/ui/discrim-overflow.rs
+++ b/src/test/ui/discrim/discrim-overflow.rs
diff --git a/src/test/ui/discrim-overflow.stderr b/src/test/ui/discrim/discrim-overflow.stderr
index ef784679ce0..ef784679ce0 100644
--- a/src/test/ui/discrim-overflow.stderr
+++ b/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
index 9ef5159cb77..9ef5159cb77 100644
--- a/src/test/ui/compile-fail-migration/diverging-fn-tail-35849.rs
+++ b/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
index 8f8ab79b25b..8f8ab79b25b 100644
--- a/src/test/ui/compile-fail-migration/diverging-fn-tail-35849.stderr
+++ b/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
index eedad08ab55..eedad08ab55 100644
--- a/src/test/ui/compile-fail-migration/diverging-tuple-parts-39485.rs
+++ b/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
index 603f8709c14..603f8709c14 100644
--- a/src/test/ui/compile-fail-migration/diverging-tuple-parts-39485.stderr
+++ b/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
index 01de94bddbd..01de94bddbd 100644
--- a/src/test/ui/compile-fail-migration/does-nothing.rs
+++ b/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
index fa4b1f2f1c8..fa4b1f2f1c8 100644
--- a/src/test/ui/compile-fail-migration/does-nothing.stderr
+++ b/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
index 87a29038035..87a29038035 100644
--- 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
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
index c9b4f894ff6..c9b4f894ff6 100644
--- 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
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
index 4a667f020ad..4a667f020ad 100644
--- a/src/test/ui/compile-fail-migration/dollar-crate-is-keyword.rs
+++ b/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
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
index 9629da735b0..9629da735b0 100644
--- a/src/test/ui/compile-fail-migration/double-type-import.rs
+++ b/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
index d5d977da4aa..d5d977da4aa 100644
--- a/src/test/ui/compile-fail-migration/double-type-import.stderr
+++ b/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
index 26b247d0d0f..26b247d0d0f 100644
--- a/src/test/ui/compile-fail-migration/drop-on-non-struct.rs
+++ b/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
index 6582df6bddc..6582df6bddc 100644
--- a/src/test/ui/compile-fail-migration/drop-on-non-struct.stderr
+++ b/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
index 30f9907401c..30f9907401c 100644
--- 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
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
index 903365fb909..903365fb909 100644
--- a/src/test/ui/compile-fail-migration/drop-with-active-borrows-1.rs
+++ b/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
index 60107427ea5..60107427ea5 100644
--- a/src/test/ui/compile-fail-migration/drop-with-active-borrows-1.stderr
+++ b/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
index 4f792a9c9d2..4f792a9c9d2 100644
--- 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
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
index 33e4d3e62c4..33e4d3e62c4 100644
--- a/src/test/ui/compile-fail-migration/drop-with-active-borrows-2.rs
+++ b/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
index 0fd4bf81039..0fd4bf81039 100644
--- a/src/test/ui/compile-fail-migration/drop-with-active-borrows-2.stderr
+++ b/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
index f0968853819..f0968853819 100644
--- 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
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
index f4dd867ec68..f4dd867ec68 100644
--- 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
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
index 886bd6bea20..886bd6bea20 100644
--- 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
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
index ae9c50a66a0..ae9c50a66a0 100644
--- 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
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
index 45531666ecf..45531666ecf 100644
--- 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
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
index e0089f8b298..e0089f8b298 100644
--- 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
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
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
index b6b7fa1a233..b6b7fa1a233 100644
--- a/src/test/ui/compile-fail-migration/dropck_trait_cycle_checked.rs
+++ b/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
index ab255cf0c98..ab255cf0c98 100644
--- a/src/test/ui/compile-fail-migration/dropck_trait_cycle_checked.stderr
+++ b/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
index 372f3187805..372f3187805 100644
--- a/src/test/ui/compile-fail-migration/dst-bad-assign-2.rs
+++ b/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
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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index 339cfb5443d..339cfb5443d 100644
--- a/src/test/ui/compile-fail-migration/dst-bad-assign-3.rs
+++ b/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
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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index 9a329c636ae..9a329c636ae 100644
--- a/src/test/ui/compile-fail-migration/dst-bad-assign.rs
+++ b/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
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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index b0de84a5300..b0de84a5300 100644
--- a/src/test/ui/compile-fail-migration/dst-bad-coerce1.rs
+++ b/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
index bb59c4d5617..bb59c4d5617 100644
--- a/src/test/ui/compile-fail-migration/dst-bad-coerce1.stderr
+++ b/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
index 9e92f649b2d..9e92f649b2d 100644
--- a/src/test/ui/compile-fail-migration/dst-bad-coerce2.rs
+++ b/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
index 51991544a2e..51991544a2e 100644
--- a/src/test/ui/compile-fail-migration/dst-bad-coerce2.stderr
+++ b/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
index bc5b4ca71cf..bc5b4ca71cf 100644
--- a/src/test/ui/compile-fail-migration/dst-bad-coerce3.nll.stderr
+++ b/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
index 35a147c15bb..35a147c15bb 100644
--- a/src/test/ui/compile-fail-migration/dst-bad-coerce3.rs
+++ b/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
index 3c4eb272082..3c4eb272082 100644
--- a/src/test/ui/compile-fail-migration/dst-bad-coerce3.stderr
+++ b/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
index 874b7588ff9..874b7588ff9 100644
--- a/src/test/ui/compile-fail-migration/dst-bad-coerce4.rs
+++ b/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
index 279de13cf37..279de13cf37 100644
--- a/src/test/ui/compile-fail-migration/dst-bad-coerce4.stderr
+++ b/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
index 883c16b0895..883c16b0895 100644
--- a/src/test/ui/compile-fail-migration/dst-bad-coercions.rs
+++ b/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
index 8901ef1caaa..8901ef1caaa 100644
--- a/src/test/ui/compile-fail-migration/dst-bad-coercions.stderr
+++ b/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
index a54301071ba..a54301071ba 100644
--- a/src/test/ui/compile-fail-migration/dst-bad-deep-2.rs
+++ b/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
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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index 3d7e2b8f671..3d7e2b8f671 100644
--- a/src/test/ui/compile-fail-migration/dst-bad-deep.rs
+++ b/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
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<[isize]>> = &Fat { ptr: *g };
    |                                  ^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
    |
    = help: within `Fat<Fat<[isize]>>`, the trait `std::marker::Sized` is not implemented for `[isize]`
-   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = note: required because it appears within the type `Fat<[isize]>`
    = note: required because it appears within the type `Fat<Fat<[isize]>>`
    = 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
index 767d8a84c04..767d8a84c04 100644
--- a/src/test/ui/compile-fail-migration/dst-index.nll.stderr
+++ b/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
index c52458934bd..c52458934bd 100644
--- a/src/test/ui/compile-fail-migration/dst-index.rs
+++ b/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
index 7c5e79dab99..7c5e79dab99 100644
--- a/src/test/ui/compile-fail-migration/dst-index.stderr
+++ b/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
index 70b46b1bd79..70b46b1bd79 100644
--- a/src/test/ui/compile-fail-migration/dst-object-from-unsized-type.rs
+++ b/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
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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index 5eadcc3def5..5eadcc3def5 100644
--- a/src/test/ui/compile-fail-migration/dst-rvalue.nll.stderr
+++ b/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
index 69bda8c1671..69bda8c1671 100644
--- a/src/test/ui/compile-fail-migration/dst-rvalue.rs
+++ b/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
index 0957105c8a7..0957105c8a7 100644
--- a/src/test/ui/compile-fail-migration/dst-rvalue.stderr
+++ b/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
index 7316a48970f..7316a48970f 100644
--- a/src/test/ui/compile-fail-migration/dst-sized-trait-param.rs
+++ b/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
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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
 
 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<isize> 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
 
 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
index 9fa4eafcad0..9fa4eafcad0 100644
--- a/src/test/ui/compile-fail-migration/dupe-symbols-1.rs
+++ b/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
index c702a0f3a1b..c702a0f3a1b 100644
--- a/src/test/ui/compile-fail-migration/dupe-symbols-1.stderr
+++ b/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
index 1f19bd2f249..1f19bd2f249 100644
--- a/src/test/ui/compile-fail-migration/dupe-symbols-2.rs
+++ b/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
index 5d5e9d73d7b..5d5e9d73d7b 100644
--- a/src/test/ui/compile-fail-migration/dupe-symbols-2.stderr
+++ b/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
index 98a61c33c58..98a61c33c58 100644
--- a/src/test/ui/compile-fail-migration/dupe-symbols-3.rs
+++ b/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
index 6801016373d..6801016373d 100644
--- a/src/test/ui/compile-fail-migration/dupe-symbols-3.stderr
+++ b/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
index 9e730699d25..9e730699d25 100644
--- a/src/test/ui/compile-fail-migration/dupe-symbols-4.rs
+++ b/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
index fdbb5ce90c1..fdbb5ce90c1 100644
--- a/src/test/ui/compile-fail-migration/dupe-symbols-4.stderr
+++ b/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
index eb4b50d03ca..eb4b50d03ca 100644
--- a/src/test/ui/compile-fail-migration/dupe-symbols-5.rs
+++ b/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
index 8ded374127b..8ded374127b 100644
--- a/src/test/ui/compile-fail-migration/dupe-symbols-5.stderr
+++ b/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
index 6f412d9a0de..6f412d9a0de 100644
--- a/src/test/ui/compile-fail-migration/dupe-symbols-6.rs
+++ b/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
index 6dbb831832a..6dbb831832a 100644
--- a/src/test/ui/compile-fail-migration/dupe-symbols-6.stderr
+++ b/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
index c2880ba6f51..c2880ba6f51 100644
--- a/src/test/ui/compile-fail-migration/dupe-symbols-7.rs
+++ b/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
index 5fadbd5bd10..5fadbd5bd10 100644
--- a/src/test/ui/compile-fail-migration/dupe-symbols-7.stderr
+++ b/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
index d8159bff567..d8159bff567 100644
--- a/src/test/ui/duplicate-check-macro-exports.rs
+++ b/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
index 651e984b274..651e984b274 100644
--- a/src/test/ui/duplicate-check-macro-exports.stderr
+++ b/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
index 7586bc61cd6..7586bc61cd6 100644
--- a/src/test/ui/compile-fail-migration/duplicate-parameter.rs
+++ b/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
index 6cc7244ea79..6cc7244ea79 100644
--- a/src/test/ui/compile-fail-migration/duplicate-parameter.stderr
+++ b/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
index 3b0f8ee5bda..3b0f8ee5bda 100644
--- a/src/test/ui/compile-fail-migration/duplicate-type-parameter.rs
+++ b/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
index 186a1e52bb8..186a1e52bb8 100644
--- a/src/test/ui/compile-fail-migration/duplicate-type-parameter.stderr
+++ b/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
index 176aa7cca53..176aa7cca53 100644
--- a/src/test/ui/compile-fail-migration/duplicate_entry_error.rs
+++ b/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
index b330d2f30f8..b330d2f30f8 100644
--- a/src/test/ui/compile-fail-migration/duplicate_entry_error.stderr
+++ b/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
index 454b6d2f566..454b6d2f566 100644
--- a/src/test/ui/compile-fail-migration/dyn-trait-compatibility.rs
+++ b/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
index 1ff3249371b..1ff3249371b 100644
--- a/src/test/ui/compile-fail-migration/dyn-trait-compatibility.stderr
+++ b/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
index d26ab6d3518..d26ab6d3518 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/edition-extern-crate-allowed.rs
+++ b/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
index 8f80e000e3c..8f80e000e3c 100644
--- a/src/test/ui/auxiliary/edition-kw-macro-2015.rs
+++ b/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
index 85ef15858fe..85ef15858fe 100644
--- a/src/test/ui/auxiliary/edition-kw-macro-2018.rs
+++ b/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
index 7368564e250..7368564e250 100644
--- a/src/test/ui/compile-fail-migration/edition-extern-crate-allowed.rs
+++ b/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
index 7c1ccc540c5..7c1ccc540c5 100644
--- a/src/test/ui/compile-fail-migration/edition-extern-crate-allowed.stderr
+++ b/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
index 3a3a6ff95f9..3a3a6ff95f9 100644
--- a/src/test/ui/compile-fail-migration/edition-feature-ok.rs
+++ b/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
index 3b78ce80be2..3b78ce80be2 100644
--- a/src/test/ui/edition-keywords-2015-2015-expansion.rs
+++ b/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
index 08cba2d2908..08cba2d2908 100644
--- a/src/test/ui/edition-keywords-2015-2015-parsing.rs
+++ b/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
index 5b6fd3e1c9c..5b6fd3e1c9c 100644
--- a/src/test/ui/edition-keywords-2015-2015-parsing.stderr
+++ b/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
index 41d5ebd3e7d..41d5ebd3e7d 100644
--- a/src/test/ui/edition-keywords-2015-2018-expansion.rs
+++ b/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
index 5852d56e6d3..5852d56e6d3 100644
--- a/src/test/ui/edition-keywords-2015-2018-expansion.stderr
+++ b/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
index 337d6be6bbc..337d6be6bbc 100644
--- a/src/test/ui/edition-keywords-2015-2018-parsing.rs
+++ b/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
index 60cfbce3ff0..60cfbce3ff0 100644
--- a/src/test/ui/edition-keywords-2015-2018-parsing.stderr
+++ b/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
index 911dcd855aa..911dcd855aa 100644
--- a/src/test/ui/edition-keywords-2018-2015-expansion.rs
+++ b/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
index 02b061f8cbc..02b061f8cbc 100644
--- a/src/test/ui/edition-keywords-2018-2015-parsing.rs
+++ b/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
index 02e7d5b7cd0..02e7d5b7cd0 100644
--- a/src/test/ui/edition-keywords-2018-2015-parsing.stderr
+++ b/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
index 81bef913ac6..81bef913ac6 100644
--- a/src/test/ui/edition-keywords-2018-2018-expansion.rs
+++ b/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
index c6e0927a3a4..c6e0927a3a4 100644
--- a/src/test/ui/edition-keywords-2018-2018-expansion.stderr
+++ b/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
index 565c2f2dc74..565c2f2dc74 100644
--- a/src/test/ui/edition-keywords-2018-2018-parsing.rs
+++ b/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
index 435e395c291..435e395c291 100644
--- a/src/test/ui/edition-keywords-2018-2018-parsing.stderr
+++ b/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
index 4ba44fa54d8..4ba44fa54d8 100644
--- a/src/test/ui/compile-fail-migration/edition-raw-pointer-method-2015.rs
+++ b/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
index 7fd098c98e3..7fd098c98e3 100644
--- a/src/test/ui/compile-fail-migration/edition-raw-pointer-method-2015.stderr
+++ b/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
index c8548ed35b9..c8548ed35b9 100644
--- a/src/test/ui/compile-fail-migration/edition-raw-pointer-method-2018.rs
+++ b/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
index 0708b4bbd46..0708b4bbd46 100644
--- a/src/test/ui/compile-fail-migration/edition-raw-pointer-method-2018.stderr
+++ b/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
index 0cdd0010a74..0cdd0010a74 100644
--- a/src/test/ui/compile-fail-migration/elided-test.rs
+++ b/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
index d22eee4e8bd..d22eee4e8bd 100644
--- a/src/test/ui/compile-fail-migration/elided-test.stderr
+++ b/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
index 4a302865634..4a302865634 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/empty-struct.rs
+++ b/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
index 060960f0dbc..060960f0dbc 100644
--- a/src/test/ui/auxiliary/two_macros.rs
+++ b/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
index a5568ff826b..a5568ff826b 100644
--- a/src/test/ui/compile-fail-migration/empty-comment.rs
+++ b/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
index d6990c4eaeb..d6990c4eaeb 100644
--- a/src/test/ui/compile-fail-migration/empty-comment.stderr
+++ b/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
index 8791481d9e7..8791481d9e7 100644
--- a/src/test/ui/compile-fail-migration/empty-extern-arg.rs
+++ b/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
index c81a647b094..c81a647b094 100644
--- a/src/test/ui/compile-fail-migration/empty-extern-arg.stderr
+++ b/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
index 20e0f9cd0b2..20e0f9cd0b2 100644
--- a/src/test/ui/compile-fail-migration/empty-linkname.rs
+++ b/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
index 9a637aa7833..9a637aa7833 100644
--- a/src/test/ui/compile-fail-migration/empty-linkname.stderr
+++ b/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
index 823a7426079..823a7426079 100644
--- a/src/test/ui/compile-fail-migration/empty-macro-use.rs
+++ b/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
index 8feb0930718..8feb0930718 100644
--- a/src/test/ui/compile-fail-migration/empty-macro-use.stderr
+++ b/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
index 53b24e17319..53b24e17319 100644
--- a/src/test/ui/compile-fail-migration/empty-never-array.rs
+++ b/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
index d9ef2f30aab..d9ef2f30aab 100644
--- a/src/test/ui/compile-fail-migration/empty-never-array.stderr
+++ b/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
index 3096e8f8313..3096e8f8313 100644
--- a/src/test/ui/compile-fail-migration/empty-struct-braces-expr.rs
+++ b/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
index 9b6114875e2..9b6114875e2 100644
--- a/src/test/ui/compile-fail-migration/empty-struct-braces-expr.stderr
+++ b/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
index e527170e9f9..e527170e9f9 100644
--- a/src/test/ui/compile-fail-migration/empty-struct-braces-pat-1.rs
+++ b/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
index aad47f4d954..aad47f4d954 100644
--- a/src/test/ui/compile-fail-migration/empty-struct-braces-pat-1.stderr
+++ b/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
index d3b13457dc6..d3b13457dc6 100644
--- a/src/test/ui/compile-fail-migration/empty-struct-braces-pat-2.rs
+++ b/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
index 26fb42c4e94..26fb42c4e94 100644
--- a/src/test/ui/compile-fail-migration/empty-struct-braces-pat-2.stderr
+++ b/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
index d6c5b953492..d6c5b953492 100644
--- a/src/test/ui/compile-fail-migration/empty-struct-braces-pat-3.rs
+++ b/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
index 389bf0a65c6..389bf0a65c6 100644
--- a/src/test/ui/compile-fail-migration/empty-struct-braces-pat-3.stderr
+++ b/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
index 5e683eafade..5e683eafade 100644
--- a/src/test/ui/compile-fail-migration/empty-struct-tuple-pat.rs
+++ b/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
index 3d219b1752f..3d219b1752f 100644
--- a/src/test/ui/compile-fail-migration/empty-struct-tuple-pat.stderr
+++ b/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
index 941292a7ec2..941292a7ec2 100644
--- a/src/test/ui/empty-struct-unit-expr.rs
+++ b/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
index fff696fc80f..fff696fc80f 100644
--- a/src/test/ui/empty-struct-unit-expr.stderr
+++ b/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
index 532c2d85053..532c2d85053 100644
--- a/src/test/ui/compile-fail-migration/empty-struct-unit-pat.rs
+++ b/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
index 042b53521c2..042b53521c2 100644
--- a/src/test/ui/compile-fail-migration/empty-struct-unit-pat.stderr
+++ b/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
index b10a0a60f14..b10a0a60f14 100644
--- a/src/test/ui/compile-fail-migration/enable-unstable-lib-feature.rs
+++ b/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
index 20b2eb51fcb..20b2eb51fcb 100644
--- a/src/test/ui/compile-fail-migration/enable-unstable-lib-feature.stderr
+++ b/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
index 9b6c8712f69..9b6c8712f69 100644
--- a/src/test/ui/enum-and-module-in-same-scope.rs
+++ b/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
index 230872abe0b..230872abe0b 100644
--- a/src/test/ui/enum-and-module-in-same-scope.stderr
+++ b/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
index 3a243330ad9..3a243330ad9 100644
--- a/src/test/ui/compile-fail-migration/enum-discrim-autosizing.rs
+++ b/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
index 3b4ac436898..3b4ac436898 100644
--- a/src/test/ui/compile-fail-migration/enum-discrim-autosizing.stderr
+++ b/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
index 393a67be57f..393a67be57f 100644
--- a/src/test/ui/compile-fail-migration/enum-discrim-too-small.rs
+++ b/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
index 4c8ff52c12b..4c8ff52c12b 100644
--- a/src/test/ui/compile-fail-migration/enum-discrim-too-small.stderr
+++ b/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
index d66716c14c3..d66716c14c3 100644
--- a/src/test/ui/compile-fail-migration/enum-discrim-too-small2.rs
+++ b/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
index 536dbf64a9d..536dbf64a9d 100644
--- a/src/test/ui/compile-fail-migration/enum-discrim-too-small2.stderr
+++ b/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
index bc1bd03f2d6..bc1bd03f2d6 100644
--- a/src/test/ui/compile-fail-migration/enum-in-scope.rs
+++ b/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
index 1e8d5940495..1e8d5940495 100644
--- a/src/test/ui/compile-fail-migration/enum-in-scope.stderr
+++ b/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
index 582998a986d..582998a986d 100644
--- a/src/test/ui/enum-size-variance.rs
+++ b/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
index f6df65b1d9d..f6df65b1d9d 100644
--- a/src/test/ui/enum-size-variance.stderr
+++ b/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
index e6f473c8aac..e6f473c8aac 100644
--- a/src/test/ui/compile-fail-migration/enum-to-float-cast-2.rs
+++ b/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
index e8e6d8fbcfb..e8e6d8fbcfb 100644
--- a/src/test/ui/compile-fail-migration/enum-to-float-cast-2.stderr
+++ b/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
index b562ba0e41a..b562ba0e41a 100644
--- a/src/test/ui/compile-fail-migration/enum-to-float-cast.rs
+++ b/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
index adc2015909c..adc2015909c 100644
--- a/src/test/ui/compile-fail-migration/enum-to-float-cast.stderr
+++ b/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
index 258bfd1e3ba..258bfd1e3ba 100644
--- a/src/test/ui/compile-fail-migration/enum-variant-type-2.rs
+++ b/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
index 7a786af71bb..7a786af71bb 100644
--- a/src/test/ui/compile-fail-migration/enum-variant-type-2.stderr
+++ b/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
index 36bd54f599b..36bd54f599b 100644
--- a/src/test/ui/compile-fail-migration/enums-pats-not-idents.rs
+++ b/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
index 5bd119622e5..5bd119622e5 100644
--- a/src/test/ui/compile-fail-migration/enums-pats-not-idents.stderr
+++ b/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
index 8b1e2fc1966..8b1e2fc1966 100644
--- 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
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
index 704cd4f4838..704cd4f4838 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/estr-subtyping.rs b/src/test/ui/estr-subtyping.rs
index b5c6db0cea9..b5c6db0cea9 100644
--- a/src/test/ui/compile-fail-migration/estr-subtyping.rs
+++ b/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
index fcff9d0380e..fcff9d0380e 100644
--- a/src/test/ui/compile-fail-migration/estr-subtyping.stderr
+++ b/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
index ada038114d8..ada038114d8 100644
--- a/src/test/ui/compile-fail-migration/eval-enum.rs
+++ b/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
index f26c48f1a72..f26c48f1a72 100644
--- a/src/test/ui/compile-fail-migration/eval-enum.stderr
+++ b/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
index b4cb2469659..b4cb2469659 100644
--- a/src/test/ui/compile-fail-migration/exclusive-drop-and-copy.rs
+++ b/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
index 1c5e62e21a8..1c5e62e21a8 100644
--- a/src/test/ui/compile-fail-migration/exclusive-drop-and-copy.stderr
+++ b/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
index 69e5898ed4d..69e5898ed4d 100644
--- 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
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
index 6ccf7efbb88..6ccf7efbb88 100644
--- 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
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
index 9212ea86118..9212ea86118 100644
--- 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
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
index d1863cbfb6f..d1863cbfb6f 100644
--- 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
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
index d83305857ac..d83305857ac 100644
--- 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
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
index 21b2d0c5c57..21b2d0c5c57 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/expanded-cfg.rs b/src/test/ui/expanded-cfg.rs
index 77351f6e4f1..77351f6e4f1 100644
--- a/src/test/ui/compile-fail-migration/expanded-cfg.rs
+++ b/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
index d7bc47fad27..d7bc47fad27 100644
--- a/src/test/ui/compile-fail-migration/expanded-cfg.stderr
+++ b/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
index 90030488dd6..90030488dd6 100644
--- a/src/test/ui/compile-fail-migration/explicit-call-to-dtor.rs
+++ b/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
index 264d820042b..264d820042b 100644
--- a/src/test/ui/compile-fail-migration/explicit-call-to-dtor.stderr
+++ b/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
index 63ed74dfa49..63ed74dfa49 100644
--- a/src/test/ui/compile-fail-migration/explicit-call-to-supertrait-dtor.rs
+++ b/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
index 0d0ae629def..0d0ae629def 100644
--- a/src/test/ui/compile-fail-migration/explicit-call-to-supertrait-dtor.stderr
+++ b/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
index eac134ff3cc..eac134ff3cc 100644
--- a/src/test/ui/compile-fail-migration/explicit-self-lifetime-mismatch.rs
+++ b/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
index 6a22d20467b..6a22d20467b 100644
--- a/src/test/ui/compile-fail-migration/explicit-self-lifetime-mismatch.stderr
+++ b/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
index 19fa13f8377..19fa13f8377 100644
--- a/src/test/ui/compile-fail-migration/export-fully-qualified.rs
+++ b/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
index b8409929763..b8409929763 100644
--- a/src/test/ui/compile-fail-migration/export-fully-qualified.stderr
+++ b/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
index 3877250126d..3877250126d 100644
--- a/src/test/ui/compile-fail-migration/export-import.rs
+++ b/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
index 2f12485f123..2f12485f123 100644
--- a/src/test/ui/compile-fail-migration/export-import.stderr
+++ b/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
index b6e8cf71ddd..b6e8cf71ddd 100644
--- a/src/test/ui/compile-fail-migration/export-tag-variant.rs
+++ b/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
index da67e2c4199..da67e2c4199 100644
--- a/src/test/ui/compile-fail-migration/export-tag-variant.stderr
+++ b/src/test/ui/export-tag-variant.stderr
diff --git a/src/test/ui/compile-fail-migration/export.rs b/src/test/ui/export.rs
index c28ea70c752..c28ea70c752 100644
--- a/src/test/ui/compile-fail-migration/export.rs
+++ b/src/test/ui/export.rs
diff --git a/src/test/ui/compile-fail-migration/export.stderr b/src/test/ui/export.stderr
index dd19e83750b..dd19e83750b 100644
--- a/src/test/ui/compile-fail-migration/export.stderr
+++ b/src/test/ui/export.stderr
diff --git a/src/test/ui/compile-fail-migration/export2.rs b/src/test/ui/export2.rs
index dc96ce7f504..dc96ce7f504 100644
--- a/src/test/ui/compile-fail-migration/export2.rs
+++ b/src/test/ui/export2.rs
diff --git a/src/test/ui/compile-fail-migration/export2.stderr b/src/test/ui/export2.stderr
index c76afb8a1e2..c76afb8a1e2 100644
--- a/src/test/ui/compile-fail-migration/export2.stderr
+++ b/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
index 49b2fa0e350..49b2fa0e350 100644
--- a/src/test/ui/compile-fail-migration/expr_attr_paren_order.rs
+++ b/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
index 938ff51b37d..938ff51b37d 100644
--- a/src/test/ui/compile-fail-migration/expr_attr_paren_order.stderr
+++ b/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
index a5bf7960624..a5bf7960624 100644
--- a/src/test/ui/compile-fail-migration/ext-nonexistent.rs
+++ b/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
index ff027f18476..ff027f18476 100644
--- a/src/test/ui/compile-fail-migration/ext-nonexistent.stderr
+++ b/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
index c2362689721..c2362689721 100644
--- 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
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
index 4a10deb4bdd..4a10deb4bdd 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/extenv-no-args.rs b/src/test/ui/extenv/extenv-no-args.rs
index afa47dbe744..afa47dbe744 100644
--- a/src/test/ui/compile-fail-migration/extenv-no-args.rs
+++ b/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
index ebd97c014f1..ebd97c014f1 100644
--- a/src/test/ui/compile-fail-migration/extenv-no-args.stderr
+++ b/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
index 485b6c09f0a..485b6c09f0a 100644
--- a/src/test/ui/compile-fail-migration/extenv-not-defined-custom.rs
+++ b/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
index 845f87df916..845f87df916 100644
--- a/src/test/ui/compile-fail-migration/extenv-not-defined-custom.stderr
+++ b/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
index d99d4dc33a2..d99d4dc33a2 100644
--- a/src/test/ui/compile-fail-migration/extenv-not-defined-default.rs
+++ b/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
index 0db6f536edb..0db6f536edb 100644
--- a/src/test/ui/compile-fail-migration/extenv-not-defined-default.stderr
+++ b/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
index 07ce47a14d8..07ce47a14d8 100644
--- a/src/test/ui/compile-fail-migration/extenv-not-string-literal.rs
+++ b/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
index 1660d8665dc..1660d8665dc 100644
--- a/src/test/ui/compile-fail-migration/extenv-not-string-literal.stderr
+++ b/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
index c6c4f0ec6b8..c6c4f0ec6b8 100644
--- a/src/test/ui/compile-fail-migration/extenv-too-many-args.rs
+++ b/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
index e4eda9e9e9a..e4eda9e9e9a 100644
--- a/src/test/ui/compile-fail-migration/extenv-too-many-args.stderr
+++ b/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
index b61667cfd88..b61667cfd88 100644
--- a/src/test/ui/auxiliary/m1.rs
+++ b/src/test/ui/extern/auxiliary/m1.rs
diff --git a/src/test/ui/auxiliary/m2.rs b/src/test/ui/extern/auxiliary/m2.rs
index 94ff5e4497f..94ff5e4497f 100644
--- a/src/test/ui/auxiliary/m2.rs
+++ b/src/test/ui/extern/auxiliary/m2.rs
diff --git a/src/test/ui/extern-const.fixed b/src/test/ui/extern/extern-const.fixed
index 6e131ca41aa..6e131ca41aa 100644
--- a/src/test/ui/extern-const.fixed
+++ b/src/test/ui/extern/extern-const.fixed
diff --git a/src/test/ui/extern-const.rs b/src/test/ui/extern/extern-const.rs
index 4a766b9724d..4a766b9724d 100644
--- a/src/test/ui/extern-const.rs
+++ b/src/test/ui/extern/extern-const.rs
diff --git a/src/test/ui/extern-const.stderr b/src/test/ui/extern/extern-const.stderr
index cbed5e56c76..cbed5e56c76 100644
--- a/src/test/ui/extern-const.stderr
+++ b/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
index b58149fb0b8..b58149fb0b8 100644
--- a/src/test/ui/extern-crate-rename.rs
+++ b/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
index 2c2723fe4c5..2c2723fe4c5 100644
--- a/src/test/ui/extern-crate-rename.stderr
+++ b/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
index 6bb88e40910..6bb88e40910 100644
--- a/src/test/ui/compile-fail-migration/extern-crate-visibility.rs
+++ b/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
index cadb636bf0d..cadb636bf0d 100644
--- a/src/test/ui/compile-fail-migration/extern-crate-visibility.stderr
+++ b/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
index 4267103ab9a..4267103ab9a 100644
--- a/src/test/ui/compile-fail-migration/extern-macro.rs
+++ b/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
index 8918ac3143b..8918ac3143b 100644
--- a/src/test/ui/compile-fail-migration/extern-macro.stderr
+++ b/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
index d9bdb4ecd04..d9bdb4ecd04 100644
--- a/src/test/ui/compile-fail-migration/extern-main-fn.rs
+++ b/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
index 24e9d138693..24e9d138693 100644
--- a/src/test/ui/compile-fail-migration/extern-main-fn.stderr
+++ b/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
index 8b434bbfc6d..8b434bbfc6d 100644
--- a/src/test/ui/compile-fail-migration/extern-types-distinct-types.rs
+++ b/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
index 6c74f63744f..6c74f63744f 100644
--- a/src/test/ui/compile-fail-migration/extern-types-distinct-types.stderr
+++ b/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
index 10abb80a2f7..10abb80a2f7 100644
--- a/src/test/ui/compile-fail-migration/extern-types-not-sync-send.rs
+++ b/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
index f076aa0fd68..f076aa0fd68 100644
--- a/src/test/ui/compile-fail-migration/extern-types-not-sync-send.stderr
+++ b/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
index f2db4553868..f2db4553868 100644
--- a/src/test/ui/compile-fail-migration/extern-types-unsized.rs
+++ b/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
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::<A>();
    |     ^^^^^^^^^^^^^^^^^ 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
 note: required by `assert_sized`
   --> $DIR/extern-types-unsized.rs:29:1
    |
@@ -19,7 +19,7 @@ LL |     assert_sized::<Foo>();
    |     ^^^^^^^^^^^^^^^^^^^ 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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::<Bar<A>>();
    |     ^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
    |
    = help: within `Bar<A>`, the trait `std::marker::Sized` is not implemented for `A`
-   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = note: required because it appears within the type `Bar<A>`
 note: required by `assert_sized`
   --> $DIR/extern-types-unsized.rs:29:1
@@ -49,7 +49,7 @@ LL |     assert_sized::<Bar<Bar<A>>>();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
    |
    = help: within `Bar<Bar<A>>`, the trait `std::marker::Sized` is not implemented for `A`
-   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = note: required because it appears within the type `Bar<A>`
    = note: required because it appears within the type `Bar<Bar<A>>`
 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
index 9493a1ae892..9493a1ae892 100644
--- a/src/test/ui/compile-fail-migration/extern-with-type-bounds.rs
+++ b/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
index 4b62a12d36b..4b62a12d36b 100644
--- a/src/test/ui/compile-fail-migration/extern-with-type-bounds.stderr
+++ b/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
index 66b06c505e4..66b06c505e4 100644
--- a/src/test/ui/compile-fail-migration/extern-wrong-value-type.rs
+++ b/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
index 35e0d68e46a..35e0d68e46a 100644
--- a/src/test/ui/compile-fail-migration/extern-wrong-value-type.stderr
+++ b/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
index 1ae0d0bd276..1ae0d0bd276 100644
--- a/src/test/ui/compile-fail-migration/external-doc-error.rs
+++ b/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
index 0af15be39ea..0af15be39ea 100644
--- a/src/test/ui/compile-fail-migration/external-doc-error.stderr
+++ b/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
index fd56756584a..fd56756584a 100644
--- a/src/test/ui/compile-fail-migration/extoption_env-no-args.rs
+++ b/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
index d01aefe46b1..d01aefe46b1 100644
--- a/src/test/ui/compile-fail-migration/extoption_env-no-args.stderr
+++ b/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
index 6371a5c711d..6371a5c711d 100644
--- a/src/test/ui/compile-fail-migration/extoption_env-not-string-literal.rs
+++ b/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
index af4163259ea..af4163259ea 100644
--- a/src/test/ui/compile-fail-migration/extoption_env-not-string-literal.stderr
+++ b/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
index b31e857c14e..b31e857c14e 100644
--- a/src/test/ui/compile-fail-migration/extoption_env-too-many-args.rs
+++ b/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
index 0e4569d7a01..0e4569d7a01 100644
--- a/src/test/ui/compile-fail-migration/extoption_env-too-many-args.stderr
+++ b/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
index aed76e36fca..aed76e36fca 100644
--- a/src/test/ui/compile-fail-migration/fail-no-dead-code-core.rs
+++ b/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
index d2af77a28d3..d2af77a28d3 100644
--- a/src/test/ui/compile-fail-migration/fail-no-dead-code-core.stderr
+++ b/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
index 6e5d3a31355..6e5d3a31355 100644
--- a/src/test/ui/compile-fail-migration/fail-no-dead-code.rs
+++ b/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
index f355c7dd731..f355c7dd731 100644
--- a/src/test/ui/compile-fail-migration/fail-no-dead-code.stderr
+++ b/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
index a20ff864705..a20ff864705 100644
--- a/src/test/ui/compile-fail-migration/fail-simple.rs
+++ b/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
index 764f2c464bc..764f2c464bc 100644
--- a/src/test/ui/compile-fail-migration/fail-simple.stderr
+++ b/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
index ae342af4a52..ae342af4a52 100644
--- 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
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
index 41b3e3eaf10..41b3e3eaf10 100644
--- 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
diff --git a/src/test/ui/auxiliary/cfg-target-thread-local.rs b/src/test/ui/feature-gates/auxiliary/cfg-target-thread-local.rs
index d1971a5e1ae..d1971a5e1ae 100644
--- a/src/test/ui/auxiliary/cfg-target-thread-local.rs
+++ b/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
index 030e37475c0..030e37475c0 100644
--- a/src/test/ui/feature-gate-abi-msp430-interrupt.rs
+++ b/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
index 26babb8c3ff..26babb8c3ff 100644
--- a/src/test/ui/feature-gate-abi-msp430-interrupt.stderr
+++ b/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
index db008b83797..db008b83797 100644
--- a/src/test/ui/feature-gate-abi.rs
+++ b/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
index eb68391ba35..eb68391ba35 100644
--- a/src/test/ui/feature-gate-abi.stderr
+++ b/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
index 501f4451ed8..501f4451ed8 100644
--- a/src/test/ui/feature-gate-abi_unadjusted.rs
+++ b/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
index 467102d1847..467102d1847 100644
--- a/src/test/ui/feature-gate-abi_unadjusted.stderr
+++ b/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
index 66691af2d03..66691af2d03 100644
--- 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
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
index 255d5b06c17..255d5b06c17 100644
--- 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
diff --git a/src/test/ui/feature-gate-allocator_internals.rs b/src/test/ui/feature-gates/feature-gate-allocator_internals.rs
index b519a985ec5..b519a985ec5 100644
--- a/src/test/ui/feature-gate-allocator_internals.rs
+++ b/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
index a9667e8011a..a9667e8011a 100644
--- a/src/test/ui/feature-gate-allocator_internals.stderr
+++ b/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
index 590dc619f2f..590dc619f2f 100644
--- 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
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
index 97e41411854..97e41411854 100644
--- 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
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
index 9af501b1419..9af501b1419 100644
--- 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
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
index 2ecaaae89d1..2ecaaae89d1 100644
--- 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
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
index b186278ef8b..b186278ef8b 100644
--- a/src/test/ui/feature-gate-allow-internal-unstable-struct.rs
+++ b/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
index 4ff5162b0c0..4ff5162b0c0 100644
--- a/src/test/ui/feature-gate-allow-internal-unstable-struct.stderr
+++ b/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
index 61a362cb37f..61a362cb37f 100644
--- a/src/test/ui/feature-gate-allow-internal-unstable.rs
+++ b/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
index b691eed60d3..b691eed60d3 100644
--- a/src/test/ui/feature-gate-allow-internal-unstable.stderr
+++ b/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
index 11247402809..11247402809 100644
--- a/src/test/ui/feature-gate-allow_fail.rs
+++ b/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
index 3f8ad32437d..3f8ad32437d 100644
--- a/src/test/ui/feature-gate-allow_fail.stderr
+++ b/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
index ff0306f1993..ff0306f1993 100644
--- a/src/test/ui/feature-gate-arbitrary-self-types.rs
+++ b/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
index ea259aa22ad..ea259aa22ad 100644
--- a/src/test/ui/feature-gate-arbitrary-self-types.stderr
+++ b/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
index 29e51727edc..29e51727edc 100644
--- 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
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
index 5ed9a0f4ed0..5ed9a0f4ed0 100644
--- 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
diff --git a/src/test/ui/feature-gate-asm.rs b/src/test/ui/feature-gates/feature-gate-asm.rs
index 8d053bdae78..8d053bdae78 100644
--- a/src/test/ui/feature-gate-asm.rs
+++ b/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
index 3fab7c0ece5..3fab7c0ece5 100644
--- a/src/test/ui/feature-gate-asm.stderr
+++ b/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
index 222190de9fe..222190de9fe 100644
--- a/src/test/ui/feature-gate-asm2.rs
+++ b/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
index a0e881a3b99..a0e881a3b99 100644
--- a/src/test/ui/feature-gate-asm2.stderr
+++ b/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
index de3521eb0f2..de3521eb0f2 100644
--- a/src/test/ui/feature-gate-assoc-type-defaults.rs
+++ b/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
index 86431842a83..86431842a83 100644
--- a/src/test/ui/feature-gate-assoc-type-defaults.stderr
+++ b/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
index 5b865e9c1c7..5b865e9c1c7 100644
--- a/src/test/ui/feature-gate-async-await-2015-edition.rs
+++ b/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
index 3db90a48e90..3db90a48e90 100644
--- a/src/test/ui/feature-gate-async-await-2015-edition.stderr
+++ b/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
index be34842dea3..be34842dea3 100644
--- a/src/test/ui/feature-gate-async-await.rs
+++ b/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
index 79ed5c4d008..79ed5c4d008 100644
--- a/src/test/ui/feature-gate-async-await.stderr
+++ b/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
index 65d437d0c0d..65d437d0c0d 100644
--- a/src/test/ui/feature-gate-box-expr.rs
+++ b/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
index 7b235da7ed7..7b235da7ed7 100644
--- a/src/test/ui/feature-gate-box-expr.stderr
+++ b/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
index e64081823e7..e64081823e7 100644
--- a/src/test/ui/feature-gate-box_patterns.rs
+++ b/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
index a8edb842cfc..a8edb842cfc 100644
--- a/src/test/ui/feature-gate-box_patterns.stderr
+++ b/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
index a2643fe02b8..a2643fe02b8 100644
--- a/src/test/ui/feature-gate-box_syntax.rs
+++ b/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
index d45dee2970b..d45dee2970b 100644
--- a/src/test/ui/feature-gate-box_syntax.stderr
+++ b/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
index 5568a5cf0aa..5568a5cf0aa 100644
--- a/src/test/ui/feature-gate-catch_expr.rs
+++ b/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
index 4ab71460c0d..4ab71460c0d 100644
--- a/src/test/ui/feature-gate-catch_expr.stderr
+++ b/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
index aa27f8922c0..aa27f8922c0 100644
--- a/src/test/ui/feature-gate-cfg-target-has-atomic.rs
+++ b/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
index f3975b7ce8b..f3975b7ce8b 100644
--- a/src/test/ui/feature-gate-cfg-target-has-atomic.stderr
+++ b/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
index 985bd8320e0..985bd8320e0 100644
--- a/src/test/ui/feature-gate-cfg-target-thread-local.rs
+++ b/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
index 3467d4e482d..3467d4e482d 100644
--- a/src/test/ui/feature-gate-cfg-target-thread-local.stderr
+++ b/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
index e68a84d3553..e68a84d3553 100644
--- a/src/test/ui/feature-gate-cfg-target-vendor.rs
+++ b/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
index a625c7e4b24..a625c7e4b24 100644
--- a/src/test/ui/feature-gate-cfg-target-vendor.stderr
+++ b/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
index f9334f1d3b0..f9334f1d3b0 100644
--- a/src/test/ui/feature-gate-compiler-builtins.rs
+++ b/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
index 5330d83c284..5330d83c284 100644
--- a/src/test/ui/feature-gate-compiler-builtins.stderr
+++ b/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
index f4d97445725..f4d97445725 100644
--- a/src/test/ui/feature-gate-concat_idents.rs
+++ b/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
index 2f1e3fe6a7d..2f1e3fe6a7d 100644
--- a/src/test/ui/feature-gate-concat_idents.stderr
+++ b/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
index af288a97904..af288a97904 100644
--- a/src/test/ui/feature-gate-concat_idents2.rs
+++ b/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
index 9312a6f5b36..9312a6f5b36 100644
--- a/src/test/ui/feature-gate-concat_idents2.stderr
+++ b/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
index 5a9ffe98c93..5a9ffe98c93 100644
--- a/src/test/ui/feature-gate-concat_idents3.rs
+++ b/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
index 1a86032d8a3..1a86032d8a3 100644
--- a/src/test/ui/feature-gate-concat_idents3.stderr
+++ b/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
index c89cbd0420d..c89cbd0420d 100644
--- a/src/test/ui/feature-gate-const-indexing.rs
+++ b/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
index 1d1dedddaaa..1d1dedddaaa 100644
--- a/src/test/ui/feature-gate-const_fn.rs
+++ b/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
index d7c00a3e0cb..d7c00a3e0cb 100644
--- a/src/test/ui/feature-gate-const_fn.stderr
+++ b/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
index 05d02e62bc8..05d02e62bc8 100644
--- a/src/test/ui/feature-gate-const_let.rs
+++ b/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
index 6a7f6255678..6a7f6255678 100644
--- a/src/test/ui/feature-gate-const_let.stderr
+++ b/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
index 830ec5959b7..830ec5959b7 100644
--- a/src/test/ui/feature-gate-crate_in_paths.rs
+++ b/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
index 1d0eed53198..1d0eed53198 100644
--- a/src/test/ui/feature-gate-crate_in_paths.stderr
+++ b/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
index a2937d6de31..a2937d6de31 100644
--- a/src/test/ui/feature-gate-crate_visibility_modifier.rs
+++ b/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
index d0ee40504fb..d0ee40504fb 100644
--- a/src/test/ui/feature-gate-crate_visibility_modifier.stderr
+++ b/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
index b5428803517..b5428803517 100644
--- a/src/test/ui/feature-gate-custom_attribute.rs
+++ b/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
index 36f5898f1c7..36f5898f1c7 100644
--- a/src/test/ui/feature-gate-custom_attribute.stderr
+++ b/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
index 30fd89f091b..30fd89f091b 100644
--- a/src/test/ui/feature-gate-custom_attribute2.rs
+++ b/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
index 1c1f50366d6..1c1f50366d6 100644
--- a/src/test/ui/feature-gate-custom_attribute2.stderr
+++ b/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
index 0b1b3141f5b..0b1b3141f5b 100644
--- a/src/test/ui/feature-gate-custom_derive.rs
+++ b/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
index e633a5a9c99..e633a5a9c99 100644
--- a/src/test/ui/feature-gate-custom_derive.stderr
+++ b/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
index 4cb34c8274d..4cb34c8274d 100644
--- a/src/test/ui/feature-gate-decl_macro.rs
+++ b/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
index 56c0dea0236..56c0dea0236 100644
--- a/src/test/ui/feature-gate-decl_macro.stderr
+++ b/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
index ccc5ec49f13..ccc5ec49f13 100644
--- a/src/test/ui/feature-gate-default_type_parameter_fallback.rs
+++ b/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
index 134bf29d2aa..134bf29d2aa 100644
--- a/src/test/ui/feature-gate-default_type_parameter_fallback.stderr
+++ b/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
index 1503dfe81fb..1503dfe81fb 100644
--- a/src/test/ui/feature-gate-doc_alias.rs
+++ b/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
index a987e03c0aa..a987e03c0aa 100644
--- a/src/test/ui/feature-gate-doc_alias.stderr
+++ b/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
index 1a77d918014..1a77d918014 100644
--- a/src/test/ui/feature-gate-doc_cfg.rs
+++ b/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
index 5839e1dd611..5839e1dd611 100644
--- a/src/test/ui/feature-gate-doc_cfg.stderr
+++ b/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
index 2ff44626ccd..2ff44626ccd 100644
--- a/src/test/ui/feature-gate-doc_keyword.rs
+++ b/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
index e4f5109afc3..e4f5109afc3 100644
--- a/src/test/ui/feature-gate-doc_keyword.stderr
+++ b/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
index bb5be9d6971..bb5be9d6971 100644
--- a/src/test/ui/feature-gate-doc_masked.rs
+++ b/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
index 043397efde2..043397efde2 100644
--- a/src/test/ui/feature-gate-doc_masked.stderr
+++ b/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
index 6369358538d..6369358538d 100644
--- a/src/test/ui/feature-gate-doc_spotlight.rs
+++ b/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
index 98e7f38a441..98e7f38a441 100644
--- a/src/test/ui/feature-gate-doc_spotlight.stderr
+++ b/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
index 70ec561439c..70ec561439c 100644
--- a/src/test/ui/feature-gate-dropck-ugeh-2.rs
+++ b/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
index 80d81ea03cb..80d81ea03cb 100644
--- a/src/test/ui/feature-gate-dropck-ugeh-2.stderr
+++ b/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
index 360895d30b0..360895d30b0 100644
--- a/src/test/ui/feature-gate-dropck-ugeh.rs
+++ b/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
index 33bb5f2d989..33bb5f2d989 100644
--- a/src/test/ui/feature-gate-dropck-ugeh.stderr
+++ b/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
index e0b6d5986ff..e0b6d5986ff 100644
--- a/src/test/ui/feature-gate-exclusive-range-pattern.rs
+++ b/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
index 27fd49edcc6..27fd49edcc6 100644
--- a/src/test/ui/feature-gate-exclusive-range-pattern.stderr
+++ b/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
index c83d9b56bc3..c83d9b56bc3 100644
--- a/src/test/ui/feature-gate-exhaustive-patterns.rs
+++ b/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
index 4afe5b5d5e0..4afe5b5d5e0 100644
--- a/src/test/ui/feature-gate-exhaustive-patterns.stderr
+++ b/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
index b35a3916377..b35a3916377 100644
--- a/src/test/ui/feature-gate-existential-type.rs
+++ b/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
index 6db5fa2ce6b..6db5fa2ce6b 100644
--- a/src/test/ui/feature-gate-existential-type.stderr
+++ b/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
index 40fdbf0bbdb..40fdbf0bbdb 100644
--- a/src/test/ui/feature-gate-extern_absolute_paths.rs
+++ b/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
index 7a996abc767..7a996abc767 100644
--- a/src/test/ui/feature-gate-extern_absolute_paths.stderr
+++ b/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
index 3c01fcf6833..3c01fcf6833 100644
--- a/src/test/ui/feature-gate-extern_in_paths.rs
+++ b/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
index 535ed94565c..535ed94565c 100644
--- a/src/test/ui/feature-gate-extern_in_paths.stderr
+++ b/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
index 8d3a30305bd..8d3a30305bd 100644
--- a/src/test/ui/feature-gate-extern_prelude.rs
+++ b/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
index 5abf369baf9..5abf369baf9 100644
--- a/src/test/ui/feature-gate-extern_prelude.stderr
+++ b/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
index 1203b598df3..1203b598df3 100644
--- a/src/test/ui/feature-gate-extern_types.rs
+++ b/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
index 47c74bda177..47c74bda177 100644
--- a/src/test/ui/feature-gate-extern_types.stderr
+++ b/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
index fa0a2a29078..fa0a2a29078 100644
--- a/src/test/ui/feature-gate-external_doc.rs
+++ b/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
index 272380f2336..272380f2336 100644
--- a/src/test/ui/feature-gate-external_doc.stderr
+++ b/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
index b903b29658b..b903b29658b 100644
--- a/src/test/ui/feature-gate-feature-gate.rs
+++ b/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
index 256cf47c120..256cf47c120 100644
--- a/src/test/ui/feature-gate-feature-gate.stderr
+++ b/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
index b976d57f9c1..b976d57f9c1 100644
--- a/src/test/ui/feature-gate-format_args_nl.rs
+++ b/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
index a79535641a6..a79535641a6 100644
--- a/src/test/ui/feature-gate-format_args_nl.stderr
+++ b/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
index 18718a0d0be..18718a0d0be 100644
--- a/src/test/ui/feature-gate-fundamental.rs
+++ b/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
index ac8430d7c1c..ac8430d7c1c 100644
--- a/src/test/ui/feature-gate-fundamental.stderr
+++ b/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
index 3754f92d8cd..3754f92d8cd 100644
--- a/src/test/ui/feature-gate-generators.rs
+++ b/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
index 0c2337e27a7..0c2337e27a7 100644
--- a/src/test/ui/feature-gate-generators.stderr
+++ b/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
index 34706626866..34706626866 100644
--- a/src/test/ui/feature-gate-generic_associated_types.rs
+++ b/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
index d7891f13c6b..d7891f13c6b 100644
--- a/src/test/ui/feature-gate-generic_associated_types.stderr
+++ b/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
index 77f61ba47b0..77f61ba47b0 100644
--- a/src/test/ui/feature-gate-global_asm.rs
+++ b/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
index 2219d49a263..2219d49a263 100644
--- a/src/test/ui/feature-gate-global_asm.stderr
+++ b/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
index 3df140c77fc..3df140c77fc 100644
--- a/src/test/ui/feature-gate-if_while_or_patterns.rs
+++ b/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
index 909046812d3..909046812d3 100644
--- a/src/test/ui/feature-gate-if_while_or_patterns.stderr
+++ b/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
index b7e07e1dca6..b7e07e1dca6 100644
--- 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
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
index 9487d11d505..9487d11d505 100644
--- 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
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
index 3eb2ac1b008..3eb2ac1b008 100644
--- a/src/test/ui/feature-gate-impl_header_lifetime_elision.rs
+++ b/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
index 2c8a7dd4305..2c8a7dd4305 100644
--- a/src/test/ui/feature-gate-impl_header_lifetime_elision.stderr
+++ b/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
index 23b30711cf3..23b30711cf3 100644
--- a/src/test/ui/feature-gate-in_band_lifetimes.rs
+++ b/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
index 5fe143959d2..5fe143959d2 100644
--- a/src/test/ui/feature-gate-in_band_lifetimes.stderr
+++ b/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
index 01ccc50a130..01ccc50a130 100644
--- a/src/test/ui/feature-gate-infer_outlives_requirements.rs
+++ b/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
index 560e494b582..560e494b582 100644
--- a/src/test/ui/feature-gate-infer_outlives_requirements.stderr
+++ b/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
index 7b68449859e..7b68449859e 100644
--- a/src/test/ui/feature-gate-infer_static_outlives_requirements.rs
+++ b/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
index 13022b901a7..13022b901a7 100644
--- a/src/test/ui/feature-gate-infer_static_outlives_requirements.stderr
+++ b/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
index a4c09b21c90..a4c09b21c90 100644
--- a/src/test/ui/feature-gate-intrinsics.rs
+++ b/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
index e583569cb99..e583569cb99 100644
--- a/src/test/ui/feature-gate-intrinsics.stderr
+++ b/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
index dcda7580bda..dcda7580bda 100644
--- a/src/test/ui/feature-gate-label_break_value.rs
+++ b/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
index 8e8f31e7871..8e8f31e7871 100644
--- a/src/test/ui/feature-gate-label_break_value.stderr
+++ b/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
index 0435ff4c332..0435ff4c332 100644
--- a/src/test/ui/feature-gate-lang-items.rs
+++ b/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
index ef3e7947280..ef3e7947280 100644
--- a/src/test/ui/feature-gate-lang-items.stderr
+++ b/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
index bd48ac673dd..bd48ac673dd 100644
--- a/src/test/ui/feature-gate-link_args.rs
+++ b/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
index 86a2818b344..86a2818b344 100644
--- a/src/test/ui/feature-gate-link_args.stderr
+++ b/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
index 27918a27caf..27918a27caf 100644
--- a/src/test/ui/feature-gate-link_cfg.rs
+++ b/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
index 1da8c3e922d..1da8c3e922d 100644
--- a/src/test/ui/feature-gate-link_cfg.stderr
+++ b/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
index 92a1b071437..92a1b071437 100644
--- a/src/test/ui/feature-gate-link_llvm_intrinsics.rs
+++ b/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
index 7a9c5955958..7a9c5955958 100644
--- a/src/test/ui/feature-gate-link_llvm_intrinsics.stderr
+++ b/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
index 555cc2b9a7a..555cc2b9a7a 100644
--- a/src/test/ui/feature-gate-linkage.rs
+++ b/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
index 2fc1a3e1ae5..2fc1a3e1ae5 100644
--- a/src/test/ui/feature-gate-linkage.stderr
+++ b/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
index 955ec39cda1..955ec39cda1 100644
--- a/src/test/ui/feature-gate-linker-flavor.rs
+++ b/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
index b8bccece292..b8bccece292 100644
--- a/src/test/ui/feature-gate-linker-flavor.stderr
+++ b/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
index 63c66e53c5e..63c66e53c5e 100644
--- a/src/test/ui/feature-gate-log_syntax.rs
+++ b/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
index d9934be778e..d9934be778e 100644
--- a/src/test/ui/feature-gate-log_syntax.stderr
+++ b/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
index dcbe7eefee5..dcbe7eefee5 100644
--- a/src/test/ui/feature-gate-log_syntax2.rs
+++ b/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
index 19e7de1a824..19e7de1a824 100644
--- a/src/test/ui/feature-gate-log_syntax2.stderr
+++ b/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
index db5cca193ab..db5cca193ab 100644
--- a/src/test/ui/feature-gate-macro-literal-matcher.rs
+++ b/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
index f714b916966..f714b916966 100644
--- a/src/test/ui/feature-gate-macro-literal-matcher.stderr
+++ b/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
index 5d6f2acea83..5d6f2acea83 100644
--- a/src/test/ui/feature-gate-macro-vis-matcher.rs
+++ b/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
index 9d98091674e..9d98091674e 100644
--- a/src/test/ui/feature-gate-macro-vis-matcher.stderr
+++ b/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
index 77080e3c348..77080e3c348 100644
--- a/src/test/ui/feature-gate-macros_in_extern.rs
+++ b/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
index 23b63078dbf..23b63078dbf 100644
--- a/src/test/ui/feature-gate-macros_in_extern.stderr
+++ b/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
index db1c1a94417..db1c1a94417 100644
--- a/src/test/ui/feature-gate-main.rs
+++ b/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
index 34c9fd15f7c..34c9fd15f7c 100644
--- a/src/test/ui/feature-gate-main.stderr
+++ b/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
index a67ece04488..a67ece04488 100644
--- a/src/test/ui/feature-gate-may-dangle.rs
+++ b/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
index aad725dfe65..aad725dfe65 100644
--- a/src/test/ui/feature-gate-may-dangle.stderr
+++ b/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
index ceb475e1192..ceb475e1192 100644
--- a/src/test/ui/feature-gate-naked_functions.rs
+++ b/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
index a2d3dfc83ae..a2d3dfc83ae 100644
--- a/src/test/ui/feature-gate-naked_functions.stderr
+++ b/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
index 1809564f5de..1809564f5de 100644
--- a/src/test/ui/feature-gate-needs-allocator.rs
+++ b/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
index 13665b2a0eb..13665b2a0eb 100644
--- a/src/test/ui/feature-gate-needs-allocator.stderr
+++ b/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
index 599e31341f2..599e31341f2 100644
--- a/src/test/ui/feature-gate-negate-unsigned.rs
+++ b/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
index 85e9b56e4af..85e9b56e4af 100644
--- a/src/test/ui/feature-gate-negate-unsigned.stderr
+++ b/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
index ebbe17a821f..ebbe17a821f 100644
--- a/src/test/ui/feature-gate-never_type.rs
+++ b/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
index 187be6d8291..187be6d8291 100644
--- a/src/test/ui/feature-gate-never_type.stderr
+++ b/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
index 81de0d14aa7..81de0d14aa7 100644
--- a/src/test/ui/feature-gate-nll.nll.stderr
+++ b/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
index 752b1fa821f..752b1fa821f 100644
--- a/src/test/ui/feature-gate-nll.rs
+++ b/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
index f7b431d19be..f7b431d19be 100644
--- a/src/test/ui/feature-gate-nll.stderr
+++ b/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
index b663c136ee5..b663c136ee5 100644
--- a/src/test/ui/feature-gate-no-debug-2.rs
+++ b/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
index 183feae2232..183feae2232 100644
--- a/src/test/ui/feature-gate-no-debug-2.stderr
+++ b/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
index d21493de50a..d21493de50a 100644
--- a/src/test/ui/feature-gate-no-debug.rs
+++ b/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
index 55fad0d99cf..55fad0d99cf 100644
--- a/src/test/ui/feature-gate-no-debug.stderr
+++ b/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
index 0a55a8a78ce..0a55a8a78ce 100644
--- a/src/test/ui/feature-gate-no_core.rs
+++ b/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
index c8813dcd991..c8813dcd991 100644
--- a/src/test/ui/feature-gate-no_core.stderr
+++ b/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
index 9e042c3a7d5..9e042c3a7d5 100644
--- a/src/test/ui/feature-gate-non_ascii_idents.rs
+++ b/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
index a2853570d6d..a2853570d6d 100644
--- a/src/test/ui/feature-gate-non_ascii_idents.stderr
+++ b/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
index d2711084a4d..d2711084a4d 100644
--- a/src/test/ui/feature-gate-non_exhaustive.rs
+++ b/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
index 67f103d852a..67f103d852a 100644
--- a/src/test/ui/feature-gate-non_exhaustive.stderr
+++ b/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
index a837a7f213e..a837a7f213e 100644
--- 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
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
index 253811400ef..253811400ef 100644
--- 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
diff --git a/src/test/ui/feature-gate-on-unimplemented.rs b/src/test/ui/feature-gates/feature-gate-on-unimplemented.rs
index 5d32bba6a76..5d32bba6a76 100644
--- a/src/test/ui/feature-gate-on-unimplemented.rs
+++ b/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
index a059f5e3c4d..a059f5e3c4d 100644
--- a/src/test/ui/feature-gate-on-unimplemented.stderr
+++ b/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
index ab3313af16d..ab3313af16d 100644
--- a/src/test/ui/feature-gate-optin-builtin-traits.rs
+++ b/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
index 8bd07ffd122..8bd07ffd122 100644
--- a/src/test/ui/feature-gate-optin-builtin-traits.stderr
+++ b/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
index d2aa4e59b5b..d2aa4e59b5b 100644
--- a/src/test/ui/feature-gate-overlapping_marker_traits.rs
+++ b/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
index 040ad019b9f..040ad019b9f 100644
--- a/src/test/ui/feature-gate-overlapping_marker_traits.stderr
+++ b/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
index ae9fbc7b13b..ae9fbc7b13b 100644
--- a/src/test/ui/compile-fail-migration/feature-gate-panic-implementation.rs
+++ b/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
index f99228bef1d..f99228bef1d 100644
--- a/src/test/ui/compile-fail-migration/feature-gate-panic-implementation.stderr
+++ b/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
index 29768018f0e..29768018f0e 100644
--- a/src/test/ui/feature-gate-pattern_parentheses.rs
+++ b/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
index 4268d27ebec..4268d27ebec 100644
--- a/src/test/ui/feature-gate-pattern_parentheses.stderr
+++ b/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
index 3b5d7626ce3..3b5d7626ce3 100644
--- a/src/test/ui/feature-gate-plugin.rs
+++ b/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
index 366e293c182..366e293c182 100644
--- a/src/test/ui/feature-gate-plugin.stderr
+++ b/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
index 9cdebde7b7b..9cdebde7b7b 100644
--- a/src/test/ui/feature-gate-plugin_registrar.rs
+++ b/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
index 3e6ffb6ef1a..3e6ffb6ef1a 100644
--- a/src/test/ui/feature-gate-plugin_registrar.stderr
+++ b/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
index 8bc3df247ec..8bc3df247ec 100644
--- a/src/test/ui/feature-gate-prelude_import.rs
+++ b/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
index 6841df54067..6841df54067 100644
--- a/src/test/ui/feature-gate-prelude_import.stderr
+++ b/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
index c6b2cb2eb07..c6b2cb2eb07 100644
--- a/src/test/ui/feature-gate-profiler-runtime.rs
+++ b/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
index dd395742b4f..dd395742b4f 100644
--- a/src/test/ui/feature-gate-profiler-runtime.stderr
+++ b/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
index 38024feb432..38024feb432 100644
--- a/src/test/ui/feature-gate-raw-identifiers.rs
+++ b/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
index 02eff7247c4..02eff7247c4 100644
--- a/src/test/ui/feature-gate-raw-identifiers.stderr
+++ b/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
index 429cec7ec90..429cec7ec90 100644
--- a/src/test/ui/feature-gate-repr-simd.rs
+++ b/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
index 8174f82060a..8174f82060a 100644
--- a/src/test/ui/feature-gate-repr-simd.stderr
+++ b/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
index f5753f1c7fb..f5753f1c7fb 100644
--- a/src/test/ui/feature-gate-repr128.rs
+++ b/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
index 29cba831f54..29cba831f54 100644
--- a/src/test/ui/feature-gate-repr128.stderr
+++ b/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
index 12bb152b467..12bb152b467 100644
--- a/src/test/ui/feature-gate-repr_packed.rs
+++ b/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
index d0faf9d90bd..d0faf9d90bd 100644
--- a/src/test/ui/feature-gate-repr_packed.stderr
+++ b/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
index 99bc51b69c6..99bc51b69c6 100644
--- a/src/test/ui/feature-gate-rustc-attrs.rs
+++ b/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
index 52a4d3664ce..52a4d3664ce 100644
--- a/src/test/ui/feature-gate-rustc-attrs.stderr
+++ b/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
index bbdf248780f..bbdf248780f 100644
--- a/src/test/ui/feature-gate-rustc-diagnostic-macros.rs
+++ b/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
index 70b66db6083..70b66db6083 100644
--- a/src/test/ui/feature-gate-rustc-diagnostic-macros.stderr
+++ b/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
index 38a3e15fd7e..38a3e15fd7e 100644
--- a/src/test/ui/feature-gate-rustc_const_unstable.rs
+++ b/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
index fa3f9807a04..fa3f9807a04 100644
--- a/src/test/ui/feature-gate-rustc_const_unstable.stderr
+++ b/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
index a18641d8246..a18641d8246 100644
--- a/src/test/ui/feature-gate-sanitizer-runtime.rs
+++ b/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
index fc93e103005..fc93e103005 100644
--- a/src/test/ui/feature-gate-sanitizer-runtime.stderr
+++ b/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
index a603658d316..a603658d316 100644
--- a/src/test/ui/feature-gate-simd-ffi.rs
+++ b/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
index f7b17aa4e6a..f7b17aa4e6a 100644
--- a/src/test/ui/feature-gate-simd-ffi.stderr
+++ b/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
index 025eaca5533..025eaca5533 100644
--- a/src/test/ui/feature-gate-simd.rs
+++ b/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
index 414a5d9eb5d..414a5d9eb5d 100644
--- a/src/test/ui/feature-gate-simd.stderr
+++ b/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
index fd058f65172..fd058f65172 100644
--- a/src/test/ui/feature-gate-slice-patterns.rs
+++ b/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
index d560dcd54ee..d560dcd54ee 100644
--- a/src/test/ui/feature-gate-slice-patterns.stderr
+++ b/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
index 014a0aaaf68..014a0aaaf68 100644
--- a/src/test/ui/feature-gate-staged_api.rs
+++ b/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
index 7b395ffb74b..7b395ffb74b 100644
--- a/src/test/ui/feature-gate-staged_api.stderr
+++ b/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
index 7a0924d8adf..7a0924d8adf 100644
--- a/src/test/ui/feature-gate-start.rs
+++ b/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
index cf590d2a0e3..cf590d2a0e3 100644
--- a/src/test/ui/feature-gate-start.stderr
+++ b/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
index 0d13a4937c4..0d13a4937c4 100644
--- a/src/test/ui/feature-gate-static-nobundle.rs
+++ b/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
index fd9f2b371f6..fd9f2b371f6 100644
--- a/src/test/ui/feature-gate-static-nobundle.stderr
+++ b/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
index 55706938ae8..55706938ae8 100644
--- a/src/test/ui/feature-gate-stmt_expr_attributes.rs
+++ b/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
index ad5c263403d..ad5c263403d 100644
--- a/src/test/ui/feature-gate-stmt_expr_attributes.stderr
+++ b/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
index f355c6562c8..f355c6562c8 100644
--- a/src/test/ui/feature-gate-thread_local.rs
+++ b/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
index 9b44c3f9590..9b44c3f9590 100644
--- a/src/test/ui/feature-gate-thread_local.stderr
+++ b/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
index 47c623574ec..47c623574ec 100644
--- a/src/test/ui/feature-gate-tool_attributes.rs
+++ b/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
index ebc266e004e..ebc266e004e 100644
--- a/src/test/ui/feature-gate-tool_attributes.stderr
+++ b/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
index c311eb7ed7a..c311eb7ed7a 100644
--- a/src/test/ui/compile-fail-migration/feature-gate-tool_lints.rs
+++ b/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
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
index 3ef67982be9..3ef67982be9 100644
--- a/src/test/ui/feature-gate-tool_lints.rs
+++ b/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
index 8019b1e6a28..8019b1e6a28 100644
--- a/src/test/ui/feature-gate-tool_lints.stderr
+++ b/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
index 367ee6df50d..367ee6df50d 100644
--- a/src/test/ui/feature-gate-trace_macros.rs
+++ b/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
index a31f618bbbe..a31f618bbbe 100644
--- a/src/test/ui/feature-gate-trace_macros.stderr
+++ b/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
index 2d2d491bd4d..2d2d491bd4d 100644
--- a/src/test/ui/feature-gate-trivial_bounds-lint.rs
+++ b/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
index dba66e0b69b..dba66e0b69b 100644
--- a/src/test/ui/feature-gate-trivial_bounds.rs
+++ b/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
index f20c1ebb37a..f20c1ebb37a 100644
--- a/src/test/ui/feature-gate-trivial_bounds.stderr
+++ b/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
index 9322dbd272f..9322dbd272f 100644
--- a/src/test/ui/feature-gate-try_reserve.rs
+++ b/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
index 928d266b37a..928d266b37a 100644
--- a/src/test/ui/feature-gate-try_reserve.stderr
+++ b/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
index d3c07d653f4..d3c07d653f4 100644
--- a/src/test/ui/feature-gate-type_ascription.rs
+++ b/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
index 2bd475b68b2..2bd475b68b2 100644
--- a/src/test/ui/feature-gate-type_ascription.stderr
+++ b/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
index 5df309321d3..5df309321d3 100644
--- a/src/test/ui/feature-gate-unboxed-closures-manual-impls.rs
+++ b/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
index 6dfcdfc2567..6dfcdfc2567 100644
--- a/src/test/ui/feature-gate-unboxed-closures-manual-impls.stderr
+++ b/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
index 253d1633b1c..253d1633b1c 100644
--- a/src/test/ui/feature-gate-unboxed-closures-method-calls.rs
+++ b/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
index cc8615d3620..cc8615d3620 100644
--- a/src/test/ui/feature-gate-unboxed-closures-method-calls.stderr
+++ b/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
index 902b3c1774c..902b3c1774c 100644
--- a/src/test/ui/feature-gate-unboxed-closures-ufcs-calls.rs
+++ b/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
index 26dd983e877..26dd983e877 100644
--- a/src/test/ui/feature-gate-unboxed-closures-ufcs-calls.stderr
+++ b/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
index 40050217744..40050217744 100644
--- a/src/test/ui/feature-gate-unboxed-closures.rs
+++ b/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
index a5b1ed9bbc4..a5b1ed9bbc4 100644
--- a/src/test/ui/feature-gate-unboxed-closures.stderr
+++ b/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
index ceb8afe124a..ceb8afe124a 100644
--- a/src/test/ui/feature-gate-underscore-imports.rs
+++ b/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
index 2eea95260d5..2eea95260d5 100644
--- a/src/test/ui/feature-gate-underscore-imports.stderr
+++ b/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
index 8a43e75494d..8a43e75494d 100644
--- a/src/test/ui/feature-gate-unsized_tuple_coercion.rs
+++ b/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
index 08c15855a6a..08c15855a6a 100644
--- a/src/test/ui/feature-gate-unsized_tuple_coercion.stderr
+++ b/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
index 6533fddd947..6533fddd947 100644
--- a/src/test/ui/feature-gate-untagged_unions.rs
+++ b/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
index e0c845b7768..e0c845b7768 100644
--- a/src/test/ui/feature-gate-untagged_unions.stderr
+++ b/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
index 681842e30e0..681842e30e0 100644
--- a/src/test/ui/feature-gate-unwind-attributes.rs
+++ b/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
index 4c6e6f420de..4c6e6f420de 100644
--- a/src/test/ui/feature-gate-unwind-attributes.stderr
+++ b/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
index 68679d7dac8..68679d7dac8 100644
--- a/src/test/ui/feature-gate-used.rs
+++ b/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
index d650b5ebb3b..d650b5ebb3b 100644
--- a/src/test/ui/feature-gate-used.stderr
+++ b/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
index 7bcddbb6a2f..7bcddbb6a2f 100644
--- 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
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
index 2b23962a304..2b23962a304 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/float-literal-inference-restrictions.rs b/src/test/ui/float-literal-inference-restrictions.rs
index 1e58df69f16..1e58df69f16 100644
--- a/src/test/ui/compile-fail-migration/float-literal-inference-restrictions.rs
+++ b/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
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
index c5c355cfbce..c5c355cfbce 100644
--- a/src/test/ui/compile-fail-migration/fn-bad-block-type.rs
+++ b/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
index 23d76e54531..23d76e54531 100644
--- a/src/test/ui/compile-fail-migration/fn-bad-block-type.stderr
+++ b/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
index ff06256088f..ff06256088f 100644
--- a/src/test/ui/fn-closure-mutable-capture.nll.stderr
+++ b/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
index 385efebd590..385efebd590 100644
--- a/src/test/ui/fn-closure-mutable-capture.rs
+++ b/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
index a58d663dc0a..a58d663dc0a 100644
--- a/src/test/ui/fn-closure-mutable-capture.stderr
+++ b/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
index 27be1ada445..27be1ada445 100644
--- a/src/test/ui/compile-fail-migration/fn-compare-mismatch.rs
+++ b/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
index 995a17e01bf..995a17e01bf 100644
--- a/src/test/ui/compile-fail-migration/fn-compare-mismatch.stderr
+++ b/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
index 6217a9f16b9..6217a9f16b9 100644
--- a/src/test/ui/compile-fail-migration/fn-item-type.rs
+++ b/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
index 59dd4b294aa..59dd4b294aa 100644
--- a/src/test/ui/compile-fail-migration/fn-item-type.stderr
+++ b/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
index 56d64d77ee2..56d64d77ee2 100644
--- a/src/test/ui/compile-fail-migration/fn-trait-formatting.rs
+++ b/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
index 5bf1ed76d5f..5bf1ed76d5f 100644
--- a/src/test/ui/compile-fail-migration/fn-trait-formatting.stderr
+++ b/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
index 011886e8073..011886e8073 100644
--- a/src/test/ui/for-c-in-str.rs
+++ b/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
index b249df3b4ef..b249df3b4ef 100644
--- a/src/test/ui/for-c-in-str.stderr
+++ b/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
index 7e9d4df005d..7e9d4df005d 100644
--- a/src/test/ui/compile-fail-migration/for-expn.rs
+++ b/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
index 14c2c1a6d3d..14c2c1a6d3d 100644
--- a/src/test/ui/compile-fail-migration/for-expn.stderr
+++ b/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
index 96ad184fd35..96ad184fd35 100644
--- a/src/test/ui/compile-fail-migration/for-loop-bogosity.rs
+++ b/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
index 0476ec06c70..0476ec06c70 100644
--- a/src/test/ui/compile-fail-migration/for-loop-bogosity.stderr
+++ b/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
index 81c4db68628..81c4db68628 100644
--- 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
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
index b76c2ffc240..b76c2ffc240 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/for-loop-type-error.rs b/src/test/ui/for/for-loop-type-error.rs
index 7f0e40128f5..7f0e40128f5 100644
--- a/src/test/ui/compile-fail-migration/for-loop-type-error.rs
+++ b/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
index f80a457dce3..f80a457dce3 100644
--- a/src/test/ui/compile-fail-migration/for-loop-type-error.stderr
+++ b/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
index fb5553166ba..fb5553166ba 100644
--- a/src/test/ui/compile-fail-migration/for-loop-unconstrained-element-type.rs
+++ b/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
index c3723c52fda..c3723c52fda 100644
--- a/src/test/ui/compile-fail-migration/for-loop-unconstrained-element-type.stderr
+++ b/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
index da77066150c..da77066150c 100644
--- a/src/test/ui/compile-fail-migration/foreign-fn-return-lifetime.rs
+++ b/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
index ea15897b3d6..ea15897b3d6 100644
--- a/src/test/ui/compile-fail-migration/foreign-fn-return-lifetime.stderr
+++ b/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
index 5fad4c3677c..5fad4c3677c 100644
--- a/src/test/ui/compile-fail-migration/foreign-unsafe-fn-called.rs
+++ b/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
index 498dd04e08f..498dd04e08f 100644
--- a/src/test/ui/compile-fail-migration/foreign-unsafe-fn-called.stderr
+++ b/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
index 1a7ceb2e763..1a7ceb2e763 100644
--- a/src/test/ui/compile-fail-migration/fully-qualified-type-name1.rs
+++ b/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
index 55553c084c9..55553c084c9 100644
--- a/src/test/ui/compile-fail-migration/fully-qualified-type-name1.stderr
+++ b/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
index 9ba8a11d536..9ba8a11d536 100644
--- a/src/test/ui/compile-fail-migration/fully-qualified-type-name2.rs
+++ b/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
index f2881894b0a..f2881894b0a 100644
--- a/src/test/ui/compile-fail-migration/fully-qualified-type-name2.stderr
+++ b/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
index dc0c9a093ff..dc0c9a093ff 100644
--- a/src/test/ui/compile-fail-migration/fully-qualified-type-name3.rs
+++ b/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
index 3c8fde751f1..3c8fde751f1 100644
--- a/src/test/ui/compile-fail-migration/fully-qualified-type-name4.rs
+++ b/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
index eb855484468..eb855484468 100644
--- a/src/test/ui/compile-fail-migration/fully-qualified-type-name4.stderr
+++ b/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
index 832b570512a..832b570512a 100644
--- 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
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
index 7ce32bbc975..7ce32bbc975 100644
--- a/src/test/ui/compile-fail-migration/functional-struct-update-noncopyable.rs
+++ b/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
index ad4fb97ae09..ad4fb97ae09 100644
--- a/src/test/ui/compile-fail-migration/functional-struct-update-noncopyable.stderr
+++ b/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
index 3f41401eb69..3f41401eb69 100644
--- 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
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
index 35a2f8460b6..35a2f8460b6 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/future-incompatible-lint-group.rs b/src/test/ui/future-incompatible-lint-group.rs
index 5f320135edf..5f320135edf 100644
--- a/src/test/ui/compile-fail-migration/future-incompatible-lint-group.rs
+++ b/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
index 56f4ff33eb2..56f4ff33eb2 100644
--- a/src/test/ui/compile-fail-migration/future-incompatible-lint-group.stderr
+++ b/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
index 8d36745116b..8d36745116b 100644
--- a/src/test/ui/compile-fail-migration/gated-attr-literals.rs
+++ b/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
index 5baafd41531..5baafd41531 100644
--- a/src/test/ui/compile-fail-migration/gated-bad-feature.rs
+++ b/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
index 2bed241d68c..2bed241d68c 100644
--- a/src/test/ui/compile-fail-migration/gated-bad-feature.stderr
+++ b/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
index 13abdf616b2..13abdf616b2 100644
--- a/src/test/ui/compile-fail-migration/generator-yielding-or-returning-itself.rs
+++ b/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
index a52e717ebae..a52e717ebae 100644
--- a/src/test/ui/compile-fail-migration/generator-yielding-or-returning-itself.stderr
+++ b/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
index fa2d4743937..fa2d4743937 100644
--- a/src/test/ui/compile-fail-migration/generic-extern-lifetime.rs
+++ b/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
index 9276ae0d412..9276ae0d412 100644
--- a/src/test/ui/compile-fail-migration/generic-extern-lifetime.stderr
+++ b/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
index a7140d1be87..a7140d1be87 100644
--- a/src/test/ui/compile-fail-migration/generic-extern.rs
+++ b/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
index c1ba2cced54..c1ba2cced54 100644
--- a/src/test/ui/compile-fail-migration/generic-extern.stderr
+++ b/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
index 3f5f7bb3a53..3f5f7bb3a53 100644
--- 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
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
index a10b500f9f8..a10b500f9f8 100644
--- 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
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
index 31411992089..31411992089 100644
--- 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
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
index 6b54baefb1d..6b54baefb1d 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/generic-lifetime-trait-impl.rs b/src/test/ui/generic/generic-lifetime-trait-impl.rs
index 9b9f09f4777..9b9f09f4777 100644
--- a/src/test/ui/compile-fail-migration/generic-lifetime-trait-impl.rs
+++ b/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
index 182eab0a69b..182eab0a69b 100644
--- a/src/test/ui/compile-fail-migration/generic-lifetime-trait-impl.stderr
+++ b/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
index 2b4c94d281f..2b4c94d281f 100644
--- a/src/test/ui/compile-fail-migration/generic-no-mangle.rs
+++ b/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
index 4eaa3973329..4eaa3973329 100644
--- a/src/test/ui/compile-fail-migration/generic-no-mangle.stderr
+++ b/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
index 13b7753082c..13b7753082c 100644
--- a/src/test/ui/compile-fail-migration/generic-non-trailing-defaults.rs
+++ b/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
index ce8badf6d30..ce8badf6d30 100644
--- a/src/test/ui/compile-fail-migration/generic-non-trailing-defaults.stderr
+++ b/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
index 81113d949e1..81113d949e1 100644
--- a/src/test/ui/generic-param-attrs.rs
+++ b/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
index c873fa67600..c873fa67600 100644
--- a/src/test/ui/generic-type-less-params-with-defaults.rs
+++ b/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
index 28867eb2254..28867eb2254 100644
--- a/src/test/ui/generic-type-less-params-with-defaults.stderr
+++ b/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
index 0d1b1943ca2..0d1b1943ca2 100644
--- a/src/test/ui/generic-type-more-params-with-defaults.rs
+++ b/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
index 684a22ce45c..684a22ce45c 100644
--- a/src/test/ui/generic-type-more-params-with-defaults.stderr
+++ b/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
index bfa6af0da43..bfa6af0da43 100644
--- a/src/test/ui/compile-fail-migration/generic-type-params-forward-mention.rs
+++ b/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
index 542716326f1..542716326f1 100644
--- a/src/test/ui/compile-fail-migration/generic-type-params-forward-mention.stderr
+++ b/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
index 71d7cf792e4..71d7cf792e4 100644
--- a/src/test/ui/compile-fail-migration/generic-type-params-name-repr.rs
+++ b/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
index 1c65aeadae6..1c65aeadae6 100644
--- a/src/test/ui/compile-fail-migration/generic-type-params-name-repr.stderr
+++ b/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
index 8f1b8ec91db..8f1b8ec91db 100644
--- a/src/test/ui/compile-fail-migration/glob-cycles.rs
+++ b/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
index a9fd9306e21..a9fd9306e21 100644
--- a/src/test/ui/compile-fail-migration/glob-cycles.stderr
+++ b/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
index 2723b4ce256..2723b4ce256 100644
--- a/src/test/ui/compile-fail-migration/glob-resolve1.rs
+++ b/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
index 650dd2c3b19..650dd2c3b19 100644
--- a/src/test/ui/compile-fail-migration/glob-resolve1.stderr
+++ b/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
index ec52d19cd1c..ec52d19cd1c 100644
--- a/src/test/ui/compile-fail-migration/hashmap-iter-value-lifetime.nll.stderr
+++ b/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
index 9cf145a1ff3..9cf145a1ff3 100644
--- a/src/test/ui/compile-fail-migration/hashmap-iter-value-lifetime.rs
+++ b/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
index 16e9c527391..16e9c527391 100644
--- a/src/test/ui/compile-fail-migration/hashmap-iter-value-lifetime.stderr
+++ b/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
index 9418c34cbfd..9418c34cbfd 100644
--- a/src/test/ui/compile-fail-migration/hashmap-lifetimes.rs
+++ b/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
index eb129848ed2..eb129848ed2 100644
--- a/src/test/ui/compile-fail-migration/hashmap-lifetimes.stderr
+++ b/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
index a27a8464707..a27a8464707 100644
--- a/src/test/ui/compile-fail-migration/hidden-rt-injection.rs
+++ b/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
index 103cdf05485..103cdf05485 100644
--- a/src/test/ui/compile-fail-migration/hidden-rt-injection.stderr
+++ b/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
index fa6584ddd98..fa6584ddd98 100644
--- a/src/test/ui/compile-fail-migration/hidden-rt-injection2.rs
+++ b/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
index df0527f307a..df0527f307a 100644
--- a/src/test/ui/compile-fail-migration/hidden-rt-injection2.stderr
+++ b/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
index d668a931459..d668a931459 100644
--- 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
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
index 23854f9c147..23854f9c147 100644
--- 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
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
index 01a9f578fbc..01a9f578fbc 100644
--- 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
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
index 01a9f578fbc..01a9f578fbc 100644
--- 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
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
index 14e498593f3..14e498593f3 100644
--- 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
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
index a66a4ace910..a66a4ace910 100644
--- 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
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
index 9f94b45140c..9f94b45140c 100644
--- 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
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
index 01a9f578fbc..01a9f578fbc 100644
--- 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
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
index 511369703ba..511369703ba 100644
--- 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
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
index d39d5f76a6e..d39d5f76a6e 100644
--- 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
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
index 01a9f578fbc..01a9f578fbc 100644
--- 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
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
index 1999df909ed..1999df909ed 100644
--- 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
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
index bf562700bb4..bf562700bb4 100644
--- 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
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
index 01a9f578fbc..01a9f578fbc 100644
--- 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
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
index f76b26b5191..f76b26b5191 100644
--- 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
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
index 228f6db38fb..228f6db38fb 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/hr-subtype.rs b/src/test/ui/hr-subtype/hr-subtype.rs
index 86df2382732..86df2382732 100644
--- a/src/test/ui/compile-fail-migration/hr-subtype.rs
+++ b/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
index 845429d4b0c..845429d4b0c 100644
--- a/src/test/ui/compile-fail-migration/hrtb-conflate-regions.rs
+++ b/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
index 42778c12960..42778c12960 100644
--- a/src/test/ui/compile-fail-migration/hrtb-conflate-regions.stderr
+++ b/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
index 06970229325..06970229325 100644
--- a/src/test/ui/compile-fail-migration/hrtb-debruijn-in-receiver.nll.stderr
+++ b/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
index 2365f494075..2365f494075 100644
--- a/src/test/ui/compile-fail-migration/hrtb-debruijn-in-receiver.rs
+++ b/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
index 9a560caf5e9..9a560caf5e9 100644
--- a/src/test/ui/compile-fail-migration/hrtb-debruijn-in-receiver.stderr
+++ b/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
index b55dccec2d5..b55dccec2d5 100644
--- a/src/test/ui/compile-fail-migration/hrtb-higher-ranker-supertraits-transitive.rs
+++ b/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
index dca9feab201..dca9feab201 100644
--- a/src/test/ui/compile-fail-migration/hrtb-higher-ranker-supertraits-transitive.stderr
+++ b/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
index 4c5add4acea..4c5add4acea 100644
--- a/src/test/ui/compile-fail-migration/hrtb-higher-ranker-supertraits.rs
+++ b/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
index ad069e10182..ad069e10182 100644
--- a/src/test/ui/compile-fail-migration/hrtb-higher-ranker-supertraits.stderr
+++ b/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
index e533ecc6eb0..e533ecc6eb0 100644
--- 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
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
index 6888ec9bddb..6888ec9bddb 100644
--- a/src/test/ui/compile-fail-migration/hrtb-identity-fn-borrows.ast.stderr
+++ b/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
index e533ecc6eb0..e533ecc6eb0 100644
--- a/src/test/ui/compile-fail-migration/hrtb-identity-fn-borrows.mir.stderr
+++ b/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
index e98cf4eb2ab..e98cf4eb2ab 100644
--- a/src/test/ui/compile-fail-migration/hrtb-identity-fn-borrows.rs
+++ b/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
index aec950f992c..aec950f992c 100644
--- a/src/test/ui/compile-fail-migration/hrtb-just-for-static.rs
+++ b/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
index 615a8b3bde5..615a8b3bde5 100644
--- a/src/test/ui/compile-fail-migration/hrtb-just-for-static.stderr
+++ b/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
index fcfbeefced0..fcfbeefced0 100644
--- a/src/test/ui/compile-fail-migration/hrtb-perfect-forwarding.rs
+++ b/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
index 5e8674df053..5e8674df053 100644
--- a/src/test/ui/compile-fail-migration/hrtb-perfect-forwarding.stderr
+++ b/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
index 54340cf7ac4..54340cf7ac4 100644
--- a/src/test/ui/compile-fail-migration/huge-array-simple.rs
+++ b/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
index 7de84802e1d..7de84802e1d 100644
--- a/src/test/ui/compile-fail-migration/huge-array.rs
+++ b/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
index 38d9effcfb5..38d9effcfb5 100644
--- a/src/test/ui/compile-fail-migration/huge-array.stderr
+++ b/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
index 6e7c05370b9..6e7c05370b9 100644
--- a/src/test/ui/compile-fail-migration/huge-enum.rs
+++ b/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
index 239428badc2..239428badc2 100644
--- a/src/test/ui/compile-fail-migration/huge-enum.stderr
+++ b/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
index a10c61d6606..a10c61d6606 100644
--- a/src/test/ui/compile-fail-migration/huge-struct.rs
+++ b/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
index 15807309d48..15807309d48 100644
--- a/src/test/ui/compile-fail-migration/huge-struct.stderr
+++ b/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
index 305b43402da..305b43402da 100644
--- a/src/test/ui/compile-fail-migration/hygienic-label-1.rs
+++ b/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
index 051466b183d..051466b183d 100644
--- a/src/test/ui/compile-fail-migration/hygienic-label-1.stderr
+++ b/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
index 24194d7bbe9..24194d7bbe9 100644
--- a/src/test/ui/compile-fail-migration/hygienic-label-2.rs
+++ b/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
index 081c1c7e69e..081c1c7e69e 100644
--- a/src/test/ui/compile-fail-migration/hygienic-label-2.stderr
+++ b/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
index b107b71024d..b107b71024d 100644
--- a/src/test/ui/compile-fail-migration/hygienic-label-3.rs
+++ b/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
index e5593df49f4..e5593df49f4 100644
--- a/src/test/ui/compile-fail-migration/hygienic-label-3.stderr
+++ b/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
index 5bfcb6360e4..5bfcb6360e4 100644
--- a/src/test/ui/compile-fail-migration/hygienic-label-4.rs
+++ b/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
index 60351386a0b..60351386a0b 100644
--- a/src/test/ui/compile-fail-migration/hygienic-label-4.stderr
+++ b/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
index ca9803f66b2..ca9803f66b2 100644
--- a/src/test/ui/compile-fail-migration/if-branch-types.rs
+++ b/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
index cefd94dc99b..cefd94dc99b 100644
--- a/src/test/ui/compile-fail-migration/if-branch-types.stderr
+++ b/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
index 331fdc444ca..331fdc444ca 100644
--- a/src/test/ui/if-let-arm-types.rs
+++ b/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
index 2e6b71dadf1..2e6b71dadf1 100644
--- a/src/test/ui/if-let-arm-types.stderr
+++ b/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
index 1e9144910b0..1e9144910b0 100644
--- a/src/test/ui/compile-fail-migration/if-let.rs
+++ b/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
index de8d6feb3c4..de8d6feb3c4 100644
--- a/src/test/ui/compile-fail-migration/if-let.stderr
+++ b/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
index 15f04df6939..15f04df6939 100644
--- a/src/test/ui/compile-fail-migration/if-loop.rs
+++ b/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
index 6862560570d..6862560570d 100644
--- a/src/test/ui/compile-fail-migration/if-loop.stderr
+++ b/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
index d5d7d2005be..d5d7d2005be 100644
--- a/src/test/ui/compile-fail-migration/if-typeck.rs
+++ b/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
index 6d96f8bf223..6d96f8bf223 100644
--- a/src/test/ui/compile-fail-migration/if-typeck.stderr
+++ b/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
index ce3de3b302d..ce3de3b302d 100644
--- a/src/test/ui/if-without-block.rs
+++ b/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
index bc8e7310ce3..bc8e7310ce3 100644
--- a/src/test/ui/if-without-block.stderr
+++ b/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
index 95bcce5a847..95bcce5a847 100644
--- a/src/test/ui/compile-fail-migration/if-without-else-result.rs
+++ b/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
index ab97f6c81f7..ab97f6c81f7 100644
--- a/src/test/ui/compile-fail-migration/if-without-else-result.stderr
+++ b/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
index bbd75f30d6c..bbd75f30d6c 100644
--- a/src/test/ui/ifmt-bad-arg.rs
+++ b/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
index c8fd8bad19b..c8fd8bad19b 100644
--- a/src/test/ui/ifmt-bad-arg.stderr
+++ b/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
index 8bd3cb0f60b..8bd3cb0f60b 100644
--- a/src/test/ui/compile-fail-migration/ifmt-bad-format-args.rs
+++ b/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
index d2fe12925d7..d2fe12925d7 100644
--- a/src/test/ui/compile-fail-migration/ifmt-bad-format-args.stderr
+++ b/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
index 9b9bae92c33..9b9bae92c33 100644
--- a/src/test/ui/compile-fail-migration/ifmt-unimpl.rs
+++ b/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
index fbb3136693a..fbb3136693a 100644
--- a/src/test/ui/compile-fail-migration/ifmt-unimpl.stderr
+++ b/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
index d90b3d3cf81..d90b3d3cf81 100644
--- a/src/test/ui/compile-fail-migration/ifmt-unknown-trait.rs
+++ b/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
index 3c746e4c53b..3c746e4c53b 100644
--- a/src/test/ui/compile-fail-migration/ifmt-unknown-trait.stderr
+++ b/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
index f4c653bd573..f4c653bd573 100644
--- a/src/test/ui/compile-fail-migration/illegal-ufcs-drop.rs
+++ b/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
index f82c54664a9..f82c54664a9 100644
--- a/src/test/ui/compile-fail-migration/illegal-ufcs-drop.stderr
+++ b/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
index c8236340627..c8236340627 100644
--- a/src/test/ui/compile-fail-migration/immut-function-arguments.ast.nll.stderr
+++ b/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
index 54125b955cb..54125b955cb 100644
--- a/src/test/ui/compile-fail-migration/immut-function-arguments.ast.stderr
+++ b/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
index c8236340627..c8236340627 100644
--- a/src/test/ui/compile-fail-migration/immut-function-arguments.mir.stderr
+++ b/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
index 61a074952ef..61a074952ef 100644
--- a/src/test/ui/compile-fail-migration/immut-function-arguments.rs
+++ b/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
index f90365b71ae..f90365b71ae 100644
--- a/src/test/ui/compile-fail-migration/impl-bounds-checking.rs
+++ b/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
index 80666131b2c..80666131b2c 100644
--- a/src/test/ui/compile-fail-migration/impl-bounds-checking.stderr
+++ b/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
index 23549918ff1..23549918ff1 100644
--- 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
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
index 77ecdf2f5ac..77ecdf2f5ac 100644
--- 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
diff --git a/src/test/ui/impl_trait_projections.rs b/src/test/ui/impl-trait/impl_trait_projections.rs
index 57a0040600a..57a0040600a 100644
--- a/src/test/ui/impl_trait_projections.rs
+++ b/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
index f6d58984ece..f6d58984ece 100644
--- a/src/test/ui/impl_trait_projections.stderr
+++ b/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
index 653ef1723e0..653ef1723e0 100644
--- 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
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
index f260cce647b..f260cce647b 100644
--- 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
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
index 6d581952ac9..6d581952ac9 100644
--- 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
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
index 537fc975bcf..537fc975bcf 100644
--- 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
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
index 48686cbcaf2..48686cbcaf2 100644
--- 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
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
index 6c0a0b800ce..6c0a0b800ce 100644
--- 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
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
index fd2665dc762..fd2665dc762 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/impl-trait/no-trait.rs b/src/test/ui/impl-trait/no-trait.rs
index 5299ba297d0..5299ba297d0 100644
--- a/src/test/ui/compile-fail-migration/impl-trait/no-trait.rs
+++ b/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
index fdd01c87d1c..fdd01c87d1c 100644
--- a/src/test/ui/compile-fail-migration/impl-trait/no-trait.stderr
+++ b/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
index 823ee446729..823ee446729 100644
--- 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
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
index 7c3430ab90e..7c3430ab90e 100644
--- a/src/test/ui/compile-fail-migration/impl-trait/type_parameters_captured.rs
+++ b/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
index 3b9b0e08a45..3b9b0e08a45 100644
--- a/src/test/ui/compile-fail-migration/impl-trait/type_parameters_captured.stderr
+++ b/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
index 2891cd59e3e..2891cd59e3e 100644
--- a/src/test/ui/compile-fail-migration/impl-trait/where-allowed.rs
+++ b/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
index b15893e7c28..b15893e7c28 100644
--- a/src/test/ui/compile-fail-migration/impl-trait/where-allowed.stderr
+++ b/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
index 3803bb9b045..3803bb9b045 100644
--- a/src/test/ui/compile-fail-migration/impl-unused-tps-inherent.rs
+++ b/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
index c1f31deb858..c1f31deb858 100644
--- a/src/test/ui/compile-fail-migration/impl-unused-tps-inherent.stderr
+++ b/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
index c9399afbb93..c9399afbb93 100644
--- a/src/test/ui/compile-fail-migration/impl-unused-tps.rs
+++ b/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
index f50cc00b2f6..f50cc00b2f6 100644
--- a/src/test/ui/compile-fail-migration/impl-unused-tps.stderr
+++ b/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
index e116966670d..e116966670d 100644
--- a/src/test/ui/compile-fail-migration/implicit-method-bind.rs
+++ b/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
index 5de9e58807c..5de9e58807c 100644
--- a/src/test/ui/compile-fail-migration/implicit-method-bind.stderr
+++ b/src/test/ui/implicit-method-bind.stderr
diff --git a/src/test/ui/compile-fail-migration/import.rs b/src/test/ui/import.rs
index 81a5334ed7a..81a5334ed7a 100644
--- a/src/test/ui/compile-fail-migration/import.rs
+++ b/src/test/ui/import.rs
diff --git a/src/test/ui/compile-fail-migration/import.stderr b/src/test/ui/import.stderr
index 89665586844..89665586844 100644
--- a/src/test/ui/compile-fail-migration/import.stderr
+++ b/src/test/ui/import.stderr
diff --git a/src/test/ui/compile-fail-migration/import2.rs b/src/test/ui/import2.rs
index c4bd9ff1e2a..c4bd9ff1e2a 100644
--- a/src/test/ui/compile-fail-migration/import2.rs
+++ b/src/test/ui/import2.rs
diff --git a/src/test/ui/compile-fail-migration/import2.stderr b/src/test/ui/import2.stderr
index c07506845c4..c07506845c4 100644
--- a/src/test/ui/compile-fail-migration/import2.stderr
+++ b/src/test/ui/import2.stderr
diff --git a/src/test/ui/compile-fail-migration/import3.rs b/src/test/ui/import3.rs
index 0a7827587a6..0a7827587a6 100644
--- a/src/test/ui/compile-fail-migration/import3.rs
+++ b/src/test/ui/import3.rs
diff --git a/src/test/ui/compile-fail-migration/import3.stderr b/src/test/ui/import3.stderr
index 5211b862b3d..5211b862b3d 100644
--- a/src/test/ui/compile-fail-migration/import3.stderr
+++ b/src/test/ui/import3.stderr
diff --git a/src/test/ui/compile-fail-migration/import4.rs b/src/test/ui/import4.rs
index 5f3163e9390..5f3163e9390 100644
--- a/src/test/ui/compile-fail-migration/import4.rs
+++ b/src/test/ui/import4.rs
diff --git a/src/test/ui/compile-fail-migration/import4.stderr b/src/test/ui/import4.stderr
index d74e781ad4a..d74e781ad4a 100644
--- a/src/test/ui/compile-fail-migration/import4.stderr
+++ b/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
index a8a55afa41a..a8a55afa41a 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/import_crate_var.rs
+++ b/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
index b09883d9ade..b09883d9ade 100644
--- a/src/test/ui/compile-fail-migration/import-crate-var.rs
+++ b/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
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
index 220b255bde4..220b255bde4 100644
--- a/src/test/ui/compile-fail-migration/import-from-missing.rs
+++ b/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
index 1b40fe45c7f..1b40fe45c7f 100644
--- a/src/test/ui/compile-fail-migration/import-from-missing.stderr
+++ b/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
index 774eaf174d9..774eaf174d9 100644
--- a/src/test/ui/compile-fail-migration/import-glob-0.rs
+++ b/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
index 91cae30776d..91cae30776d 100644
--- a/src/test/ui/compile-fail-migration/import-glob-0.stderr
+++ b/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
index d9cc17791ed..d9cc17791ed 100644
--- a/src/test/ui/compile-fail-migration/import-glob-circular.rs
+++ b/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
index 078a6a3937a..078a6a3937a 100644
--- a/src/test/ui/compile-fail-migration/import-glob-circular.stderr
+++ b/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
index b7bbe11a4dc..b7bbe11a4dc 100644
--- a/src/test/ui/compile-fail-migration/import-loop-2.rs
+++ b/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
index 717f74643eb..717f74643eb 100644
--- a/src/test/ui/compile-fail-migration/import-loop-2.stderr
+++ b/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
index f9b57f00776..f9b57f00776 100644
--- a/src/test/ui/compile-fail-migration/import-loop.rs
+++ b/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
index b9a1204bb73..b9a1204bb73 100644
--- a/src/test/ui/compile-fail-migration/import-loop.stderr
+++ b/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
index beb15a11a96..beb15a11a96 100644
--- a/src/test/ui/compile-fail-migration/import-prefix-macro-1.rs
+++ b/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
index e3f436e4ea8..e3f436e4ea8 100644
--- a/src/test/ui/compile-fail-migration/import-prefix-macro-1.stderr
+++ b/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
index 56c6273aa9a..56c6273aa9a 100644
--- a/src/test/ui/compile-fail-migration/import-prefix-macro-2.rs
+++ b/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
index ab9e32afdf0..ab9e32afdf0 100644
--- a/src/test/ui/compile-fail-migration/import-prefix-macro-2.stderr
+++ b/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
index 75081b10d86..75081b10d86 100644
--- a/src/test/ui/compile-fail-migration/import-trait-method.rs
+++ b/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
index 917a68a7c8b..917a68a7c8b 100644
--- a/src/test/ui/compile-fail-migration/import-trait-method.stderr
+++ b/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
index f50b5b0e849..f50b5b0e849 100644
--- a/src/test/ui/compile-fail-migration/imports/reexports.rs
+++ b/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
index a166344314b..a166344314b 100644
--- a/src/test/ui/compile-fail-migration/imports/reexports.stderr
+++ b/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
index 365521970cd..365521970cd 100644
--- a/src/test/ui/compile-fail-migration/imports/unused-macro-use.rs
+++ b/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
index 0920b5c6d1e..0920b5c6d1e 100644
--- a/src/test/ui/compile-fail-migration/imports/unused-macro-use.stderr
+++ b/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
index 1eb756fe9e4..1eb756fe9e4 100644
--- a/src/test/ui/compile-fail-migration/imports/unused.rs
+++ b/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
index ff5c937aa83..ff5c937aa83 100644
--- a/src/test/ui/compile-fail-migration/imports/unused.stderr
+++ b/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
index bfc1ac2daef..bfc1ac2daef 100644
--- a/src/test/ui/compile-fail-migration/inaccessible-test-modules.rs
+++ b/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
index ce8eaf59027..ce8eaf59027 100644
--- a/src/test/ui/compile-fail-migration/inaccessible-test-modules.stderr
+++ b/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
index fc88ff6f47b..fc88ff6f47b 100644
--- a/src/test/ui/compile-fail-migration/index-bot.rs
+++ b/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
index 1086196d6ae..1086196d6ae 100644
--- a/src/test/ui/compile-fail-migration/index-bot.stderr
+++ b/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
index b9daad936c3..b9daad936c3 100644
--- a/src/test/ui/compile-fail-migration/index_message.rs
+++ b/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
index 208d33e9cd5..208d33e9cd5 100644
--- a/src/test/ui/compile-fail-migration/index_message.stderr
+++ b/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
index 624944f7344..624944f7344 100644
--- a/src/test/ui/compile-fail-migration/indexing-requires-a-uint.rs
+++ b/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
index e9608e0b235..e9608e0b235 100644
--- a/src/test/ui/compile-fail-migration/indexing-requires-a-uint.stderr
+++ b/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
index b73346e6332..b73346e6332 100644
--- a/src/test/ui/auxiliary/inference_unstable_iterator.rs
+++ b/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
index 2ad264ee3d8..2ad264ee3d8 100644
--- a/src/test/ui/auxiliary/inference_unstable_itertools.rs
+++ b/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
index 88dc85f1620..88dc85f1620 100644
--- a/src/test/ui/inference-variable-behind-raw-pointer.rs
+++ b/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
index fe6dc0b0748..fe6dc0b0748 100644
--- a/src/test/ui/inference-variable-behind-raw-pointer.stderr
+++ b/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
index 5a70dffd4c8..5a70dffd4c8 100644
--- a/src/test/ui/inference_unstable.rs
+++ b/src/test/ui/inference/inference_unstable.rs
diff --git a/src/test/ui/inference_unstable.stderr b/src/test/ui/inference/inference_unstable.stderr
index 3a5cb6f2b2e..3a5cb6f2b2e 100644
--- a/src/test/ui/inference_unstable.stderr
+++ b/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
index f5c49bedc71..f5c49bedc71 100644
--- a/src/test/ui/inference_unstable_featured.rs
+++ b/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
index cb5f3623291..cb5f3623291 100644
--- a/src/test/ui/inference_unstable_featured.stderr
+++ b/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
index 82ce4034ce2..82ce4034ce2 100644
--- a/src/test/ui/inference_unstable_forced.rs
+++ b/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
index 00eb81cd9a2..00eb81cd9a2 100644
--- a/src/test/ui/inference_unstable_forced.stderr
+++ b/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
index 3635c4dbb02..3635c4dbb02 100644
--- a/src/test/ui/compile-fail-migration/infinite-autoderef.rs
+++ b/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
index b5e20ea5cbf..b5e20ea5cbf 100644
--- a/src/test/ui/compile-fail-migration/infinite-autoderef.stderr
+++ b/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
index 08e6bf24691..08e6bf24691 100644
--- a/src/test/ui/compile-fail-migration/infinite-instantiation.rs
+++ b/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
index 483605fc389..483605fc389 100644
--- a/src/test/ui/compile-fail-migration/infinite-instantiation.stderr
+++ b/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
index 14d22702db7..14d22702db7 100644
--- a/src/test/ui/compile-fail-migration/infinite-macro-expansion.rs
+++ b/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
index 79216693475..79216693475 100644
--- a/src/test/ui/compile-fail-migration/infinite-macro-expansion.stderr
+++ b/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
index 4f1f6721450..4f1f6721450 100644
--- a/src/test/ui/infinite-recursion-const-fn.rs
+++ b/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
index fb7c1be7541..fb7c1be7541 100644
--- a/src/test/ui/infinite-recursion-const-fn.stderr
+++ b/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
index c9a7f731aea..c9a7f731aea 100644
--- a/src/test/ui/compile-fail-migration/infinite-tag-type-recursion.rs
+++ b/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
index e1fa3dec64c..e1fa3dec64c 100644
--- a/src/test/ui/compile-fail-migration/infinite-tag-type-recursion.stderr
+++ b/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
index 42c80b54313..42c80b54313 100644
--- a/src/test/ui/compile-fail-migration/infinite-vec-type-recursion.rs
+++ b/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
index 3e2d3d6d726..3e2d3d6d726 100644
--- a/src/test/ui/compile-fail-migration/infinite-vec-type-recursion.stderr
+++ b/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
index d11aacec196..d11aacec196 100644
--- a/src/test/ui/compile-fail-migration/inhabitedness-infinite-loop.rs
+++ b/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
index 24237f3a1b6..24237f3a1b6 100644
--- a/src/test/ui/compile-fail-migration/inhabitedness-infinite-loop.stderr
+++ b/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
index 9e599cebd7a..9e599cebd7a 100644
--- a/src/test/ui/compile-fail-migration/init-unsafe.rs
+++ b/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
index f3d041fde01..f3d041fde01 100644
--- a/src/test/ui/compile-fail-migration/init-unsafe.stderr
+++ b/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
index 4d763017c0f..4d763017c0f 100644
--- a/src/test/ui/compile-fail-migration/inner-static-type-parameter.rs
+++ b/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
index 1820e5c57dd..1820e5c57dd 100644
--- a/src/test/ui/compile-fail-migration/inner-static-type-parameter.stderr
+++ b/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
index 7a850d90a87..7a850d90a87 100644
--- a/src/test/ui/compile-fail-migration/integer-literal-suffix-inference.rs
+++ b/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
index 1c5d656020c..1c5d656020c 100644
--- a/src/test/ui/compile-fail-migration/integer-literal-suffix-inference.stderr
+++ b/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
index 4b01afb8131..4b01afb8131 100644
--- a/src/test/ui/compile-fail-migration/integral-indexing.rs
+++ b/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
index d86421a7985..d86421a7985 100644
--- a/src/test/ui/compile-fail-migration/integral-indexing.stderr
+++ b/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
index f2686ae4d19..f2686ae4d19 100644
--- a/src/test/ui/compile-fail-migration/integral-variable-unification-error.rs
+++ b/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
index bbaa6030866..bbaa6030866 100644
--- a/src/test/ui/compile-fail-migration/integral-variable-unification-error.stderr
+++ b/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
index a4cd487eb65..a4cd487eb65 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/internal_unstable.rs
+++ b/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
index 2e42e9d3b01..2e42e9d3b01 100644
--- a/src/test/ui/compile-fail-migration/internal-unstable-noallow.rs
+++ b/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
index fc8100525e9..fc8100525e9 100644
--- a/src/test/ui/compile-fail-migration/internal-unstable-noallow.stderr
+++ b/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
index 74526fb3d83..74526fb3d83 100644
--- a/src/test/ui/compile-fail-migration/internal-unstable-thread-local.rs
+++ b/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
index b77b94663ff..b77b94663ff 100644
--- a/src/test/ui/compile-fail-migration/internal-unstable-thread-local.stderr
+++ b/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
index e01259f0deb..e01259f0deb 100644
--- a/src/test/ui/compile-fail-migration/internal-unstable.rs
+++ b/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
index ec4f0725c34..ec4f0725c34 100644
--- a/src/test/ui/compile-fail-migration/internal-unstable.stderr
+++ b/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
index a224690af76..a224690af76 100644
--- a/src/test/ui/compile-fail-migration/intrinsic-invalid-number-of-arguments.rs
+++ b/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
index af852b669c4..af852b669c4 100644
--- a/src/test/ui/compile-fail-migration/intrinsic-invalid-number-of-arguments.stderr
+++ b/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
index 4b6b6c2fe76..4b6b6c2fe76 100644
--- a/src/test/ui/compile-fail-migration/invalid-crate-type.rs
+++ b/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
index 6dc8a0f2bbb..6dc8a0f2bbb 100644
--- a/src/test/ui/compile-fail-migration/invalid-crate-type.stderr
+++ b/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
index 93b985b4fb0..93b985b4fb0 100644
--- a/src/test/ui/compile-fail-migration/invalid-inline.rs
+++ b/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
index d4861c23aee..d4861c23aee 100644
--- a/src/test/ui/compile-fail-migration/invalid-inline.stderr
+++ b/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
index d710f5647dd..d710f5647dd 100644
--- a/src/test/ui/compile-fail-migration/invalid-macro-matcher.rs
+++ b/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
index d3ddb613f94..d3ddb613f94 100644
--- a/src/test/ui/compile-fail-migration/invalid-macro-matcher.stderr
+++ b/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
index ab839e7630d..ab839e7630d 100644
--- a/src/test/ui/invalid-path-in-const.rs
+++ b/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
index 9214800b93a..9214800b93a 100644
--- a/src/test/ui/invalid-path-in-const.stderr
+++ b/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
index 3bf09e10ae8..3bf09e10ae8 100644
--- a/src/test/ui/compile-fail-migration/invalid-plugin-attr.rs
+++ b/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
index a5d321ea9bd..a5d321ea9bd 100644
--- a/src/test/ui/compile-fail-migration/invalid-plugin-attr.stderr
+++ b/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
index 3d421e00b08..3d421e00b08 100644
--- a/src/test/ui/invalid-variadic-function.rs
+++ b/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
index 13678d10ef5..13678d10ef5 100644
--- a/src/test/ui/invalid-variadic-function.stderr
+++ b/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
index 6d42515704e..6d42515704e 100644
--- a/src/test/ui/compile-fail-migration/invalid_crate_type_syntax.rs
+++ b/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
index b609695b86e..b609695b86e 100644
--- a/src/test/ui/compile-fail-migration/invalid_crate_type_syntax.stderr
+++ b/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 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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
index 76c5cdafd7c..76c5cdafd7c 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/issue-19163.rs
+++ b/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
index 1b740d112e9..1b740d112e9 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/issue-21146-inc.rs
+++ b/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
index 361f1ea5509..361f1ea5509 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/issue-29181.rs
+++ b/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
index 8d44e8d1016..8d44e8d1016 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/issue-30535.rs
+++ b/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
index e64e63a2139..e64e63a2139 100644
--- a/src/test/ui/auxiliary/issue-36708.rs
+++ b/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
index 33ac11feb2d..33ac11feb2d 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/issue-36881-aux.rs
+++ b/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
index 68d1ef8d776..68d1ef8d776 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/issue-52489.rs
+++ b/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
index 18f78750b15..18f78750b15 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/issue_11680.rs
+++ b/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
index b3b04b4a5ac..b3b04b4a5ac 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/issue_16725.rs
+++ b/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
index 3901d73382f..3901d73382f 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/issue_17718_const_privacy.rs
+++ b/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
index 55065174ca7..55065174ca7 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/issue_1920.rs
+++ b/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
index afdbf78aa82..afdbf78aa82 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/issue_21202.rs
+++ b/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
index f60311a9400..f60311a9400 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/issue_30123_aux.rs
+++ b/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
index 5a6db789282..5a6db789282 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/issue_41549.rs
+++ b/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
index 7fa937e93b3..7fa937e93b3 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/issue_5844_aux.rs
+++ b/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
index 5547458abbe..5547458abbe 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/lint_stability.rs
+++ b/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
index 37ee10c8d37..37ee10c8d37 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/private_trait_xc.rs
+++ b/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
index 95b2d62e426..95b2d62e426 100644
--- a/src/test/ui/auxiliary/xcrate_issue_43189_a.rs
+++ b/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
index a396c31e21d..a396c31e21d 100644
--- a/src/test/ui/auxiliary/xcrate_issue_43189_b.rs
+++ b/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
index 80f877f834d..80f877f834d 100644
--- a/src/test/ui/auxiliary/xcrate_issue_46112_rexport_core.rs
+++ b/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
index c968844ae21..c968844ae21 100644
--- a/src/test/ui/issue-10176.rs
+++ b/src/test/ui/issues/issue-10176.rs
diff --git a/src/test/ui/issue-10176.stderr b/src/test/ui/issues/issue-10176.stderr
index 02e0b899b3f..02e0b899b3f 100644
--- a/src/test/ui/issue-10176.stderr
+++ b/src/test/ui/issues/issue-10176.stderr
diff --git a/src/test/ui/issue-10200.rs b/src/test/ui/issues/issue-10200.rs
index 8c58ef6261e..8c58ef6261e 100644
--- a/src/test/ui/issue-10200.rs
+++ b/src/test/ui/issues/issue-10200.rs
diff --git a/src/test/ui/issue-10200.stderr b/src/test/ui/issues/issue-10200.stderr
index 4eb07827628..4eb07827628 100644
--- a/src/test/ui/issue-10200.stderr
+++ b/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
index 48dad040f9d..48dad040f9d 100644
--- a/src/test/ui/issue-10291.nll.stderr
+++ b/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
index d4e7dc7e9a3..d4e7dc7e9a3 100644
--- a/src/test/ui/issue-10291.rs
+++ b/src/test/ui/issues/issue-10291.rs
diff --git a/src/test/ui/issue-10291.stderr b/src/test/ui/issues/issue-10291.stderr
index af5929782f6..af5929782f6 100644
--- a/src/test/ui/issue-10291.stderr
+++ b/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
index d13e843b94b..d13e843b94b 100644
--- a/src/test/ui/issue-10398.nll.stderr
+++ b/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
index 08e8effc626..08e8effc626 100644
--- a/src/test/ui/issue-10398.rs
+++ b/src/test/ui/issues/issue-10398.rs
diff --git a/src/test/ui/issue-10398.stderr b/src/test/ui/issues/issue-10398.stderr
index e3b816df3f4..e3b816df3f4 100644
--- a/src/test/ui/issue-10398.stderr
+++ b/src/test/ui/issues/issue-10398.stderr
diff --git a/src/test/ui/issue-10401.rs b/src/test/ui/issues/issue-10401.rs
index e36193aee25..e36193aee25 100644
--- a/src/test/ui/issue-10401.rs
+++ b/src/test/ui/issues/issue-10401.rs
diff --git a/src/test/ui/issue-10401.stderr b/src/test/ui/issues/issue-10401.stderr
index 94d13d5f268..94d13d5f268 100644
--- a/src/test/ui/issue-10401.stderr
+++ b/src/test/ui/issues/issue-10401.stderr
diff --git a/src/test/ui/issue-10412.rs b/src/test/ui/issues/issue-10412.rs
index ee553730a35..ee553730a35 100644
--- a/src/test/ui/issue-10412.rs
+++ b/src/test/ui/issues/issue-10412.rs
diff --git a/src/test/ui/issue-10412.stderr b/src/test/ui/issues/issue-10412.stderr
index 7f2f2dbf509..7f2f2dbf509 100644
--- a/src/test/ui/issue-10412.stderr
+++ b/src/test/ui/issues/issue-10412.stderr
diff --git a/src/test/ui/issue-10465.rs b/src/test/ui/issues/issue-10465.rs
index ed91e935407..ed91e935407 100644
--- a/src/test/ui/issue-10465.rs
+++ b/src/test/ui/issues/issue-10465.rs
diff --git a/src/test/ui/issue-10465.stderr b/src/test/ui/issues/issue-10465.stderr
index add4b832e83..add4b832e83 100644
--- a/src/test/ui/issue-10465.stderr
+++ b/src/test/ui/issues/issue-10465.stderr
diff --git a/src/test/ui/issue-10536.rs b/src/test/ui/issues/issue-10536.rs
index 2b71fb5c67f..2b71fb5c67f 100644
--- a/src/test/ui/issue-10536.rs
+++ b/src/test/ui/issues/issue-10536.rs
diff --git a/src/test/ui/issue-10536.stderr b/src/test/ui/issues/issue-10536.stderr
index ba404d0dd3f..ba404d0dd3f 100644
--- a/src/test/ui/issue-10536.stderr
+++ b/src/test/ui/issues/issue-10536.stderr
diff --git a/src/test/ui/issue-10545.rs b/src/test/ui/issues/issue-10545.rs
index 708eea39a95..708eea39a95 100644
--- a/src/test/ui/issue-10545.rs
+++ b/src/test/ui/issues/issue-10545.rs
diff --git a/src/test/ui/issue-10545.stderr b/src/test/ui/issues/issue-10545.stderr
index 28f95dff3bc..28f95dff3bc 100644
--- a/src/test/ui/issue-10545.stderr
+++ b/src/test/ui/issues/issue-10545.stderr
diff --git a/src/test/ui/issue-10656.rs b/src/test/ui/issues/issue-10656.rs
index 7fd5a0d1348..7fd5a0d1348 100644
--- a/src/test/ui/issue-10656.rs
+++ b/src/test/ui/issues/issue-10656.rs
diff --git a/src/test/ui/issue-10656.stderr b/src/test/ui/issues/issue-10656.stderr
index d67463f0263..d67463f0263 100644
--- a/src/test/ui/issue-10656.stderr
+++ b/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
index 57915bce456..57915bce456 100644
--- a/src/test/ui/compile-fail-migration/issue-10755.rs
+++ b/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
index db64944d44f..db64944d44f 100644
--- a/src/test/ui/compile-fail-migration/issue-10755.stderr
+++ b/src/test/ui/issues/issue-10755.stderr
diff --git a/src/test/ui/issue-10764.rs b/src/test/ui/issues/issue-10764.rs
index cd4ec495556..cd4ec495556 100644
--- a/src/test/ui/issue-10764.rs
+++ b/src/test/ui/issues/issue-10764.rs
diff --git a/src/test/ui/issue-10764.stderr b/src/test/ui/issues/issue-10764.stderr
index 6aacbef0897..6aacbef0897 100644
--- a/src/test/ui/issue-10764.stderr
+++ b/src/test/ui/issues/issue-10764.stderr
diff --git a/src/test/ui/issue-10877.rs b/src/test/ui/issues/issue-10877.rs
index 39f25b837cd..39f25b837cd 100644
--- a/src/test/ui/issue-10877.rs
+++ b/src/test/ui/issues/issue-10877.rs
diff --git a/src/test/ui/issue-10877.stderr b/src/test/ui/issues/issue-10877.stderr
index 6db0bf6dc65..6db0bf6dc65 100644
--- a/src/test/ui/issue-10877.stderr
+++ b/src/test/ui/issues/issue-10877.stderr
diff --git a/src/test/ui/issue-10969.rs b/src/test/ui/issues/issue-10969.rs
index 4ab4a8b579a..4ab4a8b579a 100644
--- a/src/test/ui/issue-10969.rs
+++ b/src/test/ui/issues/issue-10969.rs
diff --git a/src/test/ui/issue-10969.stderr b/src/test/ui/issues/issue-10969.stderr
index edc4ecbab52..edc4ecbab52 100644
--- a/src/test/ui/issue-10969.stderr
+++ b/src/test/ui/issues/issue-10969.stderr
diff --git a/src/test/ui/issue-10991.rs b/src/test/ui/issues/issue-10991.rs
index 2d00f339f33..2d00f339f33 100644
--- a/src/test/ui/issue-10991.rs
+++ b/src/test/ui/issues/issue-10991.rs
diff --git a/src/test/ui/issue-10991.stderr b/src/test/ui/issues/issue-10991.stderr
index 3ae3bbe06cb..3ae3bbe06cb 100644
--- a/src/test/ui/issue-10991.stderr
+++ b/src/test/ui/issues/issue-10991.stderr
diff --git a/src/test/ui/issue-11004.rs b/src/test/ui/issues/issue-11004.rs
index 503fa647512..503fa647512 100644
--- a/src/test/ui/issue-11004.rs
+++ b/src/test/ui/issues/issue-11004.rs
diff --git a/src/test/ui/issue-11004.stderr b/src/test/ui/issues/issue-11004.stderr
index 215120c9c25..215120c9c25 100644
--- a/src/test/ui/issue-11004.stderr
+++ b/src/test/ui/issues/issue-11004.stderr
diff --git a/src/test/ui/issue-11154.rs b/src/test/ui/issues/issue-11154.rs
index 1ff68123374..1ff68123374 100644
--- a/src/test/ui/issue-11154.rs
+++ b/src/test/ui/issues/issue-11154.rs
diff --git a/src/test/ui/issue-11154.stderr b/src/test/ui/issues/issue-11154.stderr
index 8eec8b37c85..8eec8b37c85 100644
--- a/src/test/ui/issue-11154.stderr
+++ b/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
index a7e6c9f2b33..a7e6c9f2b33 100644
--- a/src/test/ui/issue-11192.nll.stderr
+++ b/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
index 7d8a1528aba..7d8a1528aba 100644
--- a/src/test/ui/issue-11192.rs
+++ b/src/test/ui/issues/issue-11192.rs
diff --git a/src/test/ui/issue-11192.stderr b/src/test/ui/issues/issue-11192.stderr
index e9853ac0ca8..e9853ac0ca8 100644
--- a/src/test/ui/issue-11192.stderr
+++ b/src/test/ui/issues/issue-11192.stderr
diff --git a/src/test/ui/issue-11319.rs b/src/test/ui/issues/issue-11319.rs
index 20636ed1ea9..20636ed1ea9 100644
--- a/src/test/ui/issue-11319.rs
+++ b/src/test/ui/issues/issue-11319.rs
diff --git a/src/test/ui/issue-11319.stderr b/src/test/ui/issues/issue-11319.stderr
index 8189cf5ea17..8189cf5ea17 100644
--- a/src/test/ui/issue-11319.stderr
+++ b/src/test/ui/issues/issue-11319.stderr
diff --git a/src/test/ui/issue-11374.rs b/src/test/ui/issues/issue-11374.rs
index 1e444a6bebf..1e444a6bebf 100644
--- a/src/test/ui/issue-11374.rs
+++ b/src/test/ui/issues/issue-11374.rs
diff --git a/src/test/ui/issue-11374.stderr b/src/test/ui/issues/issue-11374.stderr
index 3465069129b..3465069129b 100644
--- a/src/test/ui/issue-11374.stderr
+++ b/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
index 99b996387e7..99b996387e7 100644
--- a/src/test/ui/issue-11493.ast.stderr
+++ b/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
index 99b996387e7..99b996387e7 100644
--- a/src/test/ui/issue-11493.mir.stderr
+++ b/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
index 80ecc24543e..80ecc24543e 100644
--- a/src/test/ui/issue-11493.rs
+++ b/src/test/ui/issues/issue-11493.rs
diff --git a/src/test/ui/issue-11515.rs b/src/test/ui/issues/issue-11515.rs
index 7afb8314ea6..7afb8314ea6 100644
--- a/src/test/ui/issue-11515.rs
+++ b/src/test/ui/issues/issue-11515.rs
diff --git a/src/test/ui/issue-11515.stderr b/src/test/ui/issues/issue-11515.stderr
index 25e2a45438e..25e2a45438e 100644
--- a/src/test/ui/issue-11515.stderr
+++ b/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
index 2749438433d..2749438433d 100644
--- a/src/test/ui/compile-fail-migration/issue-11593.rs
+++ b/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
index 24e1a5eb6f4..24e1a5eb6f4 100644
--- a/src/test/ui/compile-fail-migration/issue-11593.stderr
+++ b/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
index 7dccd781106..7dccd781106 100644
--- a/src/test/ui/compile-fail-migration/issue-11680.rs
+++ b/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
index 37cfe960600..37cfe960600 100644
--- a/src/test/ui/compile-fail-migration/issue-11680.stderr
+++ b/src/test/ui/issues/issue-11680.stderr
diff --git a/src/test/ui/issue-11681.rs b/src/test/ui/issues/issue-11681.rs
index 71f1d5dcc9a..71f1d5dcc9a 100644
--- a/src/test/ui/issue-11681.rs
+++ b/src/test/ui/issues/issue-11681.rs
diff --git a/src/test/ui/issue-11681.stderr b/src/test/ui/issues/issue-11681.stderr
index ef3d24c6657..ef3d24c6657 100644
--- a/src/test/ui/issue-11681.stderr
+++ b/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
index ff6009da72f..ff6009da72f 100644
--- a/src/test/ui/issue-11692-1.rs
+++ b/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
index 61ff455d16c..61ff455d16c 100644
--- a/src/test/ui/issue-11692-1.stderr
+++ b/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
index acac2d151fe..acac2d151fe 100644
--- a/src/test/ui/issue-11692-2.rs
+++ b/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
index 51d6041e922..51d6041e922 100644
--- a/src/test/ui/issue-11692-2.stderr
+++ b/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
index 0bda06be9e8..0bda06be9e8 100644
--- a/src/test/ui/issue-11740.rs
+++ b/src/test/ui/issues/issue-11740.rs
diff --git a/src/test/ui/issue-11740.stderr b/src/test/ui/issues/issue-11740.stderr
index a1913e0057c..a1913e0057c 100644
--- a/src/test/ui/issue-11740.stderr
+++ b/src/test/ui/issues/issue-11740.stderr
diff --git a/src/test/ui/issue-11771.rs b/src/test/ui/issues/issue-11771.rs
index 69899105bc3..69899105bc3 100644
--- a/src/test/ui/issue-11771.rs
+++ b/src/test/ui/issues/issue-11771.rs
diff --git a/src/test/ui/issue-11771.stderr b/src/test/ui/issues/issue-11771.stderr
index a31c4fa008d..a31c4fa008d 100644
--- a/src/test/ui/issue-11771.stderr
+++ b/src/test/ui/issues/issue-11771.stderr
diff --git a/src/test/ui/issue-11844.rs b/src/test/ui/issues/issue-11844.rs
index a6dbe954ec0..a6dbe954ec0 100644
--- a/src/test/ui/issue-11844.rs
+++ b/src/test/ui/issues/issue-11844.rs
diff --git a/src/test/ui/issue-11844.stderr b/src/test/ui/issues/issue-11844.stderr
index d773e88d01c..d773e88d01c 100644
--- a/src/test/ui/issue-11844.stderr
+++ b/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
index bf4fed06dee..bf4fed06dee 100644
--- a/src/test/ui/issue-11873.nll.stderr
+++ b/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
index 4618851529a..4618851529a 100644
--- a/src/test/ui/issue-11873.rs
+++ b/src/test/ui/issues/issue-11873.rs
diff --git a/src/test/ui/issue-11873.stderr b/src/test/ui/issues/issue-11873.stderr
index f4da011f572..f4da011f572 100644
--- a/src/test/ui/issue-11873.stderr
+++ b/src/test/ui/issues/issue-11873.stderr
diff --git a/src/test/ui/issue-12028.rs b/src/test/ui/issues/issue-12028.rs
index 980385ce4cc..980385ce4cc 100644
--- a/src/test/ui/issue-12028.rs
+++ b/src/test/ui/issues/issue-12028.rs
diff --git a/src/test/ui/issue-12028.stderr b/src/test/ui/issues/issue-12028.stderr
index f756e0a29d1..f756e0a29d1 100644
--- a/src/test/ui/issue-12028.stderr
+++ b/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
index b880317a2a6..b880317a2a6 100644
--- a/src/test/ui/issue-12041.nll.stderr
+++ b/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
index f0f4bf5ca71..f0f4bf5ca71 100644
--- a/src/test/ui/issue-12041.rs
+++ b/src/test/ui/issues/issue-12041.rs
diff --git a/src/test/ui/issue-12041.stderr b/src/test/ui/issues/issue-12041.stderr
index 6172d78b513..6172d78b513 100644
--- a/src/test/ui/issue-12041.stderr
+++ b/src/test/ui/issues/issue-12041.stderr
diff --git a/src/test/ui/issue-12116.rs b/src/test/ui/issues/issue-12116.rs
index a8d2c552553..a8d2c552553 100644
--- a/src/test/ui/issue-12116.rs
+++ b/src/test/ui/issues/issue-12116.rs
diff --git a/src/test/ui/issue-12116.stderr b/src/test/ui/issues/issue-12116.stderr
index 3bf0984b256..3bf0984b256 100644
--- a/src/test/ui/issue-12116.stderr
+++ b/src/test/ui/issues/issue-12116.stderr
diff --git a/src/test/ui/issue-12127.rs b/src/test/ui/issues/issue-12127.rs
index 5565a9a5761..5565a9a5761 100644
--- a/src/test/ui/issue-12127.rs
+++ b/src/test/ui/issues/issue-12127.rs
diff --git a/src/test/ui/issue-12127.stderr b/src/test/ui/issues/issue-12127.stderr
index afd483823a6..afd483823a6 100644
--- a/src/test/ui/issue-12127.stderr
+++ b/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
index c429b73bc95..c429b73bc95 100644
--- a/src/test/ui/issue-12187-1.rs
+++ b/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
index 94afd6aab57..94afd6aab57 100644
--- a/src/test/ui/issue-12187-1.stderr
+++ b/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
index 733f597e7ac..733f597e7ac 100644
--- a/src/test/ui/issue-12187-2.rs
+++ b/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
index 90b41e397c6..90b41e397c6 100644
--- a/src/test/ui/issue-12187-2.stderr
+++ b/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
index 1b9af393ccc..1b9af393ccc 100644
--- a/src/test/ui/issue-12369.rs
+++ b/src/test/ui/issues/issue-12369.rs
diff --git a/src/test/ui/issue-12369.stderr b/src/test/ui/issues/issue-12369.stderr
index 2e8cd840fb7..2e8cd840fb7 100644
--- a/src/test/ui/issue-12369.stderr
+++ b/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
index 6eb27655140..6eb27655140 100644
--- a/src/test/ui/issue-12470.nll.stderr
+++ b/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
index 93785817e14..93785817e14 100644
--- a/src/test/ui/issue-12470.rs
+++ b/src/test/ui/issues/issue-12470.rs
diff --git a/src/test/ui/issue-12470.stderr b/src/test/ui/issues/issue-12470.stderr
index 91788e96297..91788e96297 100644
--- a/src/test/ui/issue-12470.stderr
+++ b/src/test/ui/issues/issue-12470.stderr
diff --git a/src/test/ui/issue-12511.rs b/src/test/ui/issues/issue-12511.rs
index 83359bf1675..83359bf1675 100644
--- a/src/test/ui/issue-12511.rs
+++ b/src/test/ui/issues/issue-12511.rs
diff --git a/src/test/ui/issue-12511.stderr b/src/test/ui/issues/issue-12511.stderr
index 1a48e6a6de1..1a48e6a6de1 100644
--- a/src/test/ui/issue-12511.stderr
+++ b/src/test/ui/issues/issue-12511.stderr
diff --git a/src/test/ui/issue-12552.rs b/src/test/ui/issues/issue-12552.rs
index e4788bac256..e4788bac256 100644
--- a/src/test/ui/issue-12552.rs
+++ b/src/test/ui/issues/issue-12552.rs
diff --git a/src/test/ui/issue-12552.stderr b/src/test/ui/issues/issue-12552.stderr
index 9a3d5ef02c6..9a3d5ef02c6 100644
--- a/src/test/ui/issue-12552.stderr
+++ b/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
index 29bda252b91..29bda252b91 100644
--- a/src/test/ui/issue-12567.nll.stderr
+++ b/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
index 30cdd07b399..30cdd07b399 100644
--- a/src/test/ui/issue-12567.rs
+++ b/src/test/ui/issues/issue-12567.rs
diff --git a/src/test/ui/issue-12567.stderr b/src/test/ui/issues/issue-12567.stderr
index 60acffdcb06..60acffdcb06 100644
--- a/src/test/ui/issue-12567.stderr
+++ b/src/test/ui/issues/issue-12567.stderr
diff --git a/src/test/ui/issue-12796.rs b/src/test/ui/issues/issue-12796.rs
index 0c3c82a99f2..0c3c82a99f2 100644
--- a/src/test/ui/issue-12796.rs
+++ b/src/test/ui/issues/issue-12796.rs
diff --git a/src/test/ui/issue-12796.stderr b/src/test/ui/issues/issue-12796.stderr
index c8bedd3853c..c8bedd3853c 100644
--- a/src/test/ui/issue-12796.stderr
+++ b/src/test/ui/issues/issue-12796.stderr
diff --git a/src/test/ui/issue-12863.rs b/src/test/ui/issues/issue-12863.rs
index d3432410c54..d3432410c54 100644
--- a/src/test/ui/issue-12863.rs
+++ b/src/test/ui/issues/issue-12863.rs
diff --git a/src/test/ui/issue-12863.stderr b/src/test/ui/issues/issue-12863.stderr
index eb2957a8225..eb2957a8225 100644
--- a/src/test/ui/issue-12863.stderr
+++ b/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
index 2d8d7857c99..2d8d7857c99 100644
--- a/src/test/ui/issue-12997-1.rs
+++ b/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
index 856538417d9..856538417d9 100644
--- a/src/test/ui/issue-12997-1.stderr
+++ b/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
index 8d3df68577b..8d3df68577b 100644
--- a/src/test/ui/issue-12997-2.rs
+++ b/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
index 3030ee4779b..3030ee4779b 100644
--- a/src/test/ui/issue-12997-2.stderr
+++ b/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
index f1fd617717a..f1fd617717a 100644
--- a/src/test/ui/issue-13033.rs
+++ b/src/test/ui/issues/issue-13033.rs
diff --git a/src/test/ui/issue-13033.stderr b/src/test/ui/issues/issue-13033.stderr
index f06d7360d85..f06d7360d85 100644
--- a/src/test/ui/issue-13033.stderr
+++ b/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
index 146385f3de2..146385f3de2 100644
--- a/src/test/ui/issue-13058.nll.stderr
+++ b/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
index dbcf9998ad9..dbcf9998ad9 100644
--- a/src/test/ui/issue-13058.rs
+++ b/src/test/ui/issues/issue-13058.rs
diff --git a/src/test/ui/issue-13058.stderr b/src/test/ui/issues/issue-13058.stderr
index 5e8319d26ad..5e8319d26ad 100644
--- a/src/test/ui/issue-13058.stderr
+++ b/src/test/ui/issues/issue-13058.stderr
diff --git a/src/test/ui/issue-13352.rs b/src/test/ui/issues/issue-13352.rs
index e9d76c758cd..e9d76c758cd 100644
--- a/src/test/ui/issue-13352.rs
+++ b/src/test/ui/issues/issue-13352.rs
diff --git a/src/test/ui/issue-13352.stderr b/src/test/ui/issues/issue-13352.stderr
index 5324eb21186..5324eb21186 100644
--- a/src/test/ui/issue-13352.stderr
+++ b/src/test/ui/issues/issue-13352.stderr
diff --git a/src/test/ui/issue-13359.rs b/src/test/ui/issues/issue-13359.rs
index e33859e8c19..e33859e8c19 100644
--- a/src/test/ui/issue-13359.rs
+++ b/src/test/ui/issues/issue-13359.rs
diff --git a/src/test/ui/issue-13359.stderr b/src/test/ui/issues/issue-13359.stderr
index 77f10be982b..77f10be982b 100644
--- a/src/test/ui/issue-13359.stderr
+++ b/src/test/ui/issues/issue-13359.stderr
diff --git a/src/test/ui/issue-13404.rs b/src/test/ui/issues/issue-13404.rs
index 0059e92e07f..0059e92e07f 100644
--- a/src/test/ui/issue-13404.rs
+++ b/src/test/ui/issues/issue-13404.rs
diff --git a/src/test/ui/issue-13404.stderr b/src/test/ui/issues/issue-13404.stderr
index b71d3ceab5b..b71d3ceab5b 100644
--- a/src/test/ui/issue-13404.stderr
+++ b/src/test/ui/issues/issue-13404.stderr
diff --git a/src/test/ui/issue-13407.rs b/src/test/ui/issues/issue-13407.rs
index afb2e867f45..afb2e867f45 100644
--- a/src/test/ui/issue-13407.rs
+++ b/src/test/ui/issues/issue-13407.rs
diff --git a/src/test/ui/issue-13407.stderr b/src/test/ui/issues/issue-13407.stderr
index e5ef50e984a..e5ef50e984a 100644
--- a/src/test/ui/issue-13407.stderr
+++ b/src/test/ui/issues/issue-13407.stderr
diff --git a/src/test/ui/issue-13446.rs b/src/test/ui/issues/issue-13446.rs
index 6607e1903b6..6607e1903b6 100644
--- a/src/test/ui/issue-13446.rs
+++ b/src/test/ui/issues/issue-13446.rs
diff --git a/src/test/ui/issue-13446.stderr b/src/test/ui/issues/issue-13446.stderr
index 110bb4b83db..110bb4b83db 100644
--- a/src/test/ui/issue-13446.stderr
+++ b/src/test/ui/issues/issue-13446.stderr
diff --git a/src/test/ui/issue-13466.rs b/src/test/ui/issues/issue-13466.rs
index abddf6ba7a3..abddf6ba7a3 100644
--- a/src/test/ui/issue-13466.rs
+++ b/src/test/ui/issues/issue-13466.rs
diff --git a/src/test/ui/issue-13466.stderr b/src/test/ui/issues/issue-13466.stderr
index be845fb8e22..be845fb8e22 100644
--- a/src/test/ui/issue-13466.stderr
+++ b/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
index fe7fbb176cc..fe7fbb176cc 100644
--- a/src/test/ui/issue-13482-2.rs
+++ b/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
index 1ecae3b867a..1ecae3b867a 100644
--- a/src/test/ui/issue-13482-2.stderr
+++ b/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
index 32a63b79a32..32a63b79a32 100644
--- a/src/test/ui/issue-13482.rs
+++ b/src/test/ui/issues/issue-13482.rs
diff --git a/src/test/ui/issue-13482.stderr b/src/test/ui/issues/issue-13482.stderr
index 95273bb46bc..95273bb46bc 100644
--- a/src/test/ui/issue-13482.stderr
+++ b/src/test/ui/issues/issue-13482.stderr
diff --git a/src/test/ui/issue-13483.rs b/src/test/ui/issues/issue-13483.rs
index c44465b221c..c44465b221c 100644
--- a/src/test/ui/issue-13483.rs
+++ b/src/test/ui/issues/issue-13483.rs
diff --git a/src/test/ui/issue-13483.stderr b/src/test/ui/issues/issue-13483.stderr
index afcb8b8da17..afcb8b8da17 100644
--- a/src/test/ui/issue-13483.stderr
+++ b/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
index 5c592f6f375..5c592f6f375 100644
--- a/src/test/ui/issue-13497-2.nll.stderr
+++ b/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
index 31716837493..31716837493 100644
--- a/src/test/ui/issue-13497-2.rs
+++ b/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
index 72770f8c84c..72770f8c84c 100644
--- a/src/test/ui/issue-13497-2.stderr
+++ b/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
index d544a92d9c3..d544a92d9c3 100644
--- a/src/test/ui/issue-13497.rs
+++ b/src/test/ui/issues/issue-13497.rs
diff --git a/src/test/ui/issue-13497.stderr b/src/test/ui/issues/issue-13497.stderr
index ab6d041bd48..ab6d041bd48 100644
--- a/src/test/ui/issue-13497.stderr
+++ b/src/test/ui/issues/issue-13497.stderr
diff --git a/src/test/ui/issue-1362.rs b/src/test/ui/issues/issue-1362.rs
index d51db479599..d51db479599 100644
--- a/src/test/ui/issue-1362.rs
+++ b/src/test/ui/issues/issue-1362.rs
diff --git a/src/test/ui/issue-1362.stderr b/src/test/ui/issues/issue-1362.stderr
index c19e256eb92..c19e256eb92 100644
--- a/src/test/ui/issue-1362.stderr
+++ b/src/test/ui/issues/issue-1362.stderr
diff --git a/src/test/ui/issue-13641.rs b/src/test/ui/issues/issue-13641.rs
index 3b690e08f61..3b690e08f61 100644
--- a/src/test/ui/issue-13641.rs
+++ b/src/test/ui/issues/issue-13641.rs
diff --git a/src/test/ui/issue-13641.stderr b/src/test/ui/issues/issue-13641.stderr
index 0f96b5f66b1..0f96b5f66b1 100644
--- a/src/test/ui/issue-13641.stderr
+++ b/src/test/ui/issues/issue-13641.stderr
diff --git a/src/test/ui/issue-13727.rs b/src/test/ui/issues/issue-13727.rs
index 2e815548e89..2e815548e89 100644
--- a/src/test/ui/issue-13727.rs
+++ b/src/test/ui/issues/issue-13727.rs
diff --git a/src/test/ui/issue-13727.stderr b/src/test/ui/issues/issue-13727.stderr
index 47b9a0211a9..47b9a0211a9 100644
--- a/src/test/ui/issue-13727.stderr
+++ b/src/test/ui/issues/issue-13727.stderr
diff --git a/src/test/ui/issue-13847.rs b/src/test/ui/issues/issue-13847.rs
index 0314f109a7c..0314f109a7c 100644
--- a/src/test/ui/issue-13847.rs
+++ b/src/test/ui/issues/issue-13847.rs
diff --git a/src/test/ui/issue-13847.stderr b/src/test/ui/issues/issue-13847.stderr
index fad3245034d..fad3245034d 100644
--- a/src/test/ui/issue-13847.stderr
+++ b/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
index 1635a8f69a6..1635a8f69a6 100644
--- a/src/test/ui/issue-13853-2.rs
+++ b/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
index c15290fb1d9..c15290fb1d9 100644
--- a/src/test/ui/issue-13853-2.stderr
+++ b/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
index 78b079a7c44..78b079a7c44 100644
--- a/src/test/ui/issue-13853-5.rs
+++ b/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
index e93b03b43ee..e93b03b43ee 100644
--- a/src/test/ui/issue-13853-5.stderr
+++ b/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
index 86a6bdfd4dd..86a6bdfd4dd 100644
--- a/src/test/ui/issue-13853.rs
+++ b/src/test/ui/issues/issue-13853.rs
diff --git a/src/test/ui/issue-13853.stderr b/src/test/ui/issues/issue-13853.stderr
index 188bfd59301..188bfd59301 100644
--- a/src/test/ui/issue-13853.stderr
+++ b/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
index a4351733a87..a4351733a87 100644
--- a/src/test/ui/issue-14091-2.rs
+++ b/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
index ccabd801c85..ccabd801c85 100644
--- a/src/test/ui/issue-14091-2.stderr
+++ b/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
index 9e436b8e629..9e436b8e629 100644
--- a/src/test/ui/issue-14091.rs
+++ b/src/test/ui/issues/issue-14091.rs
diff --git a/src/test/ui/issue-14091.stderr b/src/test/ui/issues/issue-14091.stderr
index 9db2a0e2a86..9db2a0e2a86 100644
--- a/src/test/ui/issue-14091.stderr
+++ b/src/test/ui/issues/issue-14091.stderr
diff --git a/src/test/ui/issue-14092.rs b/src/test/ui/issues/issue-14092.rs
index 449de26769f..449de26769f 100644
--- a/src/test/ui/issue-14092.rs
+++ b/src/test/ui/issues/issue-14092.rs
diff --git a/src/test/ui/issue-14092.stderr b/src/test/ui/issues/issue-14092.stderr
index f90ea4776ab..f90ea4776ab 100644
--- a/src/test/ui/issue-14092.stderr
+++ b/src/test/ui/issues/issue-14092.stderr
diff --git a/src/test/ui/issue-14221.rs b/src/test/ui/issues/issue-14221.rs
index d11fe99c07f..d11fe99c07f 100644
--- a/src/test/ui/issue-14221.rs
+++ b/src/test/ui/issues/issue-14221.rs
diff --git a/src/test/ui/issue-14221.stderr b/src/test/ui/issues/issue-14221.stderr
index 9252a4f304f..9252a4f304f 100644
--- a/src/test/ui/issue-14221.stderr
+++ b/src/test/ui/issues/issue-14221.stderr
diff --git a/src/test/ui/issue-14227.rs b/src/test/ui/issues/issue-14227.rs
index 250e78ce246..250e78ce246 100644
--- a/src/test/ui/issue-14227.rs
+++ b/src/test/ui/issues/issue-14227.rs
diff --git a/src/test/ui/issue-14227.stderr b/src/test/ui/issues/issue-14227.stderr
index f5f39465b18..f5f39465b18 100644
--- a/src/test/ui/issue-14227.stderr
+++ b/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
index c95d540b25c..c95d540b25c 100644
--- a/src/test/ui/issue-14285.nll.stderr
+++ b/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
index dceecee6ca7..dceecee6ca7 100644
--- a/src/test/ui/issue-14285.rs
+++ b/src/test/ui/issues/issue-14285.rs
diff --git a/src/test/ui/issue-14285.stderr b/src/test/ui/issues/issue-14285.stderr
index 52163f81b7b..52163f81b7b 100644
--- a/src/test/ui/issue-14285.stderr
+++ b/src/test/ui/issues/issue-14285.stderr
diff --git a/src/test/ui/issue-14309.rs b/src/test/ui/issues/issue-14309.rs
index f76fa3e4a8e..f76fa3e4a8e 100644
--- a/src/test/ui/issue-14309.rs
+++ b/src/test/ui/issues/issue-14309.rs
diff --git a/src/test/ui/issue-14309.stderr b/src/test/ui/issues/issue-14309.stderr
index e062c633ee6..e062c633ee6 100644
--- a/src/test/ui/issue-14309.stderr
+++ b/src/test/ui/issues/issue-14309.stderr
diff --git a/src/test/ui/issue-14366.rs b/src/test/ui/issues/issue-14366.rs
index 0b154d0a3ea..0b154d0a3ea 100644
--- a/src/test/ui/issue-14366.rs
+++ b/src/test/ui/issues/issue-14366.rs
diff --git a/src/test/ui/issue-14366.stderr b/src/test/ui/issues/issue-14366.stderr
index 3c3ecd23bef..3c3ecd23bef 100644
--- a/src/test/ui/issue-14366.stderr
+++ b/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
index ddfed3647c2..ddfed3647c2 100644
--- a/src/test/ui/issue-1448-2.rs
+++ b/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
index 5769b0c3b9f..5769b0c3b9f 100644
--- a/src/test/ui/issue-1448-2.stderr
+++ b/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
index 84c600d2201..84c600d2201 100644
--- a/src/test/ui/issue-14541.rs
+++ b/src/test/ui/issues/issue-14541.rs
diff --git a/src/test/ui/issue-14541.stderr b/src/test/ui/issues/issue-14541.stderr
index fcff500cfda..fcff500cfda 100644
--- a/src/test/ui/issue-14541.stderr
+++ b/src/test/ui/issues/issue-14541.stderr
diff --git a/src/test/ui/issue-14721.rs b/src/test/ui/issues/issue-14721.rs
index 58e8e10ee37..58e8e10ee37 100644
--- a/src/test/ui/issue-14721.rs
+++ b/src/test/ui/issues/issue-14721.rs
diff --git a/src/test/ui/issue-14721.stderr b/src/test/ui/issues/issue-14721.stderr
index 93e51140caa..93e51140caa 100644
--- a/src/test/ui/issue-14721.stderr
+++ b/src/test/ui/issues/issue-14721.stderr
diff --git a/src/test/ui/issue-1476.rs b/src/test/ui/issues/issue-1476.rs
index 48bf71f5892..48bf71f5892 100644
--- a/src/test/ui/issue-1476.rs
+++ b/src/test/ui/issues/issue-1476.rs
diff --git a/src/test/ui/issue-1476.stderr b/src/test/ui/issues/issue-1476.stderr
index afdda3e15da..afdda3e15da 100644
--- a/src/test/ui/issue-1476.stderr
+++ b/src/test/ui/issues/issue-1476.stderr
diff --git a/src/test/ui/issue-14772.rs b/src/test/ui/issues/issue-14772.rs
index aaaad67be52..aaaad67be52 100644
--- a/src/test/ui/issue-14772.rs
+++ b/src/test/ui/issues/issue-14772.rs
diff --git a/src/test/ui/issue-14772.stderr b/src/test/ui/issues/issue-14772.stderr
index 1116cd38edf..1116cd38edf 100644
--- a/src/test/ui/issue-14772.stderr
+++ b/src/test/ui/issues/issue-14772.stderr
diff --git a/src/test/ui/issue-14845.rs b/src/test/ui/issues/issue-14845.rs
index 74f0833e8d1..74f0833e8d1 100644
--- a/src/test/ui/issue-14845.rs
+++ b/src/test/ui/issues/issue-14845.rs
diff --git a/src/test/ui/issue-14845.stderr b/src/test/ui/issues/issue-14845.stderr
index a994026946e..a994026946e 100644
--- a/src/test/ui/issue-14845.stderr
+++ b/src/test/ui/issues/issue-14845.stderr
diff --git a/src/test/ui/issue-14853.rs b/src/test/ui/issues/issue-14853.rs
index e4da3e4fa43..e4da3e4fa43 100644
--- a/src/test/ui/issue-14853.rs
+++ b/src/test/ui/issues/issue-14853.rs
diff --git a/src/test/ui/issue-14853.stderr b/src/test/ui/issues/issue-14853.stderr
index 6c2f6bb9c69..6c2f6bb9c69 100644
--- a/src/test/ui/issue-14853.stderr
+++ b/src/test/ui/issues/issue-14853.stderr
diff --git a/src/test/ui/issue-14915.rs b/src/test/ui/issues/issue-14915.rs
index 810d6656a8f..810d6656a8f 100644
--- a/src/test/ui/issue-14915.rs
+++ b/src/test/ui/issues/issue-14915.rs
diff --git a/src/test/ui/issue-14915.stderr b/src/test/ui/issues/issue-14915.stderr
index aa418f5df86..aa418f5df86 100644
--- a/src/test/ui/issue-14915.stderr
+++ b/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
index 4c8482630c5..4c8482630c5 100644
--- a/src/test/ui/issue-15034.nll.stderr
+++ b/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
index a62e46820d3..a62e46820d3 100644
--- a/src/test/ui/issue-15034.rs
+++ b/src/test/ui/issues/issue-15034.rs
diff --git a/src/test/ui/issue-15034.stderr b/src/test/ui/issues/issue-15034.stderr
index c87bec00d95..c87bec00d95 100644
--- a/src/test/ui/issue-15034.stderr
+++ b/src/test/ui/issues/issue-15034.stderr
diff --git a/src/test/ui/issue-15094.rs b/src/test/ui/issues/issue-15094.rs
index 1dd6763cbe5..1dd6763cbe5 100644
--- a/src/test/ui/issue-15094.rs
+++ b/src/test/ui/issues/issue-15094.rs
diff --git a/src/test/ui/issue-15094.stderr b/src/test/ui/issues/issue-15094.stderr
index 7928a6be350..7928a6be350 100644
--- a/src/test/ui/issue-15094.stderr
+++ b/src/test/ui/issues/issue-15094.stderr
diff --git a/src/test/ui/issue-15129.rs b/src/test/ui/issues/issue-15129.rs
index 7a7ba46de74..7a7ba46de74 100644
--- a/src/test/ui/issue-15129.rs
+++ b/src/test/ui/issues/issue-15129.rs
diff --git a/src/test/ui/issue-15129.stderr b/src/test/ui/issues/issue-15129.stderr
index e65e6516222..e65e6516222 100644
--- a/src/test/ui/issue-15129.stderr
+++ b/src/test/ui/issues/issue-15129.stderr
diff --git a/src/test/ui/issue-15167.rs b/src/test/ui/issues/issue-15167.rs
index d224b8a548c..d224b8a548c 100644
--- a/src/test/ui/issue-15167.rs
+++ b/src/test/ui/issues/issue-15167.rs
diff --git a/src/test/ui/issue-15167.stderr b/src/test/ui/issues/issue-15167.stderr
index b15c493ad69..b15c493ad69 100644
--- a/src/test/ui/issue-15167.stderr
+++ b/src/test/ui/issues/issue-15167.stderr
diff --git a/src/test/ui/issue-15207.rs b/src/test/ui/issues/issue-15207.rs
index 70da8cf4169..70da8cf4169 100644
--- a/src/test/ui/issue-15207.rs
+++ b/src/test/ui/issues/issue-15207.rs
diff --git a/src/test/ui/issue-15207.stderr b/src/test/ui/issues/issue-15207.stderr
index 77e52012277..77e52012277 100644
--- a/src/test/ui/issue-15207.stderr
+++ b/src/test/ui/issues/issue-15207.stderr
diff --git a/src/test/ui/issue-15260.rs b/src/test/ui/issues/issue-15260.rs
index 6356ea81660..6356ea81660 100644
--- a/src/test/ui/issue-15260.rs
+++ b/src/test/ui/issues/issue-15260.rs
diff --git a/src/test/ui/issue-15260.stderr b/src/test/ui/issues/issue-15260.stderr
index 10cb79e0fc5..10cb79e0fc5 100644
--- a/src/test/ui/issue-15260.stderr
+++ b/src/test/ui/issues/issue-15260.stderr
diff --git a/src/test/ui/issue-15381.rs b/src/test/ui/issues/issue-15381.rs
index 1cdd803971b..1cdd803971b 100644
--- a/src/test/ui/issue-15381.rs
+++ b/src/test/ui/issues/issue-15381.rs
diff --git a/src/test/ui/issue-15381.stderr b/src/test/ui/issues/issue-15381.stderr
index 7a936a82108..7a936a82108 100644
--- a/src/test/ui/issue-15381.stderr
+++ b/src/test/ui/issues/issue-15381.stderr
diff --git a/src/test/ui/issue-15524.rs b/src/test/ui/issues/issue-15524.rs
index 7e696c97595..7e696c97595 100644
--- a/src/test/ui/issue-15524.rs
+++ b/src/test/ui/issues/issue-15524.rs
diff --git a/src/test/ui/issue-15524.stderr b/src/test/ui/issues/issue-15524.stderr
index a116e621a95..a116e621a95 100644
--- a/src/test/ui/issue-15524.stderr
+++ b/src/test/ui/issues/issue-15524.stderr
diff --git a/src/test/ui/issue-15756.rs b/src/test/ui/issues/issue-15756.rs
index c123e85a0e0..c123e85a0e0 100644
--- a/src/test/ui/issue-15756.rs
+++ b/src/test/ui/issues/issue-15756.rs
diff --git a/src/test/ui/issue-15756.stderr b/src/test/ui/issues/issue-15756.stderr
index e142a504eb6..e142a504eb6 100644
--- a/src/test/ui/issue-15756.stderr
+++ b/src/test/ui/issues/issue-15756.stderr
diff --git a/src/test/ui/issue-15783.rs b/src/test/ui/issues/issue-15783.rs
index 37a2f1582bf..37a2f1582bf 100644
--- a/src/test/ui/issue-15783.rs
+++ b/src/test/ui/issues/issue-15783.rs
diff --git a/src/test/ui/issue-15783.stderr b/src/test/ui/issues/issue-15783.stderr
index d565bad2448..d565bad2448 100644
--- a/src/test/ui/issue-15783.stderr
+++ b/src/test/ui/issues/issue-15783.stderr
diff --git a/src/test/ui/issue-15896.rs b/src/test/ui/issues/issue-15896.rs
index 35ef9ba2b4b..35ef9ba2b4b 100644
--- a/src/test/ui/issue-15896.rs
+++ b/src/test/ui/issues/issue-15896.rs
diff --git a/src/test/ui/issue-15896.stderr b/src/test/ui/issues/issue-15896.stderr
index b41848c8cdf..b41848c8cdf 100644
--- a/src/test/ui/issue-15896.stderr
+++ b/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
index df7e7c102b2..df7e7c102b2 100644
--- a/src/test/ui/compile-fail-migration/issue-15919.rs
+++ b/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
index a69e7b43e25..a69e7b43e25 100644
--- a/src/test/ui/compile-fail-migration/issue-15919.stderr
+++ b/src/test/ui/issues/issue-15919.stderr
diff --git a/src/test/ui/issue-15965.rs b/src/test/ui/issues/issue-15965.rs
index 76ba5a0f4b3..76ba5a0f4b3 100644
--- a/src/test/ui/issue-15965.rs
+++ b/src/test/ui/issues/issue-15965.rs
diff --git a/src/test/ui/issue-15965.stderr b/src/test/ui/issues/issue-15965.stderr
index 3162556986e..3162556986e 100644
--- a/src/test/ui/issue-15965.stderr
+++ b/src/test/ui/issues/issue-15965.stderr
diff --git a/src/test/ui/issue-16048.rs b/src/test/ui/issues/issue-16048.rs
index cda83fe54b0..cda83fe54b0 100644
--- a/src/test/ui/issue-16048.rs
+++ b/src/test/ui/issues/issue-16048.rs
diff --git a/src/test/ui/issue-16048.stderr b/src/test/ui/issues/issue-16048.stderr
index 97883fb2a95..97883fb2a95 100644
--- a/src/test/ui/issue-16048.stderr
+++ b/src/test/ui/issues/issue-16048.stderr
diff --git a/src/test/ui/issue-16098.rs b/src/test/ui/issues/issue-16098.rs
index 68ac19b383f..68ac19b383f 100644
--- a/src/test/ui/issue-16098.rs
+++ b/src/test/ui/issues/issue-16098.rs
diff --git a/src/test/ui/issue-16098.stderr b/src/test/ui/issues/issue-16098.stderr
index 31162ca50cc..31162ca50cc 100644
--- a/src/test/ui/issue-16098.stderr
+++ b/src/test/ui/issues/issue-16098.stderr
diff --git a/src/test/ui/issue-16149.rs b/src/test/ui/issues/issue-16149.rs
index 60117bd88d4..60117bd88d4 100644
--- a/src/test/ui/issue-16149.rs
+++ b/src/test/ui/issues/issue-16149.rs
diff --git a/src/test/ui/issue-16149.stderr b/src/test/ui/issues/issue-16149.stderr
index b0b6e9dfcd0..b0b6e9dfcd0 100644
--- a/src/test/ui/issue-16149.stderr
+++ b/src/test/ui/issues/issue-16149.stderr
diff --git a/src/test/ui/issue-16250.rs b/src/test/ui/issues/issue-16250.rs
index f9d01003005..f9d01003005 100644
--- a/src/test/ui/issue-16250.rs
+++ b/src/test/ui/issues/issue-16250.rs
diff --git a/src/test/ui/issue-16250.stderr b/src/test/ui/issues/issue-16250.stderr
index c826b20b65f..c826b20b65f 100644
--- a/src/test/ui/issue-16250.stderr
+++ b/src/test/ui/issues/issue-16250.stderr
diff --git a/src/test/ui/issue-16338.rs b/src/test/ui/issues/issue-16338.rs
index 438073e3b2f..438073e3b2f 100644
--- a/src/test/ui/issue-16338.rs
+++ b/src/test/ui/issues/issue-16338.rs
diff --git a/src/test/ui/issue-16338.stderr b/src/test/ui/issues/issue-16338.stderr
index c670f1e3e9c..c670f1e3e9c 100644
--- a/src/test/ui/issue-16338.stderr
+++ b/src/test/ui/issues/issue-16338.stderr
diff --git a/src/test/ui/issue-16401.rs b/src/test/ui/issues/issue-16401.rs
index 3060bbea43c..3060bbea43c 100644
--- a/src/test/ui/issue-16401.rs
+++ b/src/test/ui/issues/issue-16401.rs
diff --git a/src/test/ui/issue-16401.stderr b/src/test/ui/issues/issue-16401.stderr
index 179415c7621..179415c7621 100644
--- a/src/test/ui/issue-16401.stderr
+++ b/src/test/ui/issues/issue-16401.stderr
diff --git a/src/test/ui/issue-16538.rs b/src/test/ui/issues/issue-16538.rs
index cc652119377..cc652119377 100644
--- a/src/test/ui/issue-16538.rs
+++ b/src/test/ui/issues/issue-16538.rs
diff --git a/src/test/ui/issue-16538.stderr b/src/test/ui/issues/issue-16538.stderr
index 9bc3590ebab..9bc3590ebab 100644
--- a/src/test/ui/issue-16538.stderr
+++ b/src/test/ui/issues/issue-16538.stderr
diff --git a/src/test/ui/issue-16562.rs b/src/test/ui/issues/issue-16562.rs
index a400263a243..a400263a243 100644
--- a/src/test/ui/issue-16562.rs
+++ b/src/test/ui/issues/issue-16562.rs
diff --git a/src/test/ui/issue-16562.stderr b/src/test/ui/issues/issue-16562.stderr
index a4525033e25..a4525033e25 100644
--- a/src/test/ui/issue-16562.stderr
+++ b/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
index 890bb426441..890bb426441 100644
--- a/src/test/ui/issue-16683.nll.stderr
+++ b/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
index fcbf8a3d351..fcbf8a3d351 100644
--- a/src/test/ui/issue-16683.rs
+++ b/src/test/ui/issues/issue-16683.rs
diff --git a/src/test/ui/issue-16683.stderr b/src/test/ui/issues/issue-16683.stderr
index ceb5347ca80..ceb5347ca80 100644
--- a/src/test/ui/issue-16683.stderr
+++ b/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
index cadf602a4cf..cadf602a4cf 100644
--- a/src/test/ui/compile-fail-migration/issue-16725.rs
+++ b/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
index 709f3cf50b9..709f3cf50b9 100644
--- a/src/test/ui/compile-fail-migration/issue-16725.stderr
+++ b/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
index 1bd26faedaa..1bd26faedaa 100644
--- a/src/test/ui/issue-16922.nll.stderr
+++ b/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
index 1768c834cb3..1768c834cb3 100644
--- a/src/test/ui/issue-16922.rs
+++ b/src/test/ui/issues/issue-16922.rs
diff --git a/src/test/ui/issue-16922.stderr b/src/test/ui/issues/issue-16922.stderr
index e70869eb183..e70869eb183 100644
--- a/src/test/ui/issue-16922.stderr
+++ b/src/test/ui/issues/issue-16922.stderr
diff --git a/src/test/ui/issue-16939.rs b/src/test/ui/issues/issue-16939.rs
index e16c58b8a6c..e16c58b8a6c 100644
--- a/src/test/ui/issue-16939.rs
+++ b/src/test/ui/issues/issue-16939.rs
diff --git a/src/test/ui/issue-16939.stderr b/src/test/ui/issues/issue-16939.stderr
index 23848049370..23848049370 100644
--- a/src/test/ui/issue-16939.stderr
+++ b/src/test/ui/issues/issue-16939.stderr
diff --git a/src/test/ui/issue-16966.rs b/src/test/ui/issues/issue-16966.rs
index 38b102c7e3e..38b102c7e3e 100644
--- a/src/test/ui/issue-16966.rs
+++ b/src/test/ui/issues/issue-16966.rs
diff --git a/src/test/ui/issue-16966.stderr b/src/test/ui/issues/issue-16966.stderr
index a26910e0146..a26910e0146 100644
--- a/src/test/ui/issue-16966.stderr
+++ b/src/test/ui/issues/issue-16966.stderr
diff --git a/src/test/ui/issue-1697.rs b/src/test/ui/issues/issue-1697.rs
index f8a68264339..f8a68264339 100644
--- a/src/test/ui/issue-1697.rs
+++ b/src/test/ui/issues/issue-1697.rs
diff --git a/src/test/ui/issue-1697.stderr b/src/test/ui/issues/issue-1697.stderr
index 28a7fbcaabe..28a7fbcaabe 100644
--- a/src/test/ui/issue-1697.stderr
+++ b/src/test/ui/issues/issue-1697.stderr
diff --git a/src/test/ui/issue-16994.rs b/src/test/ui/issues/issue-16994.rs
index ae4e8ce1df8..ae4e8ce1df8 100644
--- a/src/test/ui/issue-16994.rs
+++ b/src/test/ui/issues/issue-16994.rs
diff --git a/src/test/ui/issue-16994.stderr b/src/test/ui/issues/issue-16994.stderr
index 8392b9da411..8392b9da411 100644
--- a/src/test/ui/issue-16994.stderr
+++ b/src/test/ui/issues/issue-16994.stderr
diff --git a/src/test/ui/issue-17001.rs b/src/test/ui/issues/issue-17001.rs
index 413e8b464ff..413e8b464ff 100644
--- a/src/test/ui/issue-17001.rs
+++ b/src/test/ui/issues/issue-17001.rs
diff --git a/src/test/ui/issue-17001.stderr b/src/test/ui/issues/issue-17001.stderr
index a8e0cd8591b..a8e0cd8591b 100644
--- a/src/test/ui/issue-17001.stderr
+++ b/src/test/ui/issues/issue-17001.stderr
diff --git a/src/test/ui/issue-17025.rs b/src/test/ui/issues/issue-17025.rs
index f250103b144..f250103b144 100644
--- a/src/test/ui/issue-17025.rs
+++ b/src/test/ui/issues/issue-17025.rs
diff --git a/src/test/ui/issue-17033.rs b/src/test/ui/issues/issue-17033.rs
index 1cd43cbb0f8..1cd43cbb0f8 100644
--- a/src/test/ui/issue-17033.rs
+++ b/src/test/ui/issues/issue-17033.rs
diff --git a/src/test/ui/issue-17033.stderr b/src/test/ui/issues/issue-17033.stderr
index d6884f18881..d6884f18881 100644
--- a/src/test/ui/issue-17033.stderr
+++ b/src/test/ui/issues/issue-17033.stderr
diff --git a/src/test/ui/issue-17252.rs b/src/test/ui/issues/issue-17252.rs
index 1c3e6890c8e..1c3e6890c8e 100644
--- a/src/test/ui/issue-17252.rs
+++ b/src/test/ui/issues/issue-17252.rs
diff --git a/src/test/ui/issue-17252.stderr b/src/test/ui/issues/issue-17252.stderr
index 8f97a841666..8f97a841666 100644
--- a/src/test/ui/issue-17252.stderr
+++ b/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
index d6009e8078d..d6009e8078d 100644
--- a/src/test/ui/issue-17263.nll.stderr
+++ b/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
index b251f9a4152..b251f9a4152 100644
--- a/src/test/ui/issue-17263.rs
+++ b/src/test/ui/issues/issue-17263.rs
diff --git a/src/test/ui/issue-17263.stderr b/src/test/ui/issues/issue-17263.stderr
index 4767fbbcfbb..4767fbbcfbb 100644
--- a/src/test/ui/issue-17263.stderr
+++ b/src/test/ui/issues/issue-17263.stderr
diff --git a/src/test/ui/issue-17337.rs b/src/test/ui/issues/issue-17337.rs
index 8642396c380..8642396c380 100644
--- a/src/test/ui/issue-17337.rs
+++ b/src/test/ui/issues/issue-17337.rs
diff --git a/src/test/ui/issue-17337.stderr b/src/test/ui/issues/issue-17337.stderr
index 03215473745..03215473745 100644
--- a/src/test/ui/issue-17337.stderr
+++ b/src/test/ui/issues/issue-17337.stderr
diff --git a/src/test/ui/issue-17373.rs b/src/test/ui/issues/issue-17373.rs
index f6e6a8a0852..f6e6a8a0852 100644
--- a/src/test/ui/issue-17373.rs
+++ b/src/test/ui/issues/issue-17373.rs
diff --git a/src/test/ui/issue-17373.stderr b/src/test/ui/issues/issue-17373.stderr
index 38e93e65bdc..38e93e65bdc 100644
--- a/src/test/ui/issue-17373.stderr
+++ b/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
index 85924a75261..85924a75261 100644
--- a/src/test/ui/issue-17385.nll.stderr
+++ b/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
index eb293c79247..eb293c79247 100644
--- a/src/test/ui/issue-17385.rs
+++ b/src/test/ui/issues/issue-17385.rs
diff --git a/src/test/ui/issue-17385.stderr b/src/test/ui/issues/issue-17385.stderr
index 01d6d1a2720..01d6d1a2720 100644
--- a/src/test/ui/issue-17385.stderr
+++ b/src/test/ui/issues/issue-17385.stderr
diff --git a/src/test/ui/issue-17405.rs b/src/test/ui/issues/issue-17405.rs
index 5a6bd5ed588..5a6bd5ed588 100644
--- a/src/test/ui/issue-17405.rs
+++ b/src/test/ui/issues/issue-17405.rs
diff --git a/src/test/ui/issue-17405.stderr b/src/test/ui/issues/issue-17405.stderr
index bcccfd301b7..bcccfd301b7 100644
--- a/src/test/ui/issue-17405.stderr
+++ b/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
index 260cc366fae..260cc366fae 100644
--- a/src/test/ui/issue-17431-1.rs
+++ b/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
index fb27693c85e..fb27693c85e 100644
--- a/src/test/ui/issue-17431-1.stderr
+++ b/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
index f39fb0e31c6..f39fb0e31c6 100644
--- a/src/test/ui/issue-17431-2.rs
+++ b/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
index 7e87babe93e..7e87babe93e 100644
--- a/src/test/ui/issue-17431-2.stderr
+++ b/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
index 9ba085591f0..9ba085591f0 100644
--- a/src/test/ui/issue-17431-3.rs
+++ b/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
index c12a4c11c2c..c12a4c11c2c 100644
--- a/src/test/ui/issue-17431-3.stderr
+++ b/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
index 665c3cf8fe6..665c3cf8fe6 100644
--- a/src/test/ui/issue-17431-4.rs
+++ b/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
index acfd688b622..acfd688b622 100644
--- a/src/test/ui/issue-17431-4.stderr
+++ b/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
index 85ed4d5d634..85ed4d5d634 100644
--- a/src/test/ui/issue-17431-5.rs
+++ b/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
index ddfea58a857..ddfea58a857 100644
--- a/src/test/ui/issue-17431-5.stderr
+++ b/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
index 4c1e82c3d6a..4c1e82c3d6a 100644
--- a/src/test/ui/issue-17431-6.rs
+++ b/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
index ab2cc439f17..ab2cc439f17 100644
--- a/src/test/ui/issue-17431-6.stderr
+++ b/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
index 71b85da29fc..71b85da29fc 100644
--- a/src/test/ui/issue-17431-7.rs
+++ b/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
index 7f9118860b9..7f9118860b9 100644
--- a/src/test/ui/issue-17431-7.stderr
+++ b/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
index 5432d5f5ed9..5432d5f5ed9 100644
--- a/src/test/ui/issue-17441.rs
+++ b/src/test/ui/issues/issue-17441.rs
diff --git a/src/test/ui/issue-17441.stderr b/src/test/ui/issues/issue-17441.stderr
index 6c7e883f9f9..6c7e883f9f9 100644
--- a/src/test/ui/issue-17441.stderr
+++ b/src/test/ui/issues/issue-17441.stderr
diff --git a/src/test/ui/issue-17444.rs b/src/test/ui/issues/issue-17444.rs
index dafcff23838..dafcff23838 100644
--- a/src/test/ui/issue-17444.rs
+++ b/src/test/ui/issues/issue-17444.rs
diff --git a/src/test/ui/issue-17444.stderr b/src/test/ui/issues/issue-17444.stderr
index 3f87d806e7e..3f87d806e7e 100644
--- a/src/test/ui/issue-17444.stderr
+++ b/src/test/ui/issues/issue-17444.stderr
diff --git a/src/test/ui/issue-17458.rs b/src/test/ui/issues/issue-17458.rs
index 354d389158d..354d389158d 100644
--- a/src/test/ui/issue-17458.rs
+++ b/src/test/ui/issues/issue-17458.rs
diff --git a/src/test/ui/issue-17458.stderr b/src/test/ui/issues/issue-17458.stderr
index 0303e4bddb5..0303e4bddb5 100644
--- a/src/test/ui/issue-17458.stderr
+++ b/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
index 50a4b3f7f3e..50a4b3f7f3e 100644
--- a/src/test/ui/issue-17545.nll.stderr
+++ b/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
index 9264305e6ea..9264305e6ea 100644
--- a/src/test/ui/issue-17545.rs
+++ b/src/test/ui/issues/issue-17545.rs
diff --git a/src/test/ui/issue-17545.stderr b/src/test/ui/issues/issue-17545.stderr
index ce698665583..ce698665583 100644
--- a/src/test/ui/issue-17545.stderr
+++ b/src/test/ui/issues/issue-17545.stderr
diff --git a/src/test/ui/issue-17546.rs b/src/test/ui/issues/issue-17546.rs
index fe125b973d9..fe125b973d9 100644
--- a/src/test/ui/issue-17546.rs
+++ b/src/test/ui/issues/issue-17546.rs
diff --git a/src/test/ui/issue-17546.stderr b/src/test/ui/issues/issue-17546.stderr
index 39f7d5fcc04..39f7d5fcc04 100644
--- a/src/test/ui/issue-17546.stderr
+++ b/src/test/ui/issues/issue-17546.stderr
diff --git a/src/test/ui/issue-17551.rs b/src/test/ui/issues/issue-17551.rs
index b55863f0dda..b55863f0dda 100644
--- a/src/test/ui/issue-17551.rs
+++ b/src/test/ui/issues/issue-17551.rs
diff --git a/src/test/ui/issue-17551.stderr b/src/test/ui/issues/issue-17551.stderr
index 0cdee0337d8..0cdee0337d8 100644
--- a/src/test/ui/issue-17551.stderr
+++ b/src/test/ui/issues/issue-17551.stderr
diff --git a/src/test/ui/issue-17651.rs b/src/test/ui/issues/issue-17651.rs
index cbd0da4b53c..cbd0da4b53c 100644
--- a/src/test/ui/issue-17651.rs
+++ b/src/test/ui/issues/issue-17651.rs
diff --git a/src/test/ui/issue-17651.stderr b/src/test/ui/issues/issue-17651.stderr
index 3e5679bdc3b..3e5679bdc3b 100644
--- a/src/test/ui/issue-17651.stderr
+++ b/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
index 17ec77d77ee..17ec77d77ee 100644
--- a/src/test/ui/issue-17718-const-bad-values.rs
+++ b/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
index 0ab7f965b63..0ab7f965b63 100644
--- a/src/test/ui/issue-17718-const-bad-values.stderr
+++ b/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
index 07123c69492..07123c69492 100644
--- a/src/test/ui/issue-17718-const-borrow.rs
+++ b/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
index 3b0217060f7..3b0217060f7 100644
--- a/src/test/ui/issue-17718-const-borrow.stderr
+++ b/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
index 4857c2fb446..4857c2fb446 100644
--- a/src/test/ui/issue-17718-const-naming.rs
+++ b/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
index 9636db31390..9636db31390 100644
--- a/src/test/ui/issue-17718-const-naming.stderr
+++ b/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
index 523a387956a..523a387956a 100644
--- a/src/test/ui/compile-fail-migration/issue-17718-const-privacy.rs
+++ b/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
index a453e599c8b..a453e599c8b 100644
--- a/src/test/ui/compile-fail-migration/issue-17718-const-privacy.stderr
+++ b/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
index 9b7ed463499..9b7ed463499 100644
--- a/src/test/ui/issue-17718-constants-not-static.rs
+++ b/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
index 61d8399aba9..61d8399aba9 100644
--- a/src/test/ui/issue-17718-constants-not-static.stderr
+++ b/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
index b9f5e98b6fa..b9f5e98b6fa 100644
--- a/src/test/ui/issue-17718-patterns.rs
+++ b/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
index 13cab9a08b1..13cab9a08b1 100644
--- a/src/test/ui/issue-17718-patterns.stderr
+++ b/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
index 586cfebcd16..586cfebcd16 100644
--- a/src/test/ui/issue-17718-references.rs
+++ b/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
index 6e89a83b308..6e89a83b308 100644
--- a/src/test/ui/issue-17718-references.stderr
+++ b/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
index a5a7117956f..a5a7117956f 100644
--- a/src/test/ui/issue-17718-static-move.rs
+++ b/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
index a6384cfce8f..a6384cfce8f 100644
--- a/src/test/ui/issue-17718-static-move.stderr
+++ b/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
index c5349d4e82b..c5349d4e82b 100644
--- a/src/test/ui/issue-17718-static-sync.rs
+++ b/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
index d6816826a00..d6816826a00 100644
--- a/src/test/ui/issue-17718-static-sync.stderr
+++ b/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
index b9931e45bd2..b9931e45bd2 100644
--- a/src/test/ui/issue-17728.nll.stderr
+++ b/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
index 8516a8ea52e..8516a8ea52e 100644
--- a/src/test/ui/issue-17728.rs
+++ b/src/test/ui/issues/issue-17728.rs
diff --git a/src/test/ui/issue-17728.stderr b/src/test/ui/issues/issue-17728.stderr
index e46c48c4c39..e46c48c4c39 100644
--- a/src/test/ui/issue-17728.stderr
+++ b/src/test/ui/issues/issue-17728.stderr
diff --git a/src/test/ui/issue-17740.rs b/src/test/ui/issues/issue-17740.rs
index 1d5ef4360dc..1d5ef4360dc 100644
--- a/src/test/ui/issue-17740.rs
+++ b/src/test/ui/issues/issue-17740.rs
diff --git a/src/test/ui/issue-17740.stderr b/src/test/ui/issues/issue-17740.stderr
index e4f5485953c..e4f5485953c 100644
--- a/src/test/ui/issue-17740.stderr
+++ b/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
index c51a72f885d..c51a72f885d 100644
--- a/src/test/ui/issue-17758.nll.stderr
+++ b/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
index a47f5c16a46..a47f5c16a46 100644
--- a/src/test/ui/issue-17758.rs
+++ b/src/test/ui/issues/issue-17758.rs
diff --git a/src/test/ui/issue-17758.stderr b/src/test/ui/issues/issue-17758.stderr
index 3d78b2e2d7f..3d78b2e2d7f 100644
--- a/src/test/ui/issue-17758.stderr
+++ b/src/test/ui/issues/issue-17758.stderr
diff --git a/src/test/ui/issue-17800.rs b/src/test/ui/issues/issue-17800.rs
index f7cae91aa93..f7cae91aa93 100644
--- a/src/test/ui/issue-17800.rs
+++ b/src/test/ui/issues/issue-17800.rs
diff --git a/src/test/ui/issue-17800.stderr b/src/test/ui/issues/issue-17800.stderr
index 2cc562fbd7a..2cc562fbd7a 100644
--- a/src/test/ui/issue-17800.stderr
+++ b/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
index a15ccb71aa7..a15ccb71aa7 100644
--- a/src/test/ui/issue-17904-2.rs
+++ b/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
index 00013d4d52b..00013d4d52b 100644
--- a/src/test/ui/issue-17904-2.stderr
+++ b/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
index f11d482ea16..f11d482ea16 100644
--- a/src/test/ui/issue-17905.rs
+++ b/src/test/ui/issues/issue-17905.rs
diff --git a/src/test/ui/issue-17905.stderr b/src/test/ui/issues/issue-17905.stderr
index 1a7aba17480..1a7aba17480 100644
--- a/src/test/ui/issue-17905.stderr
+++ b/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
index 80e5f2b6e21..80e5f2b6e21 100644
--- a/src/test/ui/compile-fail-migration/issue-17913.rs
+++ b/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
index ca8a28c0fd7..ca8a28c0fd7 100644
--- a/src/test/ui/compile-fail-migration/issue-17913.stderr
+++ b/src/test/ui/issues/issue-17913.stderr
diff --git a/src/test/ui/issue-17933.rs b/src/test/ui/issues/issue-17933.rs
index 049a0665c54..049a0665c54 100644
--- a/src/test/ui/issue-17933.rs
+++ b/src/test/ui/issues/issue-17933.rs
diff --git a/src/test/ui/issue-17933.stderr b/src/test/ui/issues/issue-17933.stderr
index ec0f4785c8f..ec0f4785c8f 100644
--- a/src/test/ui/issue-17933.stderr
+++ b/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
index 67a5e3eaec7..67a5e3eaec7 100644
--- a/src/test/ui/issue-17954.nll.stderr
+++ b/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
index ce554a72548..ce554a72548 100644
--- a/src/test/ui/issue-17954.rs
+++ b/src/test/ui/issues/issue-17954.rs
diff --git a/src/test/ui/issue-17954.stderr b/src/test/ui/issues/issue-17954.stderr
index 76858a9b097..76858a9b097 100644
--- a/src/test/ui/issue-17954.stderr
+++ b/src/test/ui/issues/issue-17954.stderr
diff --git a/src/test/ui/issue-17959.rs b/src/test/ui/issues/issue-17959.rs
index 37c8173c4f6..37c8173c4f6 100644
--- a/src/test/ui/issue-17959.rs
+++ b/src/test/ui/issues/issue-17959.rs
diff --git a/src/test/ui/issue-17959.stderr b/src/test/ui/issues/issue-17959.stderr
index 626b670ae35..626b670ae35 100644
--- a/src/test/ui/issue-17959.stderr
+++ b/src/test/ui/issues/issue-17959.stderr
diff --git a/src/test/ui/issue-17994.rs b/src/test/ui/issues/issue-17994.rs
index 25141b9b825..25141b9b825 100644
--- a/src/test/ui/issue-17994.rs
+++ b/src/test/ui/issues/issue-17994.rs
diff --git a/src/test/ui/issue-17994.stderr b/src/test/ui/issues/issue-17994.stderr
index 77bcc469538..77bcc469538 100644
--- a/src/test/ui/issue-17994.stderr
+++ b/src/test/ui/issues/issue-17994.stderr
diff --git a/src/test/ui/issue-17999.rs b/src/test/ui/issues/issue-17999.rs
index 88945f80eae..88945f80eae 100644
--- a/src/test/ui/issue-17999.rs
+++ b/src/test/ui/issues/issue-17999.rs
diff --git a/src/test/ui/issue-17999.stderr b/src/test/ui/issues/issue-17999.stderr
index 1a24015da54..1a24015da54 100644
--- a/src/test/ui/issue-17999.stderr
+++ b/src/test/ui/issues/issue-17999.stderr
diff --git a/src/test/ui/issue-18058.rs b/src/test/ui/issues/issue-18058.rs
index 4c815e689d4..4c815e689d4 100644
--- a/src/test/ui/issue-18058.rs
+++ b/src/test/ui/issues/issue-18058.rs
diff --git a/src/test/ui/issue-18058.stderr b/src/test/ui/issues/issue-18058.stderr
index ded375a9332..ded375a9332 100644
--- a/src/test/ui/issue-18058.stderr
+++ b/src/test/ui/issues/issue-18058.stderr
diff --git a/src/test/ui/issue-18107.rs b/src/test/ui/issues/issue-18107.rs
index 260038b7add..260038b7add 100644
--- a/src/test/ui/issue-18107.rs
+++ b/src/test/ui/issues/issue-18107.rs
diff --git a/src/test/ui/issue-18107.stderr b/src/test/ui/issues/issue-18107.stderr
index c813e290b9e..c813e290b9e 100644
--- a/src/test/ui/issue-18107.stderr
+++ b/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
index 6efe532b5fd..6efe532b5fd 100644
--- a/src/test/ui/issue-18118-2.rs
+++ b/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
index c0b306140c5..c0b306140c5 100644
--- a/src/test/ui/issue-18118-2.stderr
+++ b/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
index 860359b5937..860359b5937 100644
--- a/src/test/ui/issue-18118.nll.stderr
+++ b/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
index 7194c159c1e..7194c159c1e 100644
--- a/src/test/ui/issue-18118.rs
+++ b/src/test/ui/issues/issue-18118.rs
diff --git a/src/test/ui/issue-18118.stderr b/src/test/ui/issues/issue-18118.stderr
index 2d83b86e5f4..2d83b86e5f4 100644
--- a/src/test/ui/issue-18118.stderr
+++ b/src/test/ui/issues/issue-18118.stderr
diff --git a/src/test/ui/issue-18119.rs b/src/test/ui/issues/issue-18119.rs
index 412f7566f47..412f7566f47 100644
--- a/src/test/ui/issue-18119.rs
+++ b/src/test/ui/issues/issue-18119.rs
diff --git a/src/test/ui/issue-18119.stderr b/src/test/ui/issues/issue-18119.stderr
index e0e2d089b7b..e0e2d089b7b 100644
--- a/src/test/ui/issue-18119.stderr
+++ b/src/test/ui/issues/issue-18119.stderr
diff --git a/src/test/ui/issue-18159.rs b/src/test/ui/issues/issue-18159.rs
index 8991eded3d6..8991eded3d6 100644
--- a/src/test/ui/issue-18159.rs
+++ b/src/test/ui/issues/issue-18159.rs
diff --git a/src/test/ui/issue-18159.stderr b/src/test/ui/issues/issue-18159.stderr
index 084e859111b..084e859111b 100644
--- a/src/test/ui/issue-18159.stderr
+++ b/src/test/ui/issues/issue-18159.stderr
diff --git a/src/test/ui/issue-18183.rs b/src/test/ui/issues/issue-18183.rs
index 2cad4a3175f..2cad4a3175f 100644
--- a/src/test/ui/issue-18183.rs
+++ b/src/test/ui/issues/issue-18183.rs
diff --git a/src/test/ui/issue-18183.stderr b/src/test/ui/issues/issue-18183.stderr
index 169a3019d52..169a3019d52 100644
--- a/src/test/ui/issue-18183.stderr
+++ b/src/test/ui/issues/issue-18183.stderr
diff --git a/src/test/ui/issue-18294.rs b/src/test/ui/issues/issue-18294.rs
index 28dc6846f69..28dc6846f69 100644
--- a/src/test/ui/issue-18294.rs
+++ b/src/test/ui/issues/issue-18294.rs
diff --git a/src/test/ui/issue-18294.stderr b/src/test/ui/issues/issue-18294.stderr
index 0b94e778d37..0b94e778d37 100644
--- a/src/test/ui/issue-18294.stderr
+++ b/src/test/ui/issues/issue-18294.stderr
diff --git a/src/test/ui/issue-18389.rs b/src/test/ui/issues/issue-18389.rs
index aad3d52153a..aad3d52153a 100644
--- a/src/test/ui/issue-18389.rs
+++ b/src/test/ui/issues/issue-18389.rs
diff --git a/src/test/ui/issue-18389.stderr b/src/test/ui/issues/issue-18389.stderr
index 6f067301d04..6f067301d04 100644
--- a/src/test/ui/issue-18389.stderr
+++ b/src/test/ui/issues/issue-18389.stderr
diff --git a/src/test/ui/issue-18400.rs b/src/test/ui/issues/issue-18400.rs
index dd17189aeea..dd17189aeea 100644
--- a/src/test/ui/issue-18400.rs
+++ b/src/test/ui/issues/issue-18400.rs
diff --git a/src/test/ui/issue-18400.stderr b/src/test/ui/issues/issue-18400.stderr
index 2426d429ca1..2426d429ca1 100644
--- a/src/test/ui/issue-18400.stderr
+++ b/src/test/ui/issues/issue-18400.stderr
diff --git a/src/test/ui/issue-18423.rs b/src/test/ui/issues/issue-18423.rs
index 5945a7a1c9a..5945a7a1c9a 100644
--- a/src/test/ui/issue-18423.rs
+++ b/src/test/ui/issues/issue-18423.rs
diff --git a/src/test/ui/issue-18423.stderr b/src/test/ui/issues/issue-18423.stderr
index 25406198193..25406198193 100644
--- a/src/test/ui/issue-18423.stderr
+++ b/src/test/ui/issues/issue-18423.stderr
diff --git a/src/test/ui/issue-18446.rs b/src/test/ui/issues/issue-18446.rs
index 60afea5a621..60afea5a621 100644
--- a/src/test/ui/issue-18446.rs
+++ b/src/test/ui/issues/issue-18446.rs
diff --git a/src/test/ui/issue-18446.stderr b/src/test/ui/issues/issue-18446.stderr
index d1914fc14f8..d1914fc14f8 100644
--- a/src/test/ui/issue-18446.stderr
+++ b/src/test/ui/issues/issue-18446.stderr
diff --git a/src/test/ui/issue-18532.rs b/src/test/ui/issues/issue-18532.rs
index 2be5fdcac4e..2be5fdcac4e 100644
--- a/src/test/ui/issue-18532.rs
+++ b/src/test/ui/issues/issue-18532.rs
diff --git a/src/test/ui/issue-18532.stderr b/src/test/ui/issues/issue-18532.stderr
index 8f10cb0f7b0..8f10cb0f7b0 100644
--- a/src/test/ui/issue-18532.stderr
+++ b/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
index b5ed33d07c5..b5ed33d07c5 100644
--- a/src/test/ui/issue-18566.nll.stderr
+++ b/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
index 41e82d0cd89..41e82d0cd89 100644
--- a/src/test/ui/issue-18566.rs
+++ b/src/test/ui/issues/issue-18566.rs
diff --git a/src/test/ui/issue-18566.stderr b/src/test/ui/issues/issue-18566.stderr
index e07fde114f2..e07fde114f2 100644
--- a/src/test/ui/issue-18566.stderr
+++ b/src/test/ui/issues/issue-18566.stderr
diff --git a/src/test/ui/issue-18611.rs b/src/test/ui/issues/issue-18611.rs
index a3ad76e1be0..a3ad76e1be0 100644
--- a/src/test/ui/issue-18611.rs
+++ b/src/test/ui/issues/issue-18611.rs
diff --git a/src/test/ui/issue-18611.stderr b/src/test/ui/issues/issue-18611.stderr
index d890a322f0c..d890a322f0c 100644
--- a/src/test/ui/issue-18611.stderr
+++ b/src/test/ui/issues/issue-18611.stderr
diff --git a/src/test/ui/issue-1871.rs b/src/test/ui/issues/issue-1871.rs
index e4d132c8641..e4d132c8641 100644
--- a/src/test/ui/issue-1871.rs
+++ b/src/test/ui/issues/issue-1871.rs
diff --git a/src/test/ui/issue-1871.stderr b/src/test/ui/issues/issue-1871.stderr
index 0546848df9b..0546848df9b 100644
--- a/src/test/ui/issue-1871.stderr
+++ b/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
index 8acdc73bf0e..8acdc73bf0e 100644
--- a/src/test/ui/issue-18783.nll.stderr
+++ b/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
index 9a7b3781f1e..9a7b3781f1e 100644
--- a/src/test/ui/issue-18783.rs
+++ b/src/test/ui/issues/issue-18783.rs
diff --git a/src/test/ui/issue-18783.stderr b/src/test/ui/issues/issue-18783.stderr
index 64d2809a36a..64d2809a36a 100644
--- a/src/test/ui/issue-18783.stderr
+++ b/src/test/ui/issues/issue-18783.stderr
diff --git a/src/test/ui/issue-18819.rs b/src/test/ui/issues/issue-18819.rs
index c6f60f1cbba..c6f60f1cbba 100644
--- a/src/test/ui/issue-18819.rs
+++ b/src/test/ui/issues/issue-18819.rs
diff --git a/src/test/ui/issue-18819.stderr b/src/test/ui/issues/issue-18819.stderr
index 86926863598..86926863598 100644
--- a/src/test/ui/issue-18819.stderr
+++ b/src/test/ui/issues/issue-18819.stderr
diff --git a/src/test/ui/issue-18919.rs b/src/test/ui/issues/issue-18919.rs
index cc87a0977a0..cc87a0977a0 100644
--- a/src/test/ui/issue-18919.rs
+++ b/src/test/ui/issues/issue-18919.rs
diff --git a/src/test/ui/issue-18919.stderr b/src/test/ui/issues/issue-18919.stderr
index 0e71b0bbedd..0e71b0bbedd 100644
--- a/src/test/ui/issue-18919.stderr
+++ b/src/test/ui/issues/issue-18919.stderr
diff --git a/src/test/ui/issue-18937.rs b/src/test/ui/issues/issue-18937.rs
index f7f84e6452d..f7f84e6452d 100644
--- a/src/test/ui/issue-18937.rs
+++ b/src/test/ui/issues/issue-18937.rs
diff --git a/src/test/ui/issue-18937.stderr b/src/test/ui/issues/issue-18937.stderr
index 7b4c35e0dbe..7b4c35e0dbe 100644
--- a/src/test/ui/issue-18937.stderr
+++ b/src/test/ui/issues/issue-18937.stderr
diff --git a/src/test/ui/issue-18959.rs b/src/test/ui/issues/issue-18959.rs
index 7a6d012a3b6..7a6d012a3b6 100644
--- a/src/test/ui/issue-18959.rs
+++ b/src/test/ui/issues/issue-18959.rs
diff --git a/src/test/ui/issue-18959.stderr b/src/test/ui/issues/issue-18959.stderr
index 42a1c2d4d03..42a1c2d4d03 100644
--- a/src/test/ui/issue-18959.stderr
+++ b/src/test/ui/issues/issue-18959.stderr
diff --git a/src/test/ui/issue-1900.rs b/src/test/ui/issues/issue-1900.rs
index e41bb0030ae..e41bb0030ae 100644
--- a/src/test/ui/issue-1900.rs
+++ b/src/test/ui/issues/issue-1900.rs
diff --git a/src/test/ui/issue-1900.stderr b/src/test/ui/issues/issue-1900.stderr
index 512a923fadd..512a923fadd 100644
--- a/src/test/ui/issue-1900.stderr
+++ b/src/test/ui/issues/issue-1900.stderr
diff --git a/src/test/ui/issue-19086.rs b/src/test/ui/issues/issue-19086.rs
index ba571ce17fd..ba571ce17fd 100644
--- a/src/test/ui/issue-19086.rs
+++ b/src/test/ui/issues/issue-19086.rs
diff --git a/src/test/ui/issue-19086.stderr b/src/test/ui/issues/issue-19086.stderr
index b71d40065c3..b71d40065c3 100644
--- a/src/test/ui/issue-19086.stderr
+++ b/src/test/ui/issues/issue-19086.stderr
diff --git a/src/test/ui/issue-19100.fixed b/src/test/ui/issues/issue-19100.fixed
index 3ced913ae11..3ced913ae11 100644
--- a/src/test/ui/issue-19100.fixed
+++ b/src/test/ui/issues/issue-19100.fixed
diff --git a/src/test/ui/issue-19100.rs b/src/test/ui/issues/issue-19100.rs
index e073bf90761..e073bf90761 100644
--- a/src/test/ui/issue-19100.rs
+++ b/src/test/ui/issues/issue-19100.rs
diff --git a/src/test/ui/issue-19100.stderr b/src/test/ui/issues/issue-19100.stderr
index 34dc29c63df..34dc29c63df 100644
--- a/src/test/ui/issue-19100.stderr
+++ b/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
index 32059bf0af1..32059bf0af1 100644
--- a/src/test/ui/compile-fail-migration/issue-19163.nll.stderr
+++ b/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
index cd6f7c4fd8f..cd6f7c4fd8f 100644
--- a/src/test/ui/compile-fail-migration/issue-19163.rs
+++ b/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
index f7e65e18326..f7e65e18326 100644
--- a/src/test/ui/compile-fail-migration/issue-19163.stderr
+++ b/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
index 97dd290a45b..97dd290a45b 100644
--- a/src/test/ui/compile-fail-migration/issue-1920-1.rs
+++ b/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
index bd823ad6fb6..bd823ad6fb6 100644
--- a/src/test/ui/compile-fail-migration/issue-1920-1.stderr
+++ b/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
index 2af6e2cc991..2af6e2cc991 100644
--- a/src/test/ui/compile-fail-migration/issue-1920-2.rs
+++ b/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
index cf98a893a18..cf98a893a18 100644
--- a/src/test/ui/compile-fail-migration/issue-1920-2.stderr
+++ b/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
index fa6efea845f..fa6efea845f 100644
--- a/src/test/ui/compile-fail-migration/issue-1920-3.rs
+++ b/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
index 6f5efd0dc4e..6f5efd0dc4e 100644
--- a/src/test/ui/compile-fail-migration/issue-1920-3.stderr
+++ b/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
index df34aab4b8f..df34aab4b8f 100644
--- a/src/test/ui/issue-19244-1.rs
+++ b/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
index 28e66b2d974..28e66b2d974 100644
--- a/src/test/ui/issue-19244-1.stderr
+++ b/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
index 864f8f6b54e..864f8f6b54e 100644
--- a/src/test/ui/issue-19244-2.rs
+++ b/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
index 3969c77f24d..3969c77f24d 100644
--- a/src/test/ui/issue-19244-2.stderr
+++ b/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
index 322952ffef1..322952ffef1 100644
--- a/src/test/ui/issue-19380.rs
+++ b/src/test/ui/issues/issue-19380.rs
diff --git a/src/test/ui/issue-19380.stderr b/src/test/ui/issues/issue-19380.stderr
index a251d3b2990..a251d3b2990 100644
--- a/src/test/ui/issue-19380.stderr
+++ b/src/test/ui/issues/issue-19380.stderr
diff --git a/src/test/ui/issue-19482.rs b/src/test/ui/issues/issue-19482.rs
index b54f008f8ce..b54f008f8ce 100644
--- a/src/test/ui/issue-19482.rs
+++ b/src/test/ui/issues/issue-19482.rs
diff --git a/src/test/ui/issue-19482.stderr b/src/test/ui/issues/issue-19482.stderr
index 5e2d427ab72..5e2d427ab72 100644
--- a/src/test/ui/issue-19482.stderr
+++ b/src/test/ui/issues/issue-19482.stderr
diff --git a/src/test/ui/issue-19498.rs b/src/test/ui/issues/issue-19498.rs
index 30eea2efd15..30eea2efd15 100644
--- a/src/test/ui/issue-19498.rs
+++ b/src/test/ui/issues/issue-19498.rs
diff --git a/src/test/ui/issue-19498.stderr b/src/test/ui/issues/issue-19498.stderr
index 839ab778061..839ab778061 100644
--- a/src/test/ui/issue-19498.stderr
+++ b/src/test/ui/issues/issue-19498.stderr
diff --git a/src/test/ui/issue-19521.rs b/src/test/ui/issues/issue-19521.rs
index 93d95ca0b0f..93d95ca0b0f 100644
--- a/src/test/ui/issue-19521.rs
+++ b/src/test/ui/issues/issue-19521.rs
diff --git a/src/test/ui/issue-19521.stderr b/src/test/ui/issues/issue-19521.stderr
index 8f81bcbd4c4..8f81bcbd4c4 100644
--- a/src/test/ui/issue-19521.stderr
+++ b/src/test/ui/issues/issue-19521.stderr
diff --git a/src/test/ui/issue-19538.rs b/src/test/ui/issues/issue-19538.rs
index a6190500582..a6190500582 100644
--- a/src/test/ui/issue-19538.rs
+++ b/src/test/ui/issues/issue-19538.rs
diff --git a/src/test/ui/issue-19538.stderr b/src/test/ui/issues/issue-19538.stderr
index 3cd73ad9d45..3cd73ad9d45 100644
--- a/src/test/ui/issue-19538.stderr
+++ b/src/test/ui/issues/issue-19538.stderr
diff --git a/src/test/ui/issue-19601.rs b/src/test/ui/issues/issue-19601.rs
index 02b4932cea8..02b4932cea8 100644
--- a/src/test/ui/issue-19601.rs
+++ b/src/test/ui/issues/issue-19601.rs
diff --git a/src/test/ui/issue-19601.stderr b/src/test/ui/issues/issue-19601.stderr
index 594d76605fe..594d76605fe 100644
--- a/src/test/ui/issue-19601.stderr
+++ b/src/test/ui/issues/issue-19601.stderr
diff --git a/src/test/ui/issue-1962.rs b/src/test/ui/issues/issue-1962.rs
index 9de3040bb61..9de3040bb61 100644
--- a/src/test/ui/issue-1962.rs
+++ b/src/test/ui/issues/issue-1962.rs
diff --git a/src/test/ui/issue-1962.stderr b/src/test/ui/issues/issue-1962.stderr
index b7c2bd84481..b7c2bd84481 100644
--- a/src/test/ui/issue-1962.stderr
+++ b/src/test/ui/issues/issue-1962.stderr
diff --git a/src/test/ui/issue-19660.rs b/src/test/ui/issues/issue-19660.rs
index c4b871a28c5..c4b871a28c5 100644
--- a/src/test/ui/issue-19660.rs
+++ b/src/test/ui/issues/issue-19660.rs
diff --git a/src/test/ui/issue-19660.stderr b/src/test/ui/issues/issue-19660.stderr
index f5d903f38eb..f5d903f38eb 100644
--- a/src/test/ui/issue-19660.stderr
+++ b/src/test/ui/issues/issue-19660.stderr
diff --git a/src/test/ui/issue-19692.rs b/src/test/ui/issues/issue-19692.rs
index ca1715445e5..ca1715445e5 100644
--- a/src/test/ui/issue-19692.rs
+++ b/src/test/ui/issues/issue-19692.rs
diff --git a/src/test/ui/issue-19692.stderr b/src/test/ui/issues/issue-19692.stderr
index 33361ff8488..33361ff8488 100644
--- a/src/test/ui/issue-19692.stderr
+++ b/src/test/ui/issues/issue-19692.stderr
diff --git a/src/test/ui/issue-19707.rs b/src/test/ui/issues/issue-19707.rs
index 377aef2f7d7..377aef2f7d7 100644
--- a/src/test/ui/issue-19707.rs
+++ b/src/test/ui/issues/issue-19707.rs
diff --git a/src/test/ui/issue-19707.stderr b/src/test/ui/issues/issue-19707.stderr
index 56088d38aaf..56088d38aaf 100644
--- a/src/test/ui/issue-19707.stderr
+++ b/src/test/ui/issues/issue-19707.stderr
diff --git a/src/test/ui/issue-19734.rs b/src/test/ui/issues/issue-19734.rs
index a3820d20aac..a3820d20aac 100644
--- a/src/test/ui/issue-19734.rs
+++ b/src/test/ui/issues/issue-19734.rs
diff --git a/src/test/ui/issue-19734.stderr b/src/test/ui/issues/issue-19734.stderr
index 1d07f4dedc3..1d07f4dedc3 100644
--- a/src/test/ui/issue-19734.stderr
+++ b/src/test/ui/issues/issue-19734.stderr
diff --git a/src/test/ui/issue-19883.rs b/src/test/ui/issues/issue-19883.rs
index 9b6a87702a9..9b6a87702a9 100644
--- a/src/test/ui/issue-19883.rs
+++ b/src/test/ui/issues/issue-19883.rs
diff --git a/src/test/ui/issue-19883.stderr b/src/test/ui/issues/issue-19883.stderr
index b4262b4cdb3..b4262b4cdb3 100644
--- a/src/test/ui/issue-19883.stderr
+++ b/src/test/ui/issues/issue-19883.stderr
diff --git a/src/test/ui/issue-19922.rs b/src/test/ui/issues/issue-19922.rs
index a8350fe0986..a8350fe0986 100644
--- a/src/test/ui/issue-19922.rs
+++ b/src/test/ui/issues/issue-19922.rs
diff --git a/src/test/ui/issue-19922.stderr b/src/test/ui/issues/issue-19922.stderr
index a5bc579e192..a5bc579e192 100644
--- a/src/test/ui/issue-19922.stderr
+++ b/src/test/ui/issues/issue-19922.stderr
diff --git a/src/test/ui/issue-19982.rs b/src/test/ui/issues/issue-19982.rs
index 9dbca997341..9dbca997341 100644
--- a/src/test/ui/issue-19982.rs
+++ b/src/test/ui/issues/issue-19982.rs
diff --git a/src/test/ui/issue-19982.stderr b/src/test/ui/issues/issue-19982.stderr
index 9f13ba640a9..9f13ba640a9 100644
--- a/src/test/ui/issue-19982.stderr
+++ b/src/test/ui/issues/issue-19982.stderr
diff --git a/src/test/ui/issue-19991.rs b/src/test/ui/issues/issue-19991.rs
index e07dfaf9fe5..e07dfaf9fe5 100644
--- a/src/test/ui/issue-19991.rs
+++ b/src/test/ui/issues/issue-19991.rs
diff --git a/src/test/ui/issue-19991.stderr b/src/test/ui/issues/issue-19991.stderr
index 45b2ef8b280..45b2ef8b280 100644
--- a/src/test/ui/issue-19991.stderr
+++ b/src/test/ui/issues/issue-19991.stderr
diff --git a/src/test/ui/issue-20005.rs b/src/test/ui/issues/issue-20005.rs
index 8db09182fa3..8db09182fa3 100644
--- a/src/test/ui/issue-20005.rs
+++ b/src/test/ui/issues/issue-20005.rs
diff --git a/src/test/ui/issue-20005.stderr b/src/test/ui/issues/issue-20005.stderr
index b0b38c97462..b0b38c97462 100644
--- a/src/test/ui/issue-20005.stderr
+++ b/src/test/ui/issues/issue-20005.stderr
diff --git a/src/test/ui/issue-20162.rs b/src/test/ui/issues/issue-20162.rs
index b2f3a2da516..b2f3a2da516 100644
--- a/src/test/ui/issue-20162.rs
+++ b/src/test/ui/issues/issue-20162.rs
diff --git a/src/test/ui/issue-20162.stderr b/src/test/ui/issues/issue-20162.stderr
index 0fb7009d574..0fb7009d574 100644
--- a/src/test/ui/issue-20162.stderr
+++ b/src/test/ui/issues/issue-20162.stderr
diff --git a/src/test/ui/issue-20225.rs b/src/test/ui/issues/issue-20225.rs
index da98f21e461..da98f21e461 100644
--- a/src/test/ui/issue-20225.rs
+++ b/src/test/ui/issues/issue-20225.rs
diff --git a/src/test/ui/issue-20225.stderr b/src/test/ui/issues/issue-20225.stderr
index 7813dc5c11d..7813dc5c11d 100644
--- a/src/test/ui/issue-20225.stderr
+++ b/src/test/ui/issues/issue-20225.stderr
diff --git a/src/test/ui/issue-20261.rs b/src/test/ui/issues/issue-20261.rs
index bb4dbdcd0cb..bb4dbdcd0cb 100644
--- a/src/test/ui/issue-20261.rs
+++ b/src/test/ui/issues/issue-20261.rs
diff --git a/src/test/ui/issue-20261.stderr b/src/test/ui/issues/issue-20261.stderr
index 6cdddcff929..6cdddcff929 100644
--- a/src/test/ui/issue-20261.stderr
+++ b/src/test/ui/issues/issue-20261.stderr
diff --git a/src/test/ui/issue-20313.rs b/src/test/ui/issues/issue-20313.rs
index dfb23c05036..dfb23c05036 100644
--- a/src/test/ui/issue-20313.rs
+++ b/src/test/ui/issues/issue-20313.rs
diff --git a/src/test/ui/issue-20313.stderr b/src/test/ui/issues/issue-20313.stderr
index 95afda1b514..95afda1b514 100644
--- a/src/test/ui/issue-20313.stderr
+++ b/src/test/ui/issues/issue-20313.stderr
diff --git a/src/test/ui/issue-20413.rs b/src/test/ui/issues/issue-20413.rs
index a48c03aa178..a48c03aa178 100644
--- a/src/test/ui/issue-20413.rs
+++ b/src/test/ui/issues/issue-20413.rs
diff --git a/src/test/ui/issue-20413.stderr b/src/test/ui/issues/issue-20413.stderr
index bfb2665e867..bfb2665e867 100644
--- a/src/test/ui/issue-20413.stderr
+++ b/src/test/ui/issues/issue-20413.stderr
diff --git a/src/test/ui/issue-20433.rs b/src/test/ui/issues/issue-20433.rs
index f760cd59968..f760cd59968 100644
--- a/src/test/ui/issue-20433.rs
+++ b/src/test/ui/issues/issue-20433.rs
diff --git a/src/test/ui/issue-20433.stderr b/src/test/ui/issues/issue-20433.stderr
index 9800c9b3b58..9800c9b3b58 100644
--- a/src/test/ui/issue-20433.stderr
+++ b/src/test/ui/issues/issue-20433.stderr
diff --git a/src/test/ui/issue-20605.rs b/src/test/ui/issues/issue-20605.rs
index 60d012ab134..60d012ab134 100644
--- a/src/test/ui/issue-20605.rs
+++ b/src/test/ui/issues/issue-20605.rs
diff --git a/src/test/ui/issue-20605.stderr b/src/test/ui/issues/issue-20605.stderr
index fb32283ddf7..fb32283ddf7 100644
--- a/src/test/ui/issue-20605.stderr
+++ b/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
index 3e29383d62c..3e29383d62c 100644
--- a/src/test/ui/issue-20616-1.rs
+++ b/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
index 1ee965d2186..1ee965d2186 100644
--- a/src/test/ui/issue-20616-1.stderr
+++ b/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
index 1ec7a74559a..1ec7a74559a 100644
--- a/src/test/ui/issue-20616-2.rs
+++ b/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
index 1c103b21a18..1c103b21a18 100644
--- a/src/test/ui/issue-20616-2.stderr
+++ b/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
index 885fd246547..885fd246547 100644
--- a/src/test/ui/issue-20616-3.rs
+++ b/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
index b4b40b3637d..b4b40b3637d 100644
--- a/src/test/ui/issue-20616-3.stderr
+++ b/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
index 0dbe92fc1bc..0dbe92fc1bc 100644
--- a/src/test/ui/issue-20616-4.rs
+++ b/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
index 0a734e4fdcd..0a734e4fdcd 100644
--- a/src/test/ui/issue-20616-4.stderr
+++ b/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
index 794e5178f4b..794e5178f4b 100644
--- a/src/test/ui/issue-20616-5.rs
+++ b/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
index 504be1632ba..504be1632ba 100644
--- a/src/test/ui/issue-20616-5.stderr
+++ b/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
index fe91751a4a0..fe91751a4a0 100644
--- a/src/test/ui/issue-20616-6.rs
+++ b/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
index 41dea4137af..41dea4137af 100644
--- a/src/test/ui/issue-20616-6.stderr
+++ b/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
index 184ad027102..184ad027102 100644
--- a/src/test/ui/issue-20616-7.rs
+++ b/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
index caf66895fab..caf66895fab 100644
--- a/src/test/ui/issue-20616-7.stderr
+++ b/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
index 5cdec33e94b..5cdec33e94b 100644
--- a/src/test/ui/issue-20616-8.rs
+++ b/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
index 6d840fc562b..6d840fc562b 100644
--- a/src/test/ui/issue-20616-8.stderr
+++ b/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
index 7995addb692..7995addb692 100644
--- a/src/test/ui/issue-20616-9.rs
+++ b/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
index f9cc4e0b480..f9cc4e0b480 100644
--- a/src/test/ui/issue-20616-9.stderr
+++ b/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
index 0a4e7c8ee6b..0a4e7c8ee6b 100644
--- a/src/test/ui/issue-20692.rs
+++ b/src/test/ui/issues/issue-20692.rs
diff --git a/src/test/ui/issue-20692.stderr b/src/test/ui/issues/issue-20692.stderr
index 156ebd920f0..156ebd920f0 100644
--- a/src/test/ui/issue-20692.stderr
+++ b/src/test/ui/issues/issue-20692.stderr
diff --git a/src/test/ui/issue-20714.rs b/src/test/ui/issues/issue-20714.rs
index cb322f00723..cb322f00723 100644
--- a/src/test/ui/issue-20714.rs
+++ b/src/test/ui/issues/issue-20714.rs
diff --git a/src/test/ui/issue-20714.stderr b/src/test/ui/issues/issue-20714.stderr
index 1ea85ee440e..1ea85ee440e 100644
--- a/src/test/ui/issue-20714.stderr
+++ b/src/test/ui/issues/issue-20714.stderr
diff --git a/src/test/ui/issue-20772.rs b/src/test/ui/issues/issue-20772.rs
index d67c76a1525..d67c76a1525 100644
--- a/src/test/ui/issue-20772.rs
+++ b/src/test/ui/issues/issue-20772.rs
diff --git a/src/test/ui/issue-20772.stderr b/src/test/ui/issues/issue-20772.stderr
index b898962c9cc..b898962c9cc 100644
--- a/src/test/ui/issue-20772.stderr
+++ b/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
index fc94cc423c5..fc94cc423c5 100644
--- a/src/test/ui/issue-20801.nll.stderr
+++ b/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
index d3b97a9c058..d3b97a9c058 100644
--- a/src/test/ui/issue-20801.rs
+++ b/src/test/ui/issues/issue-20801.rs
diff --git a/src/test/ui/issue-20801.stderr b/src/test/ui/issues/issue-20801.stderr
index 3989957b7b4..3989957b7b4 100644
--- a/src/test/ui/issue-20801.stderr
+++ b/src/test/ui/issues/issue-20801.stderr
diff --git a/src/test/ui/issue-20825.rs b/src/test/ui/issues/issue-20825.rs
index cbb987cd512..cbb987cd512 100644
--- a/src/test/ui/issue-20825.rs
+++ b/src/test/ui/issues/issue-20825.rs
diff --git a/src/test/ui/issue-20825.stderr b/src/test/ui/issues/issue-20825.stderr
index e49e3668536..e49e3668536 100644
--- a/src/test/ui/issue-20825.stderr
+++ b/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
index 6ad97d072df..6ad97d072df 100644
--- a/src/test/ui/issue-20831-debruijn.rs
+++ b/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
index 556d8b402c4..556d8b402c4 100644
--- a/src/test/ui/issue-20831-debruijn.stderr
+++ b/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
index 5282ce4bb88..5282ce4bb88 100644
--- a/src/test/ui/issue-20939.rs
+++ b/src/test/ui/issues/issue-20939.rs
diff --git a/src/test/ui/issue-20939.stderr b/src/test/ui/issues/issue-20939.stderr
index c8f7e58540b..c8f7e58540b 100644
--- a/src/test/ui/issue-20939.stderr
+++ b/src/test/ui/issues/issue-20939.stderr
diff --git a/src/test/ui/issue-2111.rs b/src/test/ui/issues/issue-2111.rs
index 8180ce52bdb..8180ce52bdb 100644
--- a/src/test/ui/issue-2111.rs
+++ b/src/test/ui/issues/issue-2111.rs
diff --git a/src/test/ui/issue-2111.stderr b/src/test/ui/issues/issue-2111.stderr
index 5aa1b02779b..5aa1b02779b 100644
--- a/src/test/ui/issue-2111.stderr
+++ b/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
index 457d40e62b0..457d40e62b0 100644
--- a/src/test/ui/compile-fail-migration/issue-21146.rs
+++ b/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
index fab38123ea8..fab38123ea8 100644
--- a/src/test/ui/compile-fail-migration/issue-21146.stderr
+++ b/src/test/ui/issues/issue-21146.stderr
diff --git a/src/test/ui/issue-21160.rs b/src/test/ui/issues/issue-21160.rs
index 0de0ab2269b..0de0ab2269b 100644
--- a/src/test/ui/issue-21160.rs
+++ b/src/test/ui/issues/issue-21160.rs
diff --git a/src/test/ui/issue-21160.stderr b/src/test/ui/issues/issue-21160.stderr
index 75ed9988b89..75ed9988b89 100644
--- a/src/test/ui/issue-21160.stderr
+++ b/src/test/ui/issues/issue-21160.stderr
diff --git a/src/test/ui/issue-21174.rs b/src/test/ui/issues/issue-21174.rs
index 9d9b7e48043..9d9b7e48043 100644
--- a/src/test/ui/issue-21174.rs
+++ b/src/test/ui/issues/issue-21174.rs
diff --git a/src/test/ui/issue-21174.stderr b/src/test/ui/issues/issue-21174.stderr
index 391ed1e7698..391ed1e7698 100644
--- a/src/test/ui/issue-21174.stderr
+++ b/src/test/ui/issues/issue-21174.stderr
diff --git a/src/test/ui/issue-21177.rs b/src/test/ui/issues/issue-21177.rs
index 9da57877a09..9da57877a09 100644
--- a/src/test/ui/issue-21177.rs
+++ b/src/test/ui/issues/issue-21177.rs
diff --git a/src/test/ui/issue-21177.stderr b/src/test/ui/issues/issue-21177.stderr
index c924fb2ee94..c924fb2ee94 100644
--- a/src/test/ui/issue-21177.stderr
+++ b/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
index 2bce838c1cf..2bce838c1cf 100644
--- a/src/test/ui/compile-fail-migration/issue-21202.rs
+++ b/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
index 9d17ff64769..9d17ff64769 100644
--- a/src/test/ui/compile-fail-migration/issue-21202.stderr
+++ b/src/test/ui/issues/issue-21202.stderr
diff --git a/src/test/ui/issue-21332.rs b/src/test/ui/issues/issue-21332.rs
index db3334834d4..db3334834d4 100644
--- a/src/test/ui/issue-21332.rs
+++ b/src/test/ui/issues/issue-21332.rs
diff --git a/src/test/ui/issue-21332.stderr b/src/test/ui/issues/issue-21332.stderr
index b5fbb71f8ca..b5fbb71f8ca 100644
--- a/src/test/ui/issue-21332.stderr
+++ b/src/test/ui/issues/issue-21332.stderr
diff --git a/src/test/ui/issue-21356.rs b/src/test/ui/issues/issue-21356.rs
index f66c09291cc..f66c09291cc 100644
--- a/src/test/ui/issue-21356.rs
+++ b/src/test/ui/issues/issue-21356.rs
diff --git a/src/test/ui/issue-21356.stderr b/src/test/ui/issues/issue-21356.stderr
index 5787476c2f2..5787476c2f2 100644
--- a/src/test/ui/issue-21356.stderr
+++ b/src/test/ui/issues/issue-21356.stderr
diff --git a/src/test/ui/issue-21449.rs b/src/test/ui/issues/issue-21449.rs
index cc44cf88f09..cc44cf88f09 100644
--- a/src/test/ui/issue-21449.rs
+++ b/src/test/ui/issues/issue-21449.rs
diff --git a/src/test/ui/issue-21449.stderr b/src/test/ui/issues/issue-21449.stderr
index d84b3b99c1f..d84b3b99c1f 100644
--- a/src/test/ui/issue-21449.stderr
+++ b/src/test/ui/issues/issue-21449.stderr
diff --git a/src/test/ui/issue-2149.rs b/src/test/ui/issues/issue-2149.rs
index 256c5d8e6f7..256c5d8e6f7 100644
--- a/src/test/ui/issue-2149.rs
+++ b/src/test/ui/issues/issue-2149.rs
diff --git a/src/test/ui/issue-2149.stderr b/src/test/ui/issues/issue-2149.stderr
index 4ae9032cd1a..4ae9032cd1a 100644
--- a/src/test/ui/issue-2149.stderr
+++ b/src/test/ui/issues/issue-2149.stderr
diff --git a/src/test/ui/issue-2150.rs b/src/test/ui/issues/issue-2150.rs
index 8b109b0a5c0..8b109b0a5c0 100644
--- a/src/test/ui/issue-2150.rs
+++ b/src/test/ui/issues/issue-2150.rs
diff --git a/src/test/ui/issue-2150.stderr b/src/test/ui/issues/issue-2150.stderr
index c1944efab8b..c1944efab8b 100644
--- a/src/test/ui/issue-2150.stderr
+++ b/src/test/ui/issues/issue-2150.stderr
diff --git a/src/test/ui/issue-2151.rs b/src/test/ui/issues/issue-2151.rs
index 3cf971f3f8d..3cf971f3f8d 100644
--- a/src/test/ui/issue-2151.rs
+++ b/src/test/ui/issues/issue-2151.rs
diff --git a/src/test/ui/issue-2151.stderr b/src/test/ui/issues/issue-2151.stderr
index 516c5287b31..516c5287b31 100644
--- a/src/test/ui/issue-2151.stderr
+++ b/src/test/ui/issues/issue-2151.stderr
diff --git a/src/test/ui/issue-21546.rs b/src/test/ui/issues/issue-21546.rs
index da1669bc913..da1669bc913 100644
--- a/src/test/ui/issue-21546.rs
+++ b/src/test/ui/issues/issue-21546.rs
diff --git a/src/test/ui/issue-21546.stderr b/src/test/ui/issues/issue-21546.stderr
index bff79e52aa1..bff79e52aa1 100644
--- a/src/test/ui/issue-21546.stderr
+++ b/src/test/ui/issues/issue-21546.stderr
diff --git a/src/test/ui/issue-21554.rs b/src/test/ui/issues/issue-21554.rs
index 1b87862a056..1b87862a056 100644
--- a/src/test/ui/issue-21554.rs
+++ b/src/test/ui/issues/issue-21554.rs
diff --git a/src/test/ui/issue-21554.stderr b/src/test/ui/issues/issue-21554.stderr
index be7762f1aa2..be7762f1aa2 100644
--- a/src/test/ui/issue-21554.stderr
+++ b/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
index 5fe8dc45ccc..5fe8dc45ccc 100644
--- a/src/test/ui/issue-21600.nll.stderr
+++ b/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
index e4dfad2433c..e4dfad2433c 100644
--- a/src/test/ui/issue-21600.rs
+++ b/src/test/ui/issues/issue-21600.rs
diff --git a/src/test/ui/issue-21600.stderr b/src/test/ui/issues/issue-21600.stderr
index 873dc7448be..873dc7448be 100644
--- a/src/test/ui/issue-21600.stderr
+++ b/src/test/ui/issues/issue-21600.stderr
diff --git a/src/test/ui/issue-21701.rs b/src/test/ui/issues/issue-21701.rs
index f24de2ffe6b..f24de2ffe6b 100644
--- a/src/test/ui/issue-21701.rs
+++ b/src/test/ui/issues/issue-21701.rs
diff --git a/src/test/ui/issue-21701.stderr b/src/test/ui/issues/issue-21701.stderr
index 9fb9a7b51f2..9fb9a7b51f2 100644
--- a/src/test/ui/issue-21701.stderr
+++ b/src/test/ui/issues/issue-21701.stderr
diff --git a/src/test/ui/issue-21763.rs b/src/test/ui/issues/issue-21763.rs
index b4f952c87d4..b4f952c87d4 100644
--- a/src/test/ui/issue-21763.rs
+++ b/src/test/ui/issues/issue-21763.rs
diff --git a/src/test/ui/issue-21763.stderr b/src/test/ui/issues/issue-21763.stderr
index 91db16e0f6d..91db16e0f6d 100644
--- a/src/test/ui/issue-21763.stderr
+++ b/src/test/ui/issues/issue-21763.stderr
diff --git a/src/test/ui/issue-21837.rs b/src/test/ui/issues/issue-21837.rs
index 86506de1ea9..86506de1ea9 100644
--- a/src/test/ui/issue-21837.rs
+++ b/src/test/ui/issues/issue-21837.rs
diff --git a/src/test/ui/issue-21837.stderr b/src/test/ui/issues/issue-21837.stderr
index bbdebeefdd6..bbdebeefdd6 100644
--- a/src/test/ui/issue-21837.stderr
+++ b/src/test/ui/issues/issue-21837.stderr
diff --git a/src/test/ui/issue-21946.rs b/src/test/ui/issues/issue-21946.rs
index 0d652be5c26..0d652be5c26 100644
--- a/src/test/ui/issue-21946.rs
+++ b/src/test/ui/issues/issue-21946.rs
diff --git a/src/test/ui/issue-21946.stderr b/src/test/ui/issues/issue-21946.stderr
index ebb0c0c9ce0..ebb0c0c9ce0 100644
--- a/src/test/ui/issue-21946.stderr
+++ b/src/test/ui/issues/issue-21946.stderr
diff --git a/src/test/ui/issue-21950.rs b/src/test/ui/issues/issue-21950.rs
index f9328a58d09..f9328a58d09 100644
--- a/src/test/ui/issue-21950.rs
+++ b/src/test/ui/issues/issue-21950.rs
diff --git a/src/test/ui/issue-21950.stderr b/src/test/ui/issues/issue-21950.stderr
index a2f74a29aab..a2f74a29aab 100644
--- a/src/test/ui/issue-21950.stderr
+++ b/src/test/ui/issues/issue-21950.stderr
diff --git a/src/test/ui/issue-21974.rs b/src/test/ui/issues/issue-21974.rs
index 6ddfa4c8e3e..6ddfa4c8e3e 100644
--- a/src/test/ui/issue-21974.rs
+++ b/src/test/ui/issues/issue-21974.rs
diff --git a/src/test/ui/issue-21974.stderr b/src/test/ui/issues/issue-21974.stderr
index 4cc28c9ceb5..4cc28c9ceb5 100644
--- a/src/test/ui/issue-21974.stderr
+++ b/src/test/ui/issues/issue-21974.stderr
diff --git a/src/test/ui/issue-22034.rs b/src/test/ui/issues/issue-22034.rs
index 5271ea79917..5271ea79917 100644
--- a/src/test/ui/issue-22034.rs
+++ b/src/test/ui/issues/issue-22034.rs
diff --git a/src/test/ui/issue-22034.stderr b/src/test/ui/issues/issue-22034.stderr
index bac62a1301a..bac62a1301a 100644
--- a/src/test/ui/issue-22034.stderr
+++ b/src/test/ui/issues/issue-22034.stderr
diff --git a/src/test/ui/issue-22037.rs b/src/test/ui/issues/issue-22037.rs
index ffa881b49c5..ffa881b49c5 100644
--- a/src/test/ui/issue-22037.rs
+++ b/src/test/ui/issues/issue-22037.rs
diff --git a/src/test/ui/issue-22037.stderr b/src/test/ui/issues/issue-22037.stderr
index ae739afc704..ae739afc704 100644
--- a/src/test/ui/issue-22037.stderr
+++ b/src/test/ui/issues/issue-22037.stderr
diff --git a/src/test/ui/issue-22289.rs b/src/test/ui/issues/issue-22289.rs
index c23fc4f3344..c23fc4f3344 100644
--- a/src/test/ui/issue-22289.rs
+++ b/src/test/ui/issues/issue-22289.rs
diff --git a/src/test/ui/issue-22289.stderr b/src/test/ui/issues/issue-22289.stderr
index 202b25f1a5b..202b25f1a5b 100644
--- a/src/test/ui/issue-22289.stderr
+++ b/src/test/ui/issues/issue-22289.stderr
diff --git a/src/test/ui/issue-22312.rs b/src/test/ui/issues/issue-22312.rs
index 2128c420630..2128c420630 100644
--- a/src/test/ui/issue-22312.rs
+++ b/src/test/ui/issues/issue-22312.rs
diff --git a/src/test/ui/issue-22312.stderr b/src/test/ui/issues/issue-22312.stderr
index abd712e5c29..abd712e5c29 100644
--- a/src/test/ui/issue-22312.stderr
+++ b/src/test/ui/issues/issue-22312.stderr
diff --git a/src/test/ui/issue-22370.rs b/src/test/ui/issues/issue-22370.rs
index 4613c5977fd..4613c5977fd 100644
--- a/src/test/ui/issue-22370.rs
+++ b/src/test/ui/issues/issue-22370.rs
diff --git a/src/test/ui/issue-22370.stderr b/src/test/ui/issues/issue-22370.stderr
index b3691503fc1..b3691503fc1 100644
--- a/src/test/ui/issue-22370.stderr
+++ b/src/test/ui/issues/issue-22370.stderr
diff --git a/src/test/ui/issue-22384.rs b/src/test/ui/issues/issue-22384.rs
index ae7fb01e057..ae7fb01e057 100644
--- a/src/test/ui/issue-22384.rs
+++ b/src/test/ui/issues/issue-22384.rs
diff --git a/src/test/ui/issue-22384.stderr b/src/test/ui/issues/issue-22384.stderr
index b8cc1e643e5..b8cc1e643e5 100644
--- a/src/test/ui/issue-22384.stderr
+++ b/src/test/ui/issues/issue-22384.stderr
diff --git a/src/test/ui/issue-22434.rs b/src/test/ui/issues/issue-22434.rs
index 6effd02bac8..6effd02bac8 100644
--- a/src/test/ui/issue-22434.rs
+++ b/src/test/ui/issues/issue-22434.rs
diff --git a/src/test/ui/issue-22434.stderr b/src/test/ui/issues/issue-22434.stderr
index 914da801ad4..914da801ad4 100644
--- a/src/test/ui/issue-22434.stderr
+++ b/src/test/ui/issues/issue-22434.stderr
diff --git a/src/test/ui/issue-22468.rs b/src/test/ui/issues/issue-22468.rs
index 50e5dd2955d..50e5dd2955d 100644
--- a/src/test/ui/issue-22468.rs
+++ b/src/test/ui/issues/issue-22468.rs
diff --git a/src/test/ui/issue-22468.stderr b/src/test/ui/issues/issue-22468.stderr
index 034a076fbfe..034a076fbfe 100644
--- a/src/test/ui/issue-22468.stderr
+++ b/src/test/ui/issues/issue-22468.stderr
diff --git a/src/test/ui/issue-22560.rs b/src/test/ui/issues/issue-22560.rs
index b1c636f2ef6..b1c636f2ef6 100644
--- a/src/test/ui/issue-22560.rs
+++ b/src/test/ui/issues/issue-22560.rs
diff --git a/src/test/ui/issue-22560.stderr b/src/test/ui/issues/issue-22560.stderr
index b5524036fae..b5524036fae 100644
--- a/src/test/ui/issue-22560.stderr
+++ b/src/test/ui/issues/issue-22560.stderr
diff --git a/src/test/ui/issue-22599.rs b/src/test/ui/issues/issue-22599.rs
index b9ea3583296..b9ea3583296 100644
--- a/src/test/ui/issue-22599.rs
+++ b/src/test/ui/issues/issue-22599.rs
diff --git a/src/test/ui/issue-22599.stderr b/src/test/ui/issues/issue-22599.stderr
index 19c9b94a430..19c9b94a430 100644
--- a/src/test/ui/issue-22599.stderr
+++ b/src/test/ui/issues/issue-22599.stderr
diff --git a/src/test/ui/issue-22603.rs b/src/test/ui/issues/issue-22603.rs
index d08f916b870..d08f916b870 100644
--- a/src/test/ui/issue-22603.rs
+++ b/src/test/ui/issues/issue-22603.rs
diff --git a/src/test/ui/issue-22603.stderr b/src/test/ui/issues/issue-22603.stderr
index b50a5a25a7a..b50a5a25a7a 100644
--- a/src/test/ui/issue-22603.stderr
+++ b/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
index 1c534ebbd43..1c534ebbd43 100644
--- a/src/test/ui/compile-fail-migration/issue-22638.rs
+++ b/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
index a549c00a341..a549c00a341 100644
--- a/src/test/ui/compile-fail-migration/issue-22638.stderr
+++ b/src/test/ui/issues/issue-22638.stderr
diff --git a/src/test/ui/issue-22644.rs b/src/test/ui/issues/issue-22644.rs
index f787e43dbdf..f787e43dbdf 100644
--- a/src/test/ui/issue-22644.rs
+++ b/src/test/ui/issues/issue-22644.rs
diff --git a/src/test/ui/issue-22644.stderr b/src/test/ui/issues/issue-22644.stderr
index aeb465b2ab2..aeb465b2ab2 100644
--- a/src/test/ui/issue-22644.stderr
+++ b/src/test/ui/issues/issue-22644.stderr
diff --git a/src/test/ui/issue-22673.rs b/src/test/ui/issues/issue-22673.rs
index 2396007c3df..2396007c3df 100644
--- a/src/test/ui/issue-22673.rs
+++ b/src/test/ui/issues/issue-22673.rs
diff --git a/src/test/ui/issue-22673.stderr b/src/test/ui/issues/issue-22673.stderr
index 7e5b80c3711..7e5b80c3711 100644
--- a/src/test/ui/issue-22673.stderr
+++ b/src/test/ui/issues/issue-22673.stderr
diff --git a/src/test/ui/issue-22684.rs b/src/test/ui/issues/issue-22684.rs
index a791758ad17..a791758ad17 100644
--- a/src/test/ui/issue-22684.rs
+++ b/src/test/ui/issues/issue-22684.rs
diff --git a/src/test/ui/issue-22684.stderr b/src/test/ui/issues/issue-22684.stderr
index 2c868bc8778..2c868bc8778 100644
--- a/src/test/ui/issue-22684.stderr
+++ b/src/test/ui/issues/issue-22684.stderr
diff --git a/src/test/ui/issue-22706.rs b/src/test/ui/issues/issue-22706.rs
index 3d9ec0a6581..3d9ec0a6581 100644
--- a/src/test/ui/issue-22706.rs
+++ b/src/test/ui/issues/issue-22706.rs
diff --git a/src/test/ui/issue-22706.stderr b/src/test/ui/issues/issue-22706.stderr
index 2bbb3e5acad..2bbb3e5acad 100644
--- a/src/test/ui/issue-22706.stderr
+++ b/src/test/ui/issues/issue-22706.stderr
diff --git a/src/test/ui/issue-22789.rs b/src/test/ui/issues/issue-22789.rs
index cba1c367bb9..cba1c367bb9 100644
--- a/src/test/ui/issue-22789.rs
+++ b/src/test/ui/issues/issue-22789.rs
diff --git a/src/test/ui/issue-22789.stderr b/src/test/ui/issues/issue-22789.stderr
index afeae9c78ef..afeae9c78ef 100644
--- a/src/test/ui/issue-22789.stderr
+++ b/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
index e3fd9c48a52..e3fd9c48a52 100644
--- a/src/test/ui/issue-2281-part1.rs
+++ b/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
index e88cfe2b2ac..e88cfe2b2ac 100644
--- a/src/test/ui/issue-2281-part1.stderr
+++ b/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
index e0a87b3a174..e0a87b3a174 100644
--- a/src/test/ui/issue-22874.rs
+++ b/src/test/ui/issues/issue-22874.rs
diff --git a/src/test/ui/issue-22874.stderr b/src/test/ui/issues/issue-22874.stderr
index a69ee7c9ff0..a69ee7c9ff0 100644
--- a/src/test/ui/issue-22874.stderr
+++ b/src/test/ui/issues/issue-22874.stderr
diff --git a/src/test/ui/issue-22886.rs b/src/test/ui/issues/issue-22886.rs
index 4aa2571cad0..4aa2571cad0 100644
--- a/src/test/ui/issue-22886.rs
+++ b/src/test/ui/issues/issue-22886.rs
diff --git a/src/test/ui/issue-22886.stderr b/src/test/ui/issues/issue-22886.stderr
index 0e05cbfa7ee..0e05cbfa7ee 100644
--- a/src/test/ui/issue-22886.stderr
+++ b/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
index afb972faaca..afb972faaca 100644
--- a/src/test/ui/issue-22933-1.rs
+++ b/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
index eaebebe3b11..eaebebe3b11 100644
--- a/src/test/ui/issue-22933-1.stderr
+++ b/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
index e887c7760d6..e887c7760d6 100644
--- a/src/test/ui/issue-22933-2.rs
+++ b/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
index 435a89b716f..435a89b716f 100644
--- a/src/test/ui/issue-22933-2.stderr
+++ b/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
index 62adae41adf..62adae41adf 100644
--- a/src/test/ui/issue-22933-3.rs
+++ b/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
index 3d4d2df4d32..3d4d2df4d32 100644
--- a/src/test/ui/issue-22933-3.stderr
+++ b/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
index 5d9b49f486c..5d9b49f486c 100644
--- a/src/test/ui/issue-23024.rs
+++ b/src/test/ui/issues/issue-23024.rs
diff --git a/src/test/ui/issue-23024.stderr b/src/test/ui/issues/issue-23024.stderr
index 39c79d8f14e..39c79d8f14e 100644
--- a/src/test/ui/issue-23024.stderr
+++ b/src/test/ui/issues/issue-23024.stderr
diff --git a/src/test/ui/issue-23041.rs b/src/test/ui/issues/issue-23041.rs
index 1a9bb4c29f3..1a9bb4c29f3 100644
--- a/src/test/ui/issue-23041.rs
+++ b/src/test/ui/issues/issue-23041.rs
diff --git a/src/test/ui/issue-23041.stderr b/src/test/ui/issues/issue-23041.stderr
index e97a97fec09..e97a97fec09 100644
--- a/src/test/ui/issue-23041.stderr
+++ b/src/test/ui/issues/issue-23041.stderr
diff --git a/src/test/ui/issue-23046.rs b/src/test/ui/issues/issue-23046.rs
index 670706b7a9a..670706b7a9a 100644
--- a/src/test/ui/issue-23046.rs
+++ b/src/test/ui/issues/issue-23046.rs
diff --git a/src/test/ui/issue-23046.stderr b/src/test/ui/issues/issue-23046.stderr
index 3e5b4ec91d7..3e5b4ec91d7 100644
--- a/src/test/ui/issue-23046.stderr
+++ b/src/test/ui/issues/issue-23046.stderr
diff --git a/src/test/ui/issue-23073.rs b/src/test/ui/issues/issue-23073.rs
index 2d219177a80..2d219177a80 100644
--- a/src/test/ui/issue-23073.rs
+++ b/src/test/ui/issues/issue-23073.rs
diff --git a/src/test/ui/issue-23073.stderr b/src/test/ui/issues/issue-23073.stderr
index 44b2128af0a..44b2128af0a 100644
--- a/src/test/ui/issue-23073.stderr
+++ b/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
index fc365a4b9aa..fc365a4b9aa 100644
--- a/src/test/ui/issue-23080-2.rs
+++ b/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
index dda7fbd69cf..dda7fbd69cf 100644
--- a/src/test/ui/issue-23080-2.stderr
+++ b/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
index 153b6fd07e6..153b6fd07e6 100644
--- a/src/test/ui/issue-23080.rs
+++ b/src/test/ui/issues/issue-23080.rs
diff --git a/src/test/ui/issue-23080.stderr b/src/test/ui/issues/issue-23080.stderr
index 43e6f296033..43e6f296033 100644
--- a/src/test/ui/issue-23080.stderr
+++ b/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
index 36d8450848d..36d8450848d 100644
--- a/src/test/ui/issue-23122-1.rs
+++ b/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
index a0e5386c111..a0e5386c111 100644
--- a/src/test/ui/issue-23122-1.stderr
+++ b/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
index faaf78f894b..faaf78f894b 100644
--- a/src/test/ui/issue-23122-2.rs
+++ b/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
index c43f8d77823..c43f8d77823 100644
--- a/src/test/ui/issue-23122-2.stderr
+++ b/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
index 17e5317b9fe..17e5317b9fe 100644
--- a/src/test/ui/issue-23173.rs
+++ b/src/test/ui/issues/issue-23173.rs
diff --git a/src/test/ui/issue-23173.stderr b/src/test/ui/issues/issue-23173.stderr
index d58a4d2b8f8..d58a4d2b8f8 100644
--- a/src/test/ui/issue-23173.stderr
+++ b/src/test/ui/issues/issue-23173.stderr
diff --git a/src/test/ui/issue-23217.rs b/src/test/ui/issues/issue-23217.rs
index dc51adf42aa..dc51adf42aa 100644
--- a/src/test/ui/issue-23217.rs
+++ b/src/test/ui/issues/issue-23217.rs
diff --git a/src/test/ui/issue-23217.stderr b/src/test/ui/issues/issue-23217.stderr
index d87f239bca6..d87f239bca6 100644
--- a/src/test/ui/issue-23217.stderr
+++ b/src/test/ui/issues/issue-23217.stderr
diff --git a/src/test/ui/issue-23253.rs b/src/test/ui/issues/issue-23253.rs
index 626604a87a7..626604a87a7 100644
--- a/src/test/ui/issue-23253.rs
+++ b/src/test/ui/issues/issue-23253.rs
diff --git a/src/test/ui/issue-23253.stderr b/src/test/ui/issues/issue-23253.stderr
index f14ee510bd8..f14ee510bd8 100644
--- a/src/test/ui/issue-23253.stderr
+++ b/src/test/ui/issues/issue-23253.stderr
diff --git a/src/test/ui/issue-23281.rs b/src/test/ui/issues/issue-23281.rs
index 5de00eb8f68..5de00eb8f68 100644
--- a/src/test/ui/issue-23281.rs
+++ b/src/test/ui/issues/issue-23281.rs
diff --git a/src/test/ui/issue-23281.stderr b/src/test/ui/issues/issue-23281.stderr
index 78db19d6b06..78db19d6b06 100644
--- a/src/test/ui/issue-23281.stderr
+++ b/src/test/ui/issues/issue-23281.stderr
diff --git a/src/test/ui/issue-2330.rs b/src/test/ui/issues/issue-2330.rs
index f1a282695ac..f1a282695ac 100644
--- a/src/test/ui/issue-2330.rs
+++ b/src/test/ui/issues/issue-2330.rs
diff --git a/src/test/ui/issue-2330.stderr b/src/test/ui/issues/issue-2330.stderr
index 6b1d5e3b219..6b1d5e3b219 100644
--- a/src/test/ui/issue-2330.stderr
+++ b/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
index 10a53830116..10a53830116 100644
--- a/src/test/ui/issue-23302-1.rs
+++ b/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
index dcf021de57e..dcf021de57e 100644
--- a/src/test/ui/issue-23302-1.stderr
+++ b/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
index d1af19eb579..d1af19eb579 100644
--- a/src/test/ui/issue-23302-2.rs
+++ b/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
index 146f86127c5..146f86127c5 100644
--- a/src/test/ui/issue-23302-2.stderr
+++ b/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
index c3664e0abe1..c3664e0abe1 100644
--- a/src/test/ui/issue-23302-3.rs
+++ b/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
index 54edf42679a..54edf42679a 100644
--- a/src/test/ui/issue-23302-3.stderr
+++ b/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
index 4ed44154c47..4ed44154c47 100644
--- a/src/test/ui/issue-23543.rs
+++ b/src/test/ui/issues/issue-23543.rs
diff --git a/src/test/ui/issue-23543.stderr b/src/test/ui/issues/issue-23543.stderr
index ea443f1cbbb..ea443f1cbbb 100644
--- a/src/test/ui/issue-23543.stderr
+++ b/src/test/ui/issues/issue-23543.stderr
diff --git a/src/test/ui/issue-23544.rs b/src/test/ui/issues/issue-23544.rs
index 1d7c2187045..1d7c2187045 100644
--- a/src/test/ui/issue-23544.rs
+++ b/src/test/ui/issues/issue-23544.rs
diff --git a/src/test/ui/issue-23544.stderr b/src/test/ui/issues/issue-23544.stderr
index 147e2a212ed..147e2a212ed 100644
--- a/src/test/ui/issue-23544.stderr
+++ b/src/test/ui/issues/issue-23544.stderr
diff --git a/src/test/ui/issue-23589.rs b/src/test/ui/issues/issue-23589.rs
index 1c1d42da029..1c1d42da029 100644
--- a/src/test/ui/issue-23589.rs
+++ b/src/test/ui/issues/issue-23589.rs
diff --git a/src/test/ui/issue-23589.stderr b/src/test/ui/issues/issue-23589.stderr
index f0c07b380b4..f0c07b380b4 100644
--- a/src/test/ui/issue-23589.stderr
+++ b/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
index a3422d859c6..a3422d859c6 100644
--- a/src/test/ui/compile-fail-migration/issue-23595-1.rs
+++ b/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
index 624534eb8d7..624534eb8d7 100644
--- a/src/test/ui/compile-fail-migration/issue-23595-1.stderr
+++ b/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
index 6a3ce03fce5..6a3ce03fce5 100644
--- a/src/test/ui/issue-23595-2.rs
+++ b/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
index 5ddaab6abfe..5ddaab6abfe 100644
--- a/src/test/ui/issue-23595-2.stderr
+++ b/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
index 7b72e5689ba..7b72e5689ba 100644
--- a/src/test/ui/issue-23716.rs
+++ b/src/test/ui/issues/issue-23716.rs
diff --git a/src/test/ui/issue-23716.stderr b/src/test/ui/issues/issue-23716.stderr
index fd268c1b5a1..fd268c1b5a1 100644
--- a/src/test/ui/issue-23716.stderr
+++ b/src/test/ui/issues/issue-23716.stderr
diff --git a/src/test/ui/issue-23966.rs b/src/test/ui/issues/issue-23966.rs
index 544d3c8af20..544d3c8af20 100644
--- a/src/test/ui/issue-23966.rs
+++ b/src/test/ui/issues/issue-23966.rs
diff --git a/src/test/ui/issue-23966.stderr b/src/test/ui/issues/issue-23966.stderr
index 07d2cfbf55f..07d2cfbf55f 100644
--- a/src/test/ui/issue-23966.stderr
+++ b/src/test/ui/issues/issue-23966.stderr
diff --git a/src/test/ui/issue-24013.rs b/src/test/ui/issues/issue-24013.rs
index a7232781f6f..a7232781f6f 100644
--- a/src/test/ui/issue-24013.rs
+++ b/src/test/ui/issues/issue-24013.rs
diff --git a/src/test/ui/issue-24013.stderr b/src/test/ui/issues/issue-24013.stderr
index 5729bdf2064..5729bdf2064 100644
--- a/src/test/ui/issue-24013.stderr
+++ b/src/test/ui/issues/issue-24013.stderr
diff --git a/src/test/ui/issue-24036.rs b/src/test/ui/issues/issue-24036.rs
index 94ac17de4c0..94ac17de4c0 100644
--- a/src/test/ui/issue-24036.rs
+++ b/src/test/ui/issues/issue-24036.rs
diff --git a/src/test/ui/issue-24036.stderr b/src/test/ui/issues/issue-24036.stderr
index 24995be773e..24995be773e 100644
--- a/src/test/ui/issue-24036.stderr
+++ b/src/test/ui/issues/issue-24036.stderr
diff --git a/src/test/ui/issue-24081.rs b/src/test/ui/issues/issue-24081.rs
index 16530c509f2..16530c509f2 100644
--- a/src/test/ui/issue-24081.rs
+++ b/src/test/ui/issues/issue-24081.rs
diff --git a/src/test/ui/issue-24081.stderr b/src/test/ui/issues/issue-24081.stderr
index 17cd3ec0aa6..17cd3ec0aa6 100644
--- a/src/test/ui/issue-24081.stderr
+++ b/src/test/ui/issues/issue-24081.stderr
diff --git a/src/test/ui/issue-24204.rs b/src/test/ui/issues/issue-24204.rs
index 2a012da0083..2a012da0083 100644
--- a/src/test/ui/issue-24204.rs
+++ b/src/test/ui/issues/issue-24204.rs
diff --git a/src/test/ui/issue-24204.stderr b/src/test/ui/issues/issue-24204.stderr
index 809db284032..809db284032 100644
--- a/src/test/ui/issue-24204.stderr
+++ b/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
index cf3553c6b0d..cf3553c6b0d 100644
--- a/src/test/ui/issue-24267-flow-exit.nll.stderr
+++ b/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
index 4aca6bf38e1..4aca6bf38e1 100644
--- a/src/test/ui/issue-24267-flow-exit.rs
+++ b/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
index 7d1d5ac7df6..7d1d5ac7df6 100644
--- a/src/test/ui/issue-24267-flow-exit.stderr
+++ b/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
index bb726aca921..bb726aca921 100644
--- a/src/test/ui/issue-24322.rs
+++ b/src/test/ui/issues/issue-24322.rs
diff --git a/src/test/ui/issue-24322.stderr b/src/test/ui/issues/issue-24322.stderr
index d2cad8d3464..d2cad8d3464 100644
--- a/src/test/ui/issue-24322.stderr
+++ b/src/test/ui/issues/issue-24322.stderr
diff --git a/src/test/ui/issue-24352.rs b/src/test/ui/issues/issue-24352.rs
index 4b077314056..4b077314056 100644
--- a/src/test/ui/issue-24352.rs
+++ b/src/test/ui/issues/issue-24352.rs
diff --git a/src/test/ui/issue-24352.stderr b/src/test/ui/issues/issue-24352.stderr
index 8a4169055e7..8a4169055e7 100644
--- a/src/test/ui/issue-24352.stderr
+++ b/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
index e35f443548d..e35f443548d 100644
--- a/src/test/ui/issue-24357.nll.stderr
+++ b/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
index 016ce93a0bd..016ce93a0bd 100644
--- a/src/test/ui/issue-24357.rs
+++ b/src/test/ui/issues/issue-24357.rs
diff --git a/src/test/ui/issue-24357.stderr b/src/test/ui/issues/issue-24357.stderr
index be531ec8567..be531ec8567 100644
--- a/src/test/ui/issue-24357.stderr
+++ b/src/test/ui/issues/issue-24357.stderr
diff --git a/src/test/ui/issue-24363.rs b/src/test/ui/issues/issue-24363.rs
index 619ad74ad00..619ad74ad00 100644
--- a/src/test/ui/issue-24363.rs
+++ b/src/test/ui/issues/issue-24363.rs
diff --git a/src/test/ui/issue-24363.stderr b/src/test/ui/issues/issue-24363.stderr
index 2695d6acea8..2695d6acea8 100644
--- a/src/test/ui/issue-24363.stderr
+++ b/src/test/ui/issues/issue-24363.stderr
diff --git a/src/test/ui/issue-24365.rs b/src/test/ui/issues/issue-24365.rs
index 72df6fb5999..72df6fb5999 100644
--- a/src/test/ui/issue-24365.rs
+++ b/src/test/ui/issues/issue-24365.rs
diff --git a/src/test/ui/issue-24365.stderr b/src/test/ui/issues/issue-24365.stderr
index 0ad4674ca86..0ad4674ca86 100644
--- a/src/test/ui/issue-24365.stderr
+++ b/src/test/ui/issues/issue-24365.stderr
diff --git a/src/test/ui/issue-24424.rs b/src/test/ui/issues/issue-24424.rs
index 8e9f675b575..8e9f675b575 100644
--- a/src/test/ui/issue-24424.rs
+++ b/src/test/ui/issues/issue-24424.rs
diff --git a/src/test/ui/issue-24424.stderr b/src/test/ui/issues/issue-24424.stderr
index 7bcf67a5048..7bcf67a5048 100644
--- a/src/test/ui/issue-24424.stderr
+++ b/src/test/ui/issues/issue-24424.stderr
diff --git a/src/test/ui/issue-24446.rs b/src/test/ui/issues/issue-24446.rs
index a9c7978642d..a9c7978642d 100644
--- a/src/test/ui/issue-24446.rs
+++ b/src/test/ui/issues/issue-24446.rs
diff --git a/src/test/ui/issue-24446.stderr b/src/test/ui/issues/issue-24446.stderr
index 3c424627437..3c424627437 100644
--- a/src/test/ui/issue-24446.stderr
+++ b/src/test/ui/issues/issue-24446.stderr
diff --git a/src/test/ui/issue-24682.rs b/src/test/ui/issues/issue-24682.rs
index 0e872f71df4..0e872f71df4 100644
--- a/src/test/ui/issue-24682.rs
+++ b/src/test/ui/issues/issue-24682.rs
diff --git a/src/test/ui/issue-24682.stderr b/src/test/ui/issues/issue-24682.stderr
index 1e16cb72a09..1e16cb72a09 100644
--- a/src/test/ui/issue-24682.stderr
+++ b/src/test/ui/issues/issue-24682.stderr
diff --git a/src/test/ui/issue-24819.rs b/src/test/ui/issues/issue-24819.rs
index 52f5f1cd079..52f5f1cd079 100644
--- a/src/test/ui/issue-24819.rs
+++ b/src/test/ui/issues/issue-24819.rs
diff --git a/src/test/ui/issue-24819.stderr b/src/test/ui/issues/issue-24819.stderr
index 33034b7072b..33034b7072b 100644
--- a/src/test/ui/issue-24819.stderr
+++ b/src/test/ui/issues/issue-24819.stderr
diff --git a/src/test/ui/issue-24883.rs b/src/test/ui/issues/issue-24883.rs
index 097f2a5630c..097f2a5630c 100644
--- a/src/test/ui/issue-24883.rs
+++ b/src/test/ui/issues/issue-24883.rs
diff --git a/src/test/ui/issue-24883.stderr b/src/test/ui/issues/issue-24883.stderr
index 4b17747f109..4b17747f109 100644
--- a/src/test/ui/issue-24883.stderr
+++ b/src/test/ui/issues/issue-24883.stderr
diff --git a/src/test/ui/issue-25076.rs b/src/test/ui/issues/issue-25076.rs
index 1c255b4e631..1c255b4e631 100644
--- a/src/test/ui/issue-25076.rs
+++ b/src/test/ui/issues/issue-25076.rs
diff --git a/src/test/ui/issue-25076.stderr b/src/test/ui/issues/issue-25076.stderr
index 13ee70fdd9b..13ee70fdd9b 100644
--- a/src/test/ui/issue-25076.stderr
+++ b/src/test/ui/issues/issue-25076.stderr
diff --git a/src/test/ui/issue-25368.rs b/src/test/ui/issues/issue-25368.rs
index e70c0050221..e70c0050221 100644
--- a/src/test/ui/issue-25368.rs
+++ b/src/test/ui/issues/issue-25368.rs
diff --git a/src/test/ui/issue-25368.stderr b/src/test/ui/issues/issue-25368.stderr
index 56cbef7b89c..56cbef7b89c 100644
--- a/src/test/ui/issue-25368.stderr
+++ b/src/test/ui/issues/issue-25368.stderr
diff --git a/src/test/ui/issue-25385.rs b/src/test/ui/issues/issue-25385.rs
index aa941bc5691..aa941bc5691 100644
--- a/src/test/ui/issue-25385.rs
+++ b/src/test/ui/issues/issue-25385.rs
diff --git a/src/test/ui/issue-25385.stderr b/src/test/ui/issues/issue-25385.stderr
index f12388d4b45..f12388d4b45 100644
--- a/src/test/ui/issue-25385.stderr
+++ b/src/test/ui/issues/issue-25385.stderr
diff --git a/src/test/ui/issue-25386.rs b/src/test/ui/issues/issue-25386.rs
index b2775db5e75..b2775db5e75 100644
--- a/src/test/ui/issue-25386.rs
+++ b/src/test/ui/issues/issue-25386.rs
diff --git a/src/test/ui/issue-25386.stderr b/src/test/ui/issues/issue-25386.stderr
index 986961d36c9..986961d36c9 100644
--- a/src/test/ui/issue-25386.stderr
+++ b/src/test/ui/issues/issue-25386.stderr
diff --git a/src/test/ui/issue-25396.rs b/src/test/ui/issues/issue-25396.rs
index 7cfcbc5471a..7cfcbc5471a 100644
--- a/src/test/ui/issue-25396.rs
+++ b/src/test/ui/issues/issue-25396.rs
diff --git a/src/test/ui/issue-25396.stderr b/src/test/ui/issues/issue-25396.stderr
index 1946f391672..1946f391672 100644
--- a/src/test/ui/issue-25396.stderr
+++ b/src/test/ui/issues/issue-25396.stderr
diff --git a/src/test/ui/issue-25439.rs b/src/test/ui/issues/issue-25439.rs
index 6e33fd5ae71..6e33fd5ae71 100644
--- a/src/test/ui/issue-25439.rs
+++ b/src/test/ui/issues/issue-25439.rs
diff --git a/src/test/ui/issue-25439.stderr b/src/test/ui/issues/issue-25439.stderr
index 467bb1ad28e..467bb1ad28e 100644
--- a/src/test/ui/issue-25439.stderr
+++ b/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
index 9f698e4d582..9f698e4d582 100644
--- a/src/test/ui/issue-25579.ast.nll.stderr
+++ b/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
index 49b483d7503..49b483d7503 100644
--- a/src/test/ui/issue-25579.ast.stderr
+++ b/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
index 9f698e4d582..9f698e4d582 100644
--- a/src/test/ui/issue-25579.mir.stderr
+++ b/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
index 71c1d63cf5a..71c1d63cf5a 100644
--- a/src/test/ui/issue-25579.rs
+++ b/src/test/ui/issues/issue-25579.rs
diff --git a/src/test/ui/issue-25700.rs b/src/test/ui/issues/issue-25700.rs
index 477c3237f84..477c3237f84 100644
--- a/src/test/ui/issue-25700.rs
+++ b/src/test/ui/issues/issue-25700.rs
diff --git a/src/test/ui/issue-25700.stderr b/src/test/ui/issues/issue-25700.stderr
index 786620ab750..786620ab750 100644
--- a/src/test/ui/issue-25700.stderr
+++ b/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
index bd48d0eeb7c..bd48d0eeb7c 100644
--- a/src/test/ui/issue-25793.nll.stderr
+++ b/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
index 2939646342a..2939646342a 100644
--- a/src/test/ui/issue-25793.rs
+++ b/src/test/ui/issues/issue-25793.rs
diff --git a/src/test/ui/issue-25793.stderr b/src/test/ui/issues/issue-25793.stderr
index fb83d767c50..fb83d767c50 100644
--- a/src/test/ui/issue-25793.stderr
+++ b/src/test/ui/issues/issue-25793.stderr
diff --git a/src/test/ui/issue-25826.rs b/src/test/ui/issues/issue-25826.rs
index 6b9caba0218..6b9caba0218 100644
--- a/src/test/ui/issue-25826.rs
+++ b/src/test/ui/issues/issue-25826.rs
diff --git a/src/test/ui/issue-25826.stderr b/src/test/ui/issues/issue-25826.stderr
index a5ab7cfa6d3..a5ab7cfa6d3 100644
--- a/src/test/ui/issue-25826.stderr
+++ b/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
index fa2df26498a..fa2df26498a 100644
--- a/src/test/ui/issue-2590.nll.stderr
+++ b/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
index d7e438d1049..d7e438d1049 100644
--- a/src/test/ui/issue-2590.rs
+++ b/src/test/ui/issues/issue-2590.rs
diff --git a/src/test/ui/issue-2590.stderr b/src/test/ui/issues/issue-2590.stderr
index 59ec66d42cd..59ec66d42cd 100644
--- a/src/test/ui/issue-2590.stderr
+++ b/src/test/ui/issues/issue-2590.stderr
diff --git a/src/test/ui/issue-25901.rs b/src/test/ui/issues/issue-25901.rs
index 72fb2a682eb..72fb2a682eb 100644
--- a/src/test/ui/issue-25901.rs
+++ b/src/test/ui/issues/issue-25901.rs
diff --git a/src/test/ui/issue-25901.stderr b/src/test/ui/issues/issue-25901.stderr
index 8c20df5a230..8c20df5a230 100644
--- a/src/test/ui/issue-25901.stderr
+++ b/src/test/ui/issues/issue-25901.stderr
diff --git a/src/test/ui/issue-26056.rs b/src/test/ui/issues/issue-26056.rs
index 2dad2351440..2dad2351440 100644
--- a/src/test/ui/issue-26056.rs
+++ b/src/test/ui/issues/issue-26056.rs
diff --git a/src/test/ui/issue-26056.stderr b/src/test/ui/issues/issue-26056.stderr
index 51a48af81a1..51a48af81a1 100644
--- a/src/test/ui/issue-26056.stderr
+++ b/src/test/ui/issues/issue-26056.stderr
diff --git a/src/test/ui/issue-26093.rs b/src/test/ui/issues/issue-26093.rs
index 22751c4a37c..22751c4a37c 100644
--- a/src/test/ui/issue-26093.rs
+++ b/src/test/ui/issues/issue-26093.rs
diff --git a/src/test/ui/issue-26093.stderr b/src/test/ui/issues/issue-26093.stderr
index 1abe313bbf6..1abe313bbf6 100644
--- a/src/test/ui/issue-26093.stderr
+++ b/src/test/ui/issues/issue-26093.stderr
diff --git a/src/test/ui/issue-26094.rs b/src/test/ui/issues/issue-26094.rs
index 99add95e806..99add95e806 100644
--- a/src/test/ui/issue-26094.rs
+++ b/src/test/ui/issues/issue-26094.rs
diff --git a/src/test/ui/issue-26094.stderr b/src/test/ui/issues/issue-26094.stderr
index bf902e16c0c..bf902e16c0c 100644
--- a/src/test/ui/issue-26094.stderr
+++ b/src/test/ui/issues/issue-26094.stderr
diff --git a/src/test/ui/issue-26158.rs b/src/test/ui/issues/issue-26158.rs
index 54f5313aed1..54f5313aed1 100644
--- a/src/test/ui/issue-26158.rs
+++ b/src/test/ui/issues/issue-26158.rs
diff --git a/src/test/ui/issue-26158.stderr b/src/test/ui/issues/issue-26158.stderr
index 07b968c8e78..07b968c8e78 100644
--- a/src/test/ui/issue-26158.stderr
+++ b/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
index 94e3692d53d..94e3692d53d 100644
--- a/src/test/ui/issue-26217.nll.stderr
+++ b/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
index 06a8fe52588..06a8fe52588 100644
--- a/src/test/ui/issue-26217.rs
+++ b/src/test/ui/issues/issue-26217.rs
diff --git a/src/test/ui/issue-26217.stderr b/src/test/ui/issues/issue-26217.stderr
index f581826440e..f581826440e 100644
--- a/src/test/ui/issue-26217.stderr
+++ b/src/test/ui/issues/issue-26217.stderr
diff --git a/src/test/ui/issue-26237.rs b/src/test/ui/issues/issue-26237.rs
index 22772e596b1..22772e596b1 100644
--- a/src/test/ui/issue-26237.rs
+++ b/src/test/ui/issues/issue-26237.rs
diff --git a/src/test/ui/issue-26237.stderr b/src/test/ui/issues/issue-26237.stderr
index ae6fda8b932..ae6fda8b932 100644
--- a/src/test/ui/issue-26237.stderr
+++ b/src/test/ui/issues/issue-26237.stderr
diff --git a/src/test/ui/issue-26262.rs b/src/test/ui/issues/issue-26262.rs
index 8d79fd4570d..8d79fd4570d 100644
--- a/src/test/ui/issue-26262.rs
+++ b/src/test/ui/issues/issue-26262.rs
diff --git a/src/test/ui/issue-26262.stderr b/src/test/ui/issues/issue-26262.stderr
index 2e0a211d061..2e0a211d061 100644
--- a/src/test/ui/issue-26262.stderr
+++ b/src/test/ui/issues/issue-26262.stderr
diff --git a/src/test/ui/issue-26459.rs b/src/test/ui/issues/issue-26459.rs
index 8be3d88bd5c..8be3d88bd5c 100644
--- a/src/test/ui/issue-26459.rs
+++ b/src/test/ui/issues/issue-26459.rs
diff --git a/src/test/ui/issue-26459.stderr b/src/test/ui/issues/issue-26459.stderr
index d497c1c9209..d497c1c9209 100644
--- a/src/test/ui/issue-26459.stderr
+++ b/src/test/ui/issues/issue-26459.stderr
diff --git a/src/test/ui/issue-26472.rs b/src/test/ui/issues/issue-26472.rs
index 9b25eb72f3d..9b25eb72f3d 100644
--- a/src/test/ui/issue-26472.rs
+++ b/src/test/ui/issues/issue-26472.rs
diff --git a/src/test/ui/issue-26472.stderr b/src/test/ui/issues/issue-26472.stderr
index 26f54f61a7e..26f54f61a7e 100644
--- a/src/test/ui/issue-26472.stderr
+++ b/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
index 85ddf8d9493..85ddf8d9493 100644
--- a/src/test/ui/compile-fail-migration/issue-26548.rs
+++ b/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
index 7ebeb76b657..7ebeb76b657 100644
--- a/src/test/ui/compile-fail-migration/issue-26548.stderr
+++ b/src/test/ui/issues/issue-26548.stderr
diff --git a/src/test/ui/issue-26614.rs b/src/test/ui/issues/issue-26614.rs
index c128fb3b479..c128fb3b479 100644
--- a/src/test/ui/issue-26614.rs
+++ b/src/test/ui/issues/issue-26614.rs
diff --git a/src/test/ui/issue-26614.stderr b/src/test/ui/issues/issue-26614.stderr
index 1752d80fde3..1752d80fde3 100644
--- a/src/test/ui/issue-26614.stderr
+++ b/src/test/ui/issues/issue-26614.stderr
diff --git a/src/test/ui/issue-26638.rs b/src/test/ui/issues/issue-26638.rs
index 85a10588975..85a10588975 100644
--- a/src/test/ui/issue-26638.rs
+++ b/src/test/ui/issues/issue-26638.rs
diff --git a/src/test/ui/issue-26638.stderr b/src/test/ui/issues/issue-26638.stderr
index cf6fcd9f01c..cf6fcd9f01c 100644
--- a/src/test/ui/issue-26638.stderr
+++ b/src/test/ui/issues/issue-26638.stderr
diff --git a/src/test/ui/issue-26812.rs b/src/test/ui/issues/issue-26812.rs
index 1dd00881078..1dd00881078 100644
--- a/src/test/ui/issue-26812.rs
+++ b/src/test/ui/issues/issue-26812.rs
diff --git a/src/test/ui/issue-26812.stderr b/src/test/ui/issues/issue-26812.stderr
index 82cc17b7665..82cc17b7665 100644
--- a/src/test/ui/issue-26812.stderr
+++ b/src/test/ui/issues/issue-26812.stderr
diff --git a/src/test/ui/issue-26886.rs b/src/test/ui/issues/issue-26886.rs
index 24ef7cb74c8..24ef7cb74c8 100644
--- a/src/test/ui/issue-26886.rs
+++ b/src/test/ui/issues/issue-26886.rs
diff --git a/src/test/ui/issue-26886.stderr b/src/test/ui/issues/issue-26886.stderr
index 75942623941..75942623941 100644
--- a/src/test/ui/issue-26886.stderr
+++ b/src/test/ui/issues/issue-26886.stderr
diff --git a/src/test/ui/issue-26905.rs b/src/test/ui/issues/issue-26905.rs
index 3b8fac832a4..3b8fac832a4 100644
--- a/src/test/ui/issue-26905.rs
+++ b/src/test/ui/issues/issue-26905.rs
diff --git a/src/test/ui/issue-26905.stderr b/src/test/ui/issues/issue-26905.stderr
index f18b58a8330..f18b58a8330 100644
--- a/src/test/ui/issue-26905.stderr
+++ b/src/test/ui/issues/issue-26905.stderr
diff --git a/src/test/ui/issue-26930.rs b/src/test/ui/issues/issue-26930.rs
index 6c98f3e8560..6c98f3e8560 100644
--- a/src/test/ui/issue-26930.rs
+++ b/src/test/ui/issues/issue-26930.rs
diff --git a/src/test/ui/issue-26930.stderr b/src/test/ui/issues/issue-26930.stderr
index f962f4c58c4..f962f4c58c4 100644
--- a/src/test/ui/issue-26930.stderr
+++ b/src/test/ui/issues/issue-26930.stderr
diff --git a/src/test/ui/issue-26948.rs b/src/test/ui/issues/issue-26948.rs
index c63cb5defb7..c63cb5defb7 100644
--- a/src/test/ui/issue-26948.rs
+++ b/src/test/ui/issues/issue-26948.rs
diff --git a/src/test/ui/issue-26948.stderr b/src/test/ui/issues/issue-26948.stderr
index 982ce1d6c7b..982ce1d6c7b 100644
--- a/src/test/ui/issue-26948.stderr
+++ b/src/test/ui/issues/issue-26948.stderr
diff --git a/src/test/ui/issue-27008.rs b/src/test/ui/issues/issue-27008.rs
index f80135848e0..f80135848e0 100644
--- a/src/test/ui/issue-27008.rs
+++ b/src/test/ui/issues/issue-27008.rs
diff --git a/src/test/ui/issue-27008.stderr b/src/test/ui/issues/issue-27008.stderr
index 79831463664..79831463664 100644
--- a/src/test/ui/issue-27008.stderr
+++ b/src/test/ui/issues/issue-27008.stderr
diff --git a/src/test/ui/issue-27033.rs b/src/test/ui/issues/issue-27033.rs
index b8552aaee90..b8552aaee90 100644
--- a/src/test/ui/issue-27033.rs
+++ b/src/test/ui/issues/issue-27033.rs
diff --git a/src/test/ui/issue-27033.stderr b/src/test/ui/issues/issue-27033.stderr
index ba573c3eb6d..ba573c3eb6d 100644
--- a/src/test/ui/issue-27033.stderr
+++ b/src/test/ui/issues/issue-27033.stderr
diff --git a/src/test/ui/issue-27042.rs b/src/test/ui/issues/issue-27042.rs
index 23afa4b6296..23afa4b6296 100644
--- a/src/test/ui/issue-27042.rs
+++ b/src/test/ui/issues/issue-27042.rs
diff --git a/src/test/ui/issue-27042.stderr b/src/test/ui/issues/issue-27042.stderr
index 48113445582..48113445582 100644
--- a/src/test/ui/issue-27042.stderr
+++ b/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
index 619616adda6..619616adda6 100644
--- a/src/test/ui/issue-27060-2.rs
+++ b/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
index ed9db2ea55e..ed9db2ea55e 100644
--- a/src/test/ui/issue-27060-2.stderr
+++ b/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
index f88c2137e77..f88c2137e77 100644
--- a/src/test/ui/issue-27060.rs
+++ b/src/test/ui/issues/issue-27060.rs
diff --git a/src/test/ui/issue-27060.stderr b/src/test/ui/issues/issue-27060.stderr
index bd01f75d8fb..bd01f75d8fb 100644
--- a/src/test/ui/issue-27060.stderr
+++ b/src/test/ui/issues/issue-27060.stderr
diff --git a/src/test/ui/issue-27078.rs b/src/test/ui/issues/issue-27078.rs
index 294c288a970..294c288a970 100644
--- a/src/test/ui/issue-27078.rs
+++ b/src/test/ui/issues/issue-27078.rs
diff --git a/src/test/ui/issue-27078.stderr b/src/test/ui/issues/issue-27078.stderr
index 65b66997ee8..65b66997ee8 100644
--- a/src/test/ui/issue-27078.stderr
+++ b/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
index 6de28cbbf35..6de28cbbf35 100644
--- a/src/test/ui/issue-2718-a.rs
+++ b/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
index a60e5d04455..a60e5d04455 100644
--- a/src/test/ui/issue-2718-a.stderr
+++ b/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
index b3be36e41e6..b3be36e41e6 100644
--- 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
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
index 91c51bcd058..91c51bcd058 100644
--- 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
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
index 5b4c746a1b6..5b4c746a1b6 100644
--- 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
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
index f6ffa90069c..f6ffa90069c 100644
--- 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
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
index b575f4ebce6..b575f4ebce6 100644
--- 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
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
index a9d9651fb2a..a9d9651fb2a 100644
--- 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
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
index 866fed13685..866fed13685 100644
--- 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
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
index 582d0fd678c..582d0fd678c 100644
--- 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
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
index 39d54f6e7ae..39d54f6e7ae 100644
--- 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
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
index 660902880ac..660902880ac 100644
--- 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
diff --git a/src/test/ui/issue-27340.rs b/src/test/ui/issues/issue-27340.rs
index ce3fa487d4e..ce3fa487d4e 100644
--- a/src/test/ui/issue-27340.rs
+++ b/src/test/ui/issues/issue-27340.rs
diff --git a/src/test/ui/issue-27340.stderr b/src/test/ui/issues/issue-27340.stderr
index bae47b3d2a3..bae47b3d2a3 100644
--- a/src/test/ui/issue-27340.stderr
+++ b/src/test/ui/issues/issue-27340.stderr
diff --git a/src/test/ui/issue-27433.rs b/src/test/ui/issues/issue-27433.rs
index 782b2057438..782b2057438 100644
--- a/src/test/ui/issue-27433.rs
+++ b/src/test/ui/issues/issue-27433.rs
diff --git a/src/test/ui/issue-27433.stderr b/src/test/ui/issues/issue-27433.stderr
index 0fc04b082e5..0fc04b082e5 100644
--- a/src/test/ui/issue-27433.stderr
+++ b/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
index 36a15e79ac8..36a15e79ac8 100644
--- a/src/test/ui/issue-27592.nll.stderr
+++ b/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
index 731d4fb2bf6..731d4fb2bf6 100644
--- a/src/test/ui/issue-27592.rs
+++ b/src/test/ui/issues/issue-27592.rs
diff --git a/src/test/ui/issue-27592.stderr b/src/test/ui/issues/issue-27592.stderr
index 74b0541c01b..74b0541c01b 100644
--- a/src/test/ui/issue-27592.stderr
+++ b/src/test/ui/issues/issue-27592.stderr
diff --git a/src/test/ui/issue-27815.rs b/src/test/ui/issues/issue-27815.rs
index d9840abf0ca..d9840abf0ca 100644
--- a/src/test/ui/issue-27815.rs
+++ b/src/test/ui/issues/issue-27815.rs
diff --git a/src/test/ui/issue-27815.stderr b/src/test/ui/issues/issue-27815.stderr
index 987feaee9eb..987feaee9eb 100644
--- a/src/test/ui/issue-27815.stderr
+++ b/src/test/ui/issues/issue-27815.stderr
diff --git a/src/test/ui/issue-27842.rs b/src/test/ui/issues/issue-27842.rs
index d9dc3458a4a..d9dc3458a4a 100644
--- a/src/test/ui/issue-27842.rs
+++ b/src/test/ui/issues/issue-27842.rs
diff --git a/src/test/ui/issue-27842.stderr b/src/test/ui/issues/issue-27842.stderr
index 026594811e4..026594811e4 100644
--- a/src/test/ui/issue-27842.stderr
+++ b/src/test/ui/issues/issue-27842.stderr
diff --git a/src/test/ui/issue-27895.rs b/src/test/ui/issues/issue-27895.rs
index 6063755c04f..6063755c04f 100644
--- a/src/test/ui/issue-27895.rs
+++ b/src/test/ui/issues/issue-27895.rs
diff --git a/src/test/ui/issue-27895.stderr b/src/test/ui/issues/issue-27895.stderr
index 395c806fbdb..395c806fbdb 100644
--- a/src/test/ui/issue-27895.stderr
+++ b/src/test/ui/issues/issue-27895.stderr
diff --git a/src/test/ui/issue-27942.rs b/src/test/ui/issues/issue-27942.rs
index 2234aede00d..2234aede00d 100644
--- a/src/test/ui/issue-27942.rs
+++ b/src/test/ui/issues/issue-27942.rs
diff --git a/src/test/ui/issue-27942.stderr b/src/test/ui/issues/issue-27942.stderr
index 5e2ecbb05ae..5e2ecbb05ae 100644
--- a/src/test/ui/issue-27942.stderr
+++ b/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
index 0f6b9d1b5dc..0f6b9d1b5dc 100644
--- a/src/test/ui/compile-fail-migration/issue-28075.rs
+++ b/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
index b42a322cbb4..b42a322cbb4 100644
--- a/src/test/ui/compile-fail-migration/issue-28075.stderr
+++ b/src/test/ui/issues/issue-28075.stderr
diff --git a/src/test/ui/issue-28098.rs b/src/test/ui/issues/issue-28098.rs
index 5dded2b1e16..5dded2b1e16 100644
--- a/src/test/ui/issue-28098.rs
+++ b/src/test/ui/issues/issue-28098.rs
diff --git a/src/test/ui/issue-28098.stderr b/src/test/ui/issues/issue-28098.stderr
index 3a6e1aea288..3a6e1aea288 100644
--- a/src/test/ui/issue-28098.stderr
+++ b/src/test/ui/issues/issue-28098.stderr
diff --git a/src/test/ui/issue-28105.rs b/src/test/ui/issues/issue-28105.rs
index 8e58d1aaf24..8e58d1aaf24 100644
--- a/src/test/ui/issue-28105.rs
+++ b/src/test/ui/issues/issue-28105.rs
diff --git a/src/test/ui/issue-28105.stderr b/src/test/ui/issues/issue-28105.stderr
index eb05dbea2be..eb05dbea2be 100644
--- a/src/test/ui/issue-28105.stderr
+++ b/src/test/ui/issues/issue-28105.stderr
diff --git a/src/test/ui/issue-28109.rs b/src/test/ui/issues/issue-28109.rs
index 0d372d30015..0d372d30015 100644
--- a/src/test/ui/issue-28109.rs
+++ b/src/test/ui/issues/issue-28109.rs
diff --git a/src/test/ui/issue-28109.stderr b/src/test/ui/issues/issue-28109.stderr
index 902fe2390b9..902fe2390b9 100644
--- a/src/test/ui/issue-28109.stderr
+++ b/src/test/ui/issues/issue-28109.stderr
diff --git a/src/test/ui/issue-28113.rs b/src/test/ui/issues/issue-28113.rs
index 7d2541966a4..7d2541966a4 100644
--- a/src/test/ui/issue-28113.rs
+++ b/src/test/ui/issues/issue-28113.rs
diff --git a/src/test/ui/issue-28113.stderr b/src/test/ui/issues/issue-28113.stderr
index 633257f1a4b..633257f1a4b 100644
--- a/src/test/ui/issue-28113.stderr
+++ b/src/test/ui/issues/issue-28113.stderr
diff --git a/src/test/ui/issue-2823.rs b/src/test/ui/issues/issue-2823.rs
index 631bcb7bd9e..631bcb7bd9e 100644
--- a/src/test/ui/issue-2823.rs
+++ b/src/test/ui/issues/issue-2823.rs
diff --git a/src/test/ui/issue-2823.stderr b/src/test/ui/issues/issue-2823.stderr
index 5a5cae7aab4..5a5cae7aab4 100644
--- a/src/test/ui/issue-2823.stderr
+++ b/src/test/ui/issues/issue-2823.stderr
diff --git a/src/test/ui/issue-28324.rs b/src/test/ui/issues/issue-28324.rs
index af73db2b4d2..af73db2b4d2 100644
--- a/src/test/ui/issue-28324.rs
+++ b/src/test/ui/issues/issue-28324.rs
diff --git a/src/test/ui/issue-28324.stderr b/src/test/ui/issues/issue-28324.stderr
index c62d8bddf00..c62d8bddf00 100644
--- a/src/test/ui/issue-28324.stderr
+++ b/src/test/ui/issues/issue-28324.stderr
diff --git a/src/test/ui/issue-28344.rs b/src/test/ui/issues/issue-28344.rs
index d28c3146404..d28c3146404 100644
--- a/src/test/ui/issue-28344.rs
+++ b/src/test/ui/issues/issue-28344.rs
diff --git a/src/test/ui/issue-28344.stderr b/src/test/ui/issues/issue-28344.stderr
index 7ef2e906422..7ef2e906422 100644
--- a/src/test/ui/issue-28344.stderr
+++ b/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
index 187d91731d0..187d91731d0 100644
--- a/src/test/ui/compile-fail-migration/issue-28388-1.rs
+++ b/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
index 9f4b6cb56e7..9f4b6cb56e7 100644
--- a/src/test/ui/compile-fail-migration/issue-28388-1.stderr
+++ b/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
index 4ed5bfab06f..4ed5bfab06f 100644
--- a/src/test/ui/compile-fail-migration/issue-28388-2.rs
+++ b/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
index 7809934942c..7809934942c 100644
--- a/src/test/ui/compile-fail-migration/issue-28388-2.stderr
+++ b/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
index 12e3457ef9e..12e3457ef9e 100644
--- a/src/test/ui/compile-fail-migration/issue-28388-3.rs
+++ b/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
index 653fdb5a4d4..653fdb5a4d4 100644
--- a/src/test/ui/compile-fail-migration/issue-28388-3.stderr
+++ b/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
index 9253a490733..9253a490733 100644
--- a/src/test/ui/issue-28433.rs
+++ b/src/test/ui/issues/issue-28433.rs
diff --git a/src/test/ui/issue-28433.stderr b/src/test/ui/issues/issue-28433.stderr
index bde01ef3746..bde01ef3746 100644
--- a/src/test/ui/issue-28433.stderr
+++ b/src/test/ui/issues/issue-28433.stderr
diff --git a/src/test/ui/issue-28472.rs b/src/test/ui/issues/issue-28472.rs
index 837de8eddcf..837de8eddcf 100644
--- a/src/test/ui/issue-28472.rs
+++ b/src/test/ui/issues/issue-28472.rs
diff --git a/src/test/ui/issue-28472.stderr b/src/test/ui/issues/issue-28472.stderr
index 37c04a7a774..37c04a7a774 100644
--- a/src/test/ui/issue-28472.stderr
+++ b/src/test/ui/issues/issue-28472.stderr
diff --git a/src/test/ui/issue-2848.rs b/src/test/ui/issues/issue-2848.rs
index f3fc94434d3..f3fc94434d3 100644
--- a/src/test/ui/issue-2848.rs
+++ b/src/test/ui/issues/issue-2848.rs
diff --git a/src/test/ui/issue-2848.stderr b/src/test/ui/issues/issue-2848.stderr
index 8f7ebbf95dd..8f7ebbf95dd 100644
--- a/src/test/ui/issue-2848.stderr
+++ b/src/test/ui/issues/issue-2848.stderr
diff --git a/src/test/ui/issue-2849.rs b/src/test/ui/issues/issue-2849.rs
index 203b28bd5e4..203b28bd5e4 100644
--- a/src/test/ui/issue-2849.rs
+++ b/src/test/ui/issues/issue-2849.rs
diff --git a/src/test/ui/issue-2849.stderr b/src/test/ui/issues/issue-2849.stderr
index ffd15a58880..ffd15a58880 100644
--- a/src/test/ui/issue-2849.stderr
+++ b/src/test/ui/issues/issue-2849.stderr
diff --git a/src/test/ui/issue-28568.rs b/src/test/ui/issues/issue-28568.rs
index e8c34198852..e8c34198852 100644
--- a/src/test/ui/issue-28568.rs
+++ b/src/test/ui/issues/issue-28568.rs
diff --git a/src/test/ui/issue-28568.stderr b/src/test/ui/issues/issue-28568.stderr
index 3208074642f..3208074642f 100644
--- a/src/test/ui/issue-28568.stderr
+++ b/src/test/ui/issues/issue-28568.stderr
diff --git a/src/test/ui/issue-28576.rs b/src/test/ui/issues/issue-28576.rs
index bd7186708a6..bd7186708a6 100644
--- a/src/test/ui/issue-28576.rs
+++ b/src/test/ui/issues/issue-28576.rs
diff --git a/src/test/ui/issue-28576.stderr b/src/test/ui/issues/issue-28576.stderr
index 80f0f1ba1b1..80f0f1ba1b1 100644
--- a/src/test/ui/issue-28576.stderr
+++ b/src/test/ui/issues/issue-28576.stderr
diff --git a/src/test/ui/issue-28586.rs b/src/test/ui/issues/issue-28586.rs
index b8571d2e85e..b8571d2e85e 100644
--- a/src/test/ui/issue-28586.rs
+++ b/src/test/ui/issues/issue-28586.rs
diff --git a/src/test/ui/issue-28586.stderr b/src/test/ui/issues/issue-28586.stderr
index 9820d64909e..9820d64909e 100644
--- a/src/test/ui/issue-28586.stderr
+++ b/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
index dc9155ed66c..dc9155ed66c 100644
--- a/src/test/ui/compile-fail-migration/issue-28625.rs
+++ b/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
index 90b50f193fb..90b50f193fb 100644
--- a/src/test/ui/compile-fail-migration/issue-28625.stderr
+++ b/src/test/ui/issues/issue-28625.stderr
diff --git a/src/test/ui/issue-28776.rs b/src/test/ui/issues/issue-28776.rs
index 196c4bd2728..196c4bd2728 100644
--- a/src/test/ui/issue-28776.rs
+++ b/src/test/ui/issues/issue-28776.rs
diff --git a/src/test/ui/issue-28776.stderr b/src/test/ui/issues/issue-28776.stderr
index aef0d9cd1d8..aef0d9cd1d8 100644
--- a/src/test/ui/issue-28776.stderr
+++ b/src/test/ui/issues/issue-28776.stderr
diff --git a/src/test/ui/issue-28837.rs b/src/test/ui/issues/issue-28837.rs
index 91ea18a8c6c..91ea18a8c6c 100644
--- a/src/test/ui/issue-28837.rs
+++ b/src/test/ui/issues/issue-28837.rs
diff --git a/src/test/ui/issue-28837.stderr b/src/test/ui/issues/issue-28837.stderr
index 88994eaeb93..88994eaeb93 100644
--- a/src/test/ui/issue-28837.stderr
+++ b/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
index c13fd5fa716..c13fd5fa716 100644
--- a/src/test/ui/compile-fail-migration/issue-28848.rs
+++ b/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
index dadcff226f5..dadcff226f5 100644
--- a/src/test/ui/compile-fail-migration/issue-28848.stderr
+++ b/src/test/ui/issues/issue-28848.stderr
diff --git a/src/test/ui/issue-28971.rs b/src/test/ui/issues/issue-28971.rs
index e553fee5a62..e553fee5a62 100644
--- a/src/test/ui/issue-28971.rs
+++ b/src/test/ui/issues/issue-28971.rs
diff --git a/src/test/ui/issue-28971.stderr b/src/test/ui/issues/issue-28971.stderr
index c04e21f7c58..c04e21f7c58 100644
--- a/src/test/ui/issue-28971.stderr
+++ b/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
index 536784508b7..536784508b7 100644
--- a/src/test/ui/issue-28992-empty.rs
+++ b/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
index 9b5e42f8eb9..9b5e42f8eb9 100644
--- a/src/test/ui/issue-28992-empty.stderr
+++ b/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
index 6cb6bbf1893..6cb6bbf1893 100644
--- a/src/test/ui/issue-29084.rs
+++ b/src/test/ui/issues/issue-29084.rs
diff --git a/src/test/ui/issue-29084.stderr b/src/test/ui/issues/issue-29084.stderr
index 3f1f18dabd0..3f1f18dabd0 100644
--- a/src/test/ui/issue-29084.stderr
+++ b/src/test/ui/issues/issue-29084.stderr
diff --git a/src/test/ui/issue-29124.rs b/src/test/ui/issues/issue-29124.rs
index 77fa8192b97..77fa8192b97 100644
--- a/src/test/ui/issue-29124.rs
+++ b/src/test/ui/issues/issue-29124.rs
diff --git a/src/test/ui/issue-29124.stderr b/src/test/ui/issues/issue-29124.stderr
index bd00772dfd2..bd00772dfd2 100644
--- a/src/test/ui/issue-29124.stderr
+++ b/src/test/ui/issues/issue-29124.stderr
diff --git a/src/test/ui/issue-29147.rs b/src/test/ui/issues/issue-29147.rs
index 0ecaa409412..0ecaa409412 100644
--- a/src/test/ui/issue-29147.rs
+++ b/src/test/ui/issues/issue-29147.rs
diff --git a/src/test/ui/issue-29147.stderr b/src/test/ui/issues/issue-29147.stderr
index d0ad0c99aa0..d0ad0c99aa0 100644
--- a/src/test/ui/issue-29147.stderr
+++ b/src/test/ui/issues/issue-29147.stderr
diff --git a/src/test/ui/issue-29161.rs b/src/test/ui/issues/issue-29161.rs
index 97ba222fe45..97ba222fe45 100644
--- a/src/test/ui/issue-29161.rs
+++ b/src/test/ui/issues/issue-29161.rs
diff --git a/src/test/ui/issue-29161.stderr b/src/test/ui/issues/issue-29161.stderr
index fb6a41d2eca..fb6a41d2eca 100644
--- a/src/test/ui/issue-29161.stderr
+++ b/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
index 2fcec51912e..2fcec51912e 100644
--- a/src/test/ui/compile-fail-migration/issue-29181.rs
+++ b/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
index 5dda7848926..5dda7848926 100644
--- a/src/test/ui/compile-fail-migration/issue-29181.stderr
+++ b/src/test/ui/issues/issue-29181.stderr
diff --git a/src/test/ui/issue-29184.rs b/src/test/ui/issues/issue-29184.rs
index 98fe12c1b9d..98fe12c1b9d 100644
--- a/src/test/ui/issue-29184.rs
+++ b/src/test/ui/issues/issue-29184.rs
diff --git a/src/test/ui/issue-29184.stderr b/src/test/ui/issues/issue-29184.stderr
index 72d7bb8d5f6..72d7bb8d5f6 100644
--- a/src/test/ui/issue-29184.stderr
+++ b/src/test/ui/issues/issue-29184.stderr
diff --git a/src/test/ui/issue-2937.rs b/src/test/ui/issues/issue-2937.rs
index 0d684ec5ae1..0d684ec5ae1 100644
--- a/src/test/ui/issue-2937.rs
+++ b/src/test/ui/issues/issue-2937.rs
diff --git a/src/test/ui/issue-2937.stderr b/src/test/ui/issues/issue-2937.stderr
index 8c0125c7522..8c0125c7522 100644
--- a/src/test/ui/issue-2937.stderr
+++ b/src/test/ui/issues/issue-2937.stderr
diff --git a/src/test/ui/issue-2951.rs b/src/test/ui/issues/issue-2951.rs
index 11ff7ab2476..11ff7ab2476 100644
--- a/src/test/ui/issue-2951.rs
+++ b/src/test/ui/issues/issue-2951.rs
diff --git a/src/test/ui/issue-2951.stderr b/src/test/ui/issues/issue-2951.stderr
index 8c166807c46..8c166807c46 100644
--- a/src/test/ui/issue-2951.stderr
+++ b/src/test/ui/issues/issue-2951.stderr
diff --git a/src/test/ui/issue-29723.rs b/src/test/ui/issues/issue-29723.rs
index f31e965ae01..f31e965ae01 100644
--- a/src/test/ui/issue-29723.rs
+++ b/src/test/ui/issues/issue-29723.rs
diff --git a/src/test/ui/issue-29723.stderr b/src/test/ui/issues/issue-29723.stderr
index 48e50b9dea9..48e50b9dea9 100644
--- a/src/test/ui/issue-29723.stderr
+++ b/src/test/ui/issues/issue-29723.stderr
diff --git a/src/test/ui/issue-29857.rs b/src/test/ui/issues/issue-29857.rs
index 661579f52b6..661579f52b6 100644
--- a/src/test/ui/issue-29857.rs
+++ b/src/test/ui/issues/issue-29857.rs
diff --git a/src/test/ui/issue-29857.stderr b/src/test/ui/issues/issue-29857.stderr
index d5ba942b19f..d5ba942b19f 100644
--- a/src/test/ui/issue-29857.stderr
+++ b/src/test/ui/issues/issue-29857.stderr
diff --git a/src/test/ui/issue-29861.rs b/src/test/ui/issues/issue-29861.rs
index 79514ad376b..79514ad376b 100644
--- a/src/test/ui/issue-29861.rs
+++ b/src/test/ui/issues/issue-29861.rs
diff --git a/src/test/ui/issue-29861.stderr b/src/test/ui/issues/issue-29861.stderr
index 27453337b10..27453337b10 100644
--- a/src/test/ui/issue-29861.stderr
+++ b/src/test/ui/issues/issue-29861.stderr
diff --git a/src/test/ui/issue-2995.rs b/src/test/ui/issues/issue-2995.rs
index d735e184d5c..d735e184d5c 100644
--- a/src/test/ui/issue-2995.rs
+++ b/src/test/ui/issues/issue-2995.rs
diff --git a/src/test/ui/issue-2995.stderr b/src/test/ui/issues/issue-2995.stderr
index b52bbbead91..b52bbbead91 100644
--- a/src/test/ui/issue-2995.stderr
+++ b/src/test/ui/issues/issue-2995.stderr
diff --git a/src/test/ui/issue-30007.rs b/src/test/ui/issues/issue-30007.rs
index c17833ee830..c17833ee830 100644
--- a/src/test/ui/issue-30007.rs
+++ b/src/test/ui/issues/issue-30007.rs
diff --git a/src/test/ui/issue-30007.stderr b/src/test/ui/issues/issue-30007.stderr
index a467ff6dd0a..a467ff6dd0a 100644
--- a/src/test/ui/issue-30007.stderr
+++ b/src/test/ui/issues/issue-30007.stderr
diff --git a/src/test/ui/issue-30079.rs b/src/test/ui/issues/issue-30079.rs
index 04ae8f6d255..04ae8f6d255 100644
--- a/src/test/ui/issue-30079.rs
+++ b/src/test/ui/issues/issue-30079.rs
diff --git a/src/test/ui/issue-30079.stderr b/src/test/ui/issues/issue-30079.stderr
index dadaf3db24e..dadaf3db24e 100644
--- a/src/test/ui/issue-30079.stderr
+++ b/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
index 89de27326b4..89de27326b4 100644
--- a/src/test/ui/issue-3008-1.rs
+++ b/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
index fe3e294d9e3..fe3e294d9e3 100644
--- a/src/test/ui/issue-3008-1.stderr
+++ b/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
index b627656c91a..b627656c91a 100644
--- a/src/test/ui/issue-3008-2.rs
+++ b/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
index d02fb45be49..d02fb45be49 100644
--- a/src/test/ui/issue-3008-2.stderr
+++ b/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
index 66bfab003e9..66bfab003e9 100644
--- a/src/test/ui/issue-3008-3.rs
+++ b/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
index 22c0871fb0c..22c0871fb0c 100644
--- a/src/test/ui/issue-3008-3.stderr
+++ b/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
index 653097ad69f..653097ad69f 100644
--- a/src/test/ui/compile-fail-migration/issue-30123.rs
+++ b/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
index 094c962de29..094c962de29 100644
--- a/src/test/ui/compile-fail-migration/issue-30123.stderr
+++ b/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
index 2b0a24cfdb3..2b0a24cfdb3 100644
--- a/src/test/ui/issue-3021-b.rs
+++ b/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
index dfc80e5ca52..dfc80e5ca52 100644
--- a/src/test/ui/issue-3021-b.stderr
+++ b/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
index 55975cc8e86..55975cc8e86 100644
--- a/src/test/ui/issue-3021-c.rs
+++ b/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
index 4a250e76af3..4a250e76af3 100644
--- a/src/test/ui/issue-3021-c.stderr
+++ b/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
index c23e12e713a..c23e12e713a 100644
--- a/src/test/ui/issue-3021-d.rs
+++ b/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
index ab5ad94a031..ab5ad94a031 100644
--- a/src/test/ui/issue-3021-d.stderr
+++ b/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
index f93a333d2ae..f93a333d2ae 100644
--- a/src/test/ui/issue-3021.rs
+++ b/src/test/ui/issues/issue-3021.rs
diff --git a/src/test/ui/issue-3021.stderr b/src/test/ui/issues/issue-3021.stderr
index 312b9f3b864..312b9f3b864 100644
--- a/src/test/ui/issue-3021.stderr
+++ b/src/test/ui/issues/issue-3021.stderr
diff --git a/src/test/ui/issue-30225.rs b/src/test/ui/issues/issue-30225.rs
index 7acbbfb8826..7acbbfb8826 100644
--- a/src/test/ui/issue-30225.rs
+++ b/src/test/ui/issues/issue-30225.rs
diff --git a/src/test/ui/issue-30225.stderr b/src/test/ui/issues/issue-30225.stderr
index b3bbf233257..b3bbf233257 100644
--- a/src/test/ui/issue-30225.stderr
+++ b/src/test/ui/issues/issue-30225.stderr
diff --git a/src/test/ui/issue-30236.rs b/src/test/ui/issues/issue-30236.rs
index 45a5cd09337..45a5cd09337 100644
--- a/src/test/ui/issue-30236.rs
+++ b/src/test/ui/issues/issue-30236.rs
diff --git a/src/test/ui/issue-30236.stderr b/src/test/ui/issues/issue-30236.stderr
index 3a9f075d480..3a9f075d480 100644
--- a/src/test/ui/issue-30236.stderr
+++ b/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
index cf6935b9ba6..cf6935b9ba6 100644
--- a/src/test/ui/issue-30240-b.rs
+++ b/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
index 535d1a92ed9..535d1a92ed9 100644
--- a/src/test/ui/issue-30240-b.stderr
+++ b/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
index 60fb307d4e1..60fb307d4e1 100644
--- a/src/test/ui/issue-30240.rs
+++ b/src/test/ui/issues/issue-30240.rs
diff --git a/src/test/ui/issue-30240.stderr b/src/test/ui/issues/issue-30240.stderr
index 9acb53ff911..9acb53ff911 100644
--- a/src/test/ui/issue-30240.stderr
+++ b/src/test/ui/issues/issue-30240.stderr
diff --git a/src/test/ui/issue-30255.rs b/src/test/ui/issues/issue-30255.rs
index 64f70ef2b6f..64f70ef2b6f 100644
--- a/src/test/ui/issue-30255.rs
+++ b/src/test/ui/issues/issue-30255.rs
diff --git a/src/test/ui/issue-30255.stderr b/src/test/ui/issues/issue-30255.stderr
index 9556f6d9e23..9556f6d9e23 100644
--- a/src/test/ui/issue-30255.stderr
+++ b/src/test/ui/issues/issue-30255.stderr
diff --git a/src/test/ui/issue-30302.rs b/src/test/ui/issues/issue-30302.rs
index 51c76713a76..51c76713a76 100644
--- a/src/test/ui/issue-30302.rs
+++ b/src/test/ui/issues/issue-30302.rs
diff --git a/src/test/ui/issue-30302.stderr b/src/test/ui/issues/issue-30302.stderr
index fa3cb92b180..fa3cb92b180 100644
--- a/src/test/ui/issue-30302.stderr
+++ b/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
index fdf8157dcf8..fdf8157dcf8 100644
--- a/src/test/ui/issue-30355.nll.stderr
+++ b/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
index ee19d040318..ee19d040318 100644
--- a/src/test/ui/issue-30355.rs
+++ b/src/test/ui/issues/issue-30355.rs
diff --git a/src/test/ui/issue-30355.stderr b/src/test/ui/issues/issue-30355.stderr
index 7e843688035..7e843688035 100644
--- a/src/test/ui/issue-30355.stderr
+++ b/src/test/ui/issues/issue-30355.stderr
diff --git a/src/test/ui/issue-3038.rs b/src/test/ui/issues/issue-3038.rs
index 1eec62df788..1eec62df788 100644
--- a/src/test/ui/issue-3038.rs
+++ b/src/test/ui/issues/issue-3038.rs
diff --git a/src/test/ui/issue-3038.stderr b/src/test/ui/issues/issue-3038.stderr
index 17ad9936149..17ad9936149 100644
--- a/src/test/ui/issue-3038.stderr
+++ b/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
index 2d27cd55e01..2d27cd55e01 100644
--- a/src/test/ui/issue-30438-a.nll.stderr
+++ b/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
index 441815de81d..441815de81d 100644
--- a/src/test/ui/issue-30438-a.rs
+++ b/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
index 5f4a51a927a..5f4a51a927a 100644
--- a/src/test/ui/issue-30438-a.stderr
+++ b/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
index 981b196c4ae..981b196c4ae 100644
--- a/src/test/ui/issue-30438-b.rs
+++ b/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
index 651ff9f2ae1..651ff9f2ae1 100644
--- a/src/test/ui/issue-30438-b.stderr
+++ b/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
index 28e63b2d36b..28e63b2d36b 100644
--- a/src/test/ui/issue-30438-c.nll.stderr
+++ b/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
index 2b4d0dc339b..2b4d0dc339b 100644
--- a/src/test/ui/issue-30438-c.rs
+++ b/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
index dc6e1c52be1..dc6e1c52be1 100644
--- a/src/test/ui/issue-30438-c.stderr
+++ b/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
index 5708f160a41..5708f160a41 100644
--- a/src/test/ui/issue-3044.rs
+++ b/src/test/ui/issues/issue-3044.rs
diff --git a/src/test/ui/issue-3044.stderr b/src/test/ui/issues/issue-3044.stderr
index cdca9be48ac..cdca9be48ac 100644
--- a/src/test/ui/issue-3044.stderr
+++ b/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
index 90f5220a623..90f5220a623 100644
--- a/src/test/ui/compile-fail-migration/issue-30535.rs
+++ b/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
index c3838fdb9cf..c3838fdb9cf 100644
--- a/src/test/ui/compile-fail-migration/issue-30535.stderr
+++ b/src/test/ui/issues/issue-30535.stderr
diff --git a/src/test/ui/issue-30560.rs b/src/test/ui/issues/issue-30560.rs
index 0b1afd75ca9..0b1afd75ca9 100644
--- a/src/test/ui/issue-30560.rs
+++ b/src/test/ui/issues/issue-30560.rs
diff --git a/src/test/ui/issue-30560.stderr b/src/test/ui/issues/issue-30560.stderr
index cb38c0dabe0..cb38c0dabe0 100644
--- a/src/test/ui/issue-30560.stderr
+++ b/src/test/ui/issues/issue-30560.stderr
diff --git a/src/test/ui/issue-30589.rs b/src/test/ui/issues/issue-30589.rs
index 61721fe58b3..61721fe58b3 100644
--- a/src/test/ui/issue-30589.rs
+++ b/src/test/ui/issues/issue-30589.rs
diff --git a/src/test/ui/issue-30589.stderr b/src/test/ui/issues/issue-30589.stderr
index 8174af83230..8174af83230 100644
--- a/src/test/ui/issue-30589.stderr
+++ b/src/test/ui/issues/issue-30589.stderr
diff --git a/src/test/ui/issue-30730.rs b/src/test/ui/issues/issue-30730.rs
index c57a34a90df..c57a34a90df 100644
--- a/src/test/ui/issue-30730.rs
+++ b/src/test/ui/issues/issue-30730.rs
diff --git a/src/test/ui/issue-30730.stderr b/src/test/ui/issues/issue-30730.stderr
index 696c3acce72..696c3acce72 100644
--- a/src/test/ui/issue-30730.stderr
+++ b/src/test/ui/issues/issue-30730.stderr
diff --git a/src/test/ui/issue-3080.rs b/src/test/ui/issues/issue-3080.rs
index fb16dad3960..fb16dad3960 100644
--- a/src/test/ui/issue-3080.rs
+++ b/src/test/ui/issues/issue-3080.rs
diff --git a/src/test/ui/issue-3080.stderr b/src/test/ui/issues/issue-3080.stderr
index 3a966e3f315..3a966e3f315 100644
--- a/src/test/ui/issue-3080.stderr
+++ b/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
index 62c2639836b..62c2639836b 100644
--- a/src/test/ui/issue-3096-1.rs
+++ b/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
index 783e831a2a5..783e831a2a5 100644
--- a/src/test/ui/issue-3096-1.stderr
+++ b/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
index 2d1ad9a2692..2d1ad9a2692 100644
--- a/src/test/ui/issue-3096-2.rs
+++ b/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
index 6031f25c03d..6031f25c03d 100644
--- a/src/test/ui/issue-3096-2.stderr
+++ b/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
index db60d70ca9b..db60d70ca9b 100644
--- a/src/test/ui/issue-3099-a.rs
+++ b/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
index 6a194593c3f..6a194593c3f 100644
--- a/src/test/ui/issue-3099-a.stderr
+++ b/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
index 956d2186752..956d2186752 100644
--- a/src/test/ui/issue-3099-b.rs
+++ b/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
index 226d99e3b82..226d99e3b82 100644
--- a/src/test/ui/issue-3099-b.stderr
+++ b/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
index 42766533556..42766533556 100644
--- a/src/test/ui/issue-3099.rs
+++ b/src/test/ui/issues/issue-3099.rs
diff --git a/src/test/ui/issue-3099.stderr b/src/test/ui/issues/issue-3099.stderr
index a5f29e7b6c3..a5f29e7b6c3 100644
--- a/src/test/ui/issue-3099.stderr
+++ b/src/test/ui/issues/issue-3099.stderr
diff --git a/src/test/ui/issue-31011.rs b/src/test/ui/issues/issue-31011.rs
index 716b0bbe772..716b0bbe772 100644
--- a/src/test/ui/issue-31011.rs
+++ b/src/test/ui/issues/issue-31011.rs
diff --git a/src/test/ui/issue-31011.stderr b/src/test/ui/issues/issue-31011.stderr
index c2e7c9876cb..c2e7c9876cb 100644
--- a/src/test/ui/issue-31011.stderr
+++ b/src/test/ui/issues/issue-31011.stderr
diff --git a/src/test/ui/issue-31109.rs b/src/test/ui/issues/issue-31109.rs
index 74121e3a420..74121e3a420 100644
--- a/src/test/ui/issue-31109.rs
+++ b/src/test/ui/issues/issue-31109.rs
diff --git a/src/test/ui/issue-31109.stderr b/src/test/ui/issues/issue-31109.stderr
index c66a4f0b175..c66a4f0b175 100644
--- a/src/test/ui/issue-31109.stderr
+++ b/src/test/ui/issues/issue-31109.stderr
diff --git a/src/test/ui/issue-31173.rs b/src/test/ui/issues/issue-31173.rs
index fb1e3cc87e8..fb1e3cc87e8 100644
--- a/src/test/ui/issue-31173.rs
+++ b/src/test/ui/issues/issue-31173.rs
diff --git a/src/test/ui/issue-31173.stderr b/src/test/ui/issues/issue-31173.stderr
index e2630b5b8ce..e2630b5b8ce 100644
--- a/src/test/ui/issue-31173.stderr
+++ b/src/test/ui/issues/issue-31173.stderr
diff --git a/src/test/ui/issue-31212.rs b/src/test/ui/issues/issue-31212.rs
index 8dc58eee5fb..8dc58eee5fb 100644
--- a/src/test/ui/issue-31212.rs
+++ b/src/test/ui/issues/issue-31212.rs
diff --git a/src/test/ui/issue-31212.stderr b/src/test/ui/issues/issue-31212.stderr
index 17cf2e81236..17cf2e81236 100644
--- a/src/test/ui/issue-31212.stderr
+++ b/src/test/ui/issues/issue-31212.stderr
diff --git a/src/test/ui/issue-31221.rs b/src/test/ui/issues/issue-31221.rs
index ca15a869a9c..ca15a869a9c 100644
--- a/src/test/ui/issue-31221.rs
+++ b/src/test/ui/issues/issue-31221.rs
diff --git a/src/test/ui/issue-31221.stderr b/src/test/ui/issues/issue-31221.stderr
index 56c7b8ab6e7..56c7b8ab6e7 100644
--- a/src/test/ui/issue-31221.stderr
+++ b/src/test/ui/issues/issue-31221.stderr
diff --git a/src/test/ui/issue-31495.rs b/src/test/ui/issues/issue-31495.rs
index 794b8bb86bb..794b8bb86bb 100644
--- a/src/test/ui/issue-31495.rs
+++ b/src/test/ui/issues/issue-31495.rs
diff --git a/src/test/ui/issue-31511.rs b/src/test/ui/issues/issue-31511.rs
index dd1af2f4448..dd1af2f4448 100644
--- a/src/test/ui/issue-31511.rs
+++ b/src/test/ui/issues/issue-31511.rs
diff --git a/src/test/ui/issue-31511.stderr b/src/test/ui/issues/issue-31511.stderr
index 7d4c9426da1..7d4c9426da1 100644
--- a/src/test/ui/issue-31511.stderr
+++ b/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
index 91010bd3209..91010bd3209 100644
--- a/src/test/ui/issue-3154.nll.stderr
+++ b/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
index 519e9d06d1b..519e9d06d1b 100644
--- a/src/test/ui/issue-3154.rs
+++ b/src/test/ui/issues/issue-3154.rs
diff --git a/src/test/ui/issue-3154.stderr b/src/test/ui/issues/issue-3154.stderr
index 01299d74808..01299d74808 100644
--- a/src/test/ui/issue-3154.stderr
+++ b/src/test/ui/issues/issue-3154.stderr
diff --git a/src/test/ui/issue-31561.rs b/src/test/ui/issues/issue-31561.rs
index f8645c4d3a7..f8645c4d3a7 100644
--- a/src/test/ui/issue-31561.rs
+++ b/src/test/ui/issues/issue-31561.rs
diff --git a/src/test/ui/issue-31561.stderr b/src/test/ui/issues/issue-31561.stderr
index 4608a95459b..4608a95459b 100644
--- a/src/test/ui/issue-31561.stderr
+++ b/src/test/ui/issues/issue-31561.stderr
diff --git a/src/test/ui/issue-31769.rs b/src/test/ui/issues/issue-31769.rs
index 2bd45deeab4..2bd45deeab4 100644
--- a/src/test/ui/issue-31769.rs
+++ b/src/test/ui/issues/issue-31769.rs
diff --git a/src/test/ui/issue-31769.stderr b/src/test/ui/issues/issue-31769.stderr
index 1f1904e3c2c..1f1904e3c2c 100644
--- a/src/test/ui/issue-31769.stderr
+++ b/src/test/ui/issues/issue-31769.stderr
diff --git a/src/test/ui/issue-31804.rs b/src/test/ui/issues/issue-31804.rs
index cea52b11c5d..cea52b11c5d 100644
--- a/src/test/ui/issue-31804.rs
+++ b/src/test/ui/issues/issue-31804.rs
diff --git a/src/test/ui/issue-31804.stderr b/src/test/ui/issues/issue-31804.stderr
index e0ac2f631ba..e0ac2f631ba 100644
--- a/src/test/ui/issue-31804.stderr
+++ b/src/test/ui/issues/issue-31804.stderr
diff --git a/src/test/ui/issue-31845.rs b/src/test/ui/issues/issue-31845.rs
index 514255e4676..514255e4676 100644
--- a/src/test/ui/issue-31845.rs
+++ b/src/test/ui/issues/issue-31845.rs
diff --git a/src/test/ui/issue-31845.stderr b/src/test/ui/issues/issue-31845.stderr
index 9fb8f2ead87..9fb8f2ead87 100644
--- a/src/test/ui/issue-31845.stderr
+++ b/src/test/ui/issues/issue-31845.stderr
diff --git a/src/test/ui/issue-31910.rs b/src/test/ui/issues/issue-31910.rs
index 7524049c5df..7524049c5df 100644
--- a/src/test/ui/issue-31910.rs
+++ b/src/test/ui/issues/issue-31910.rs
diff --git a/src/test/ui/issue-31910.stderr b/src/test/ui/issues/issue-31910.stderr
index da5aa154450..da5aa154450 100644
--- a/src/test/ui/issue-31910.stderr
+++ b/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
index d9ce1159c0e..d9ce1159c0e 100644
--- a/src/test/ui/issue-31924-non-snake-ffi.rs
+++ b/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
index 2aaaa1578a5..2aaaa1578a5 100644
--- a/src/test/ui/issue-31924-non-snake-ffi.stderr
+++ b/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
index 7e1f4c28d21..7e1f4c28d21 100644
--- a/src/test/ui/issue-32004.rs
+++ b/src/test/ui/issues/issue-32004.rs
diff --git a/src/test/ui/issue-32004.stderr b/src/test/ui/issues/issue-32004.stderr
index c409d4bb612..c409d4bb612 100644
--- a/src/test/ui/issue-32004.stderr
+++ b/src/test/ui/issues/issue-32004.stderr
diff --git a/src/test/ui/issue-32086.rs b/src/test/ui/issues/issue-32086.rs
index dd236b76a67..dd236b76a67 100644
--- a/src/test/ui/issue-32086.rs
+++ b/src/test/ui/issues/issue-32086.rs
diff --git a/src/test/ui/issue-32086.stderr b/src/test/ui/issues/issue-32086.stderr
index 28d21708b21..28d21708b21 100644
--- a/src/test/ui/issue-32086.stderr
+++ b/src/test/ui/issues/issue-32086.stderr
diff --git a/src/test/ui/issue-32119.rs b/src/test/ui/issues/issue-32119.rs
index e630a01a593..e630a01a593 100644
--- a/src/test/ui/issue-32119.rs
+++ b/src/test/ui/issues/issue-32119.rs
diff --git a/src/test/ui/issue-32119.stderr b/src/test/ui/issues/issue-32119.stderr
index 04276ec1ffd..04276ec1ffd 100644
--- a/src/test/ui/issue-32119.stderr
+++ b/src/test/ui/issues/issue-32119.stderr
diff --git a/src/test/ui/issue-3214.rs b/src/test/ui/issues/issue-3214.rs
index 9a769c39eca..9a769c39eca 100644
--- a/src/test/ui/issue-3214.rs
+++ b/src/test/ui/issues/issue-3214.rs
diff --git a/src/test/ui/issue-3214.stderr b/src/test/ui/issues/issue-3214.stderr
index 1298e4a007d..1298e4a007d 100644
--- a/src/test/ui/issue-3214.stderr
+++ b/src/test/ui/issues/issue-3214.stderr
diff --git a/src/test/ui/issue-32201.rs b/src/test/ui/issues/issue-32201.rs
index bf9f8ecbc80..bf9f8ecbc80 100644
--- a/src/test/ui/issue-32201.rs
+++ b/src/test/ui/issues/issue-32201.rs
diff --git a/src/test/ui/issue-32201.stderr b/src/test/ui/issues/issue-32201.stderr
index 986c2f0890c..986c2f0890c 100644
--- a/src/test/ui/issue-32201.stderr
+++ b/src/test/ui/issues/issue-32201.stderr
diff --git a/src/test/ui/issue-32222.rs b/src/test/ui/issues/issue-32222.rs
index b3b34f4b0ef..b3b34f4b0ef 100644
--- a/src/test/ui/issue-32222.rs
+++ b/src/test/ui/issues/issue-32222.rs
diff --git a/src/test/ui/issue-32222.stderr b/src/test/ui/issues/issue-32222.stderr
index ba2c5396e4d..ba2c5396e4d 100644
--- a/src/test/ui/issue-32222.stderr
+++ b/src/test/ui/issues/issue-32222.stderr
diff --git a/src/test/ui/issue-32323.rs b/src/test/ui/issues/issue-32323.rs
index e5cb8130327..e5cb8130327 100644
--- a/src/test/ui/issue-32323.rs
+++ b/src/test/ui/issues/issue-32323.rs
diff --git a/src/test/ui/issue-32323.stderr b/src/test/ui/issues/issue-32323.stderr
index 09ac1553b3a..09ac1553b3a 100644
--- a/src/test/ui/issue-32323.stderr
+++ b/src/test/ui/issues/issue-32323.stderr
diff --git a/src/test/ui/issue-32326.rs b/src/test/ui/issues/issue-32326.rs
index 8af243afc22..8af243afc22 100644
--- a/src/test/ui/issue-32326.rs
+++ b/src/test/ui/issues/issue-32326.rs
diff --git a/src/test/ui/issue-32326.stderr b/src/test/ui/issues/issue-32326.stderr
index b7e359af64a..b7e359af64a 100644
--- a/src/test/ui/issue-32326.stderr
+++ b/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
index 251f7eb9a24..251f7eb9a24 100644
--- a/src/test/ui/issue-32354-suggest-import-rename.fixed
+++ b/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
index 57cbeb47a1e..57cbeb47a1e 100644
--- a/src/test/ui/issue-32354-suggest-import-rename.rs
+++ b/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
index f45a5f7dd61..f45a5f7dd61 100644
--- a/src/test/ui/issue-32354-suggest-import-rename.stderr
+++ b/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
index 5091ba4ee1a..5091ba4ee1a 100644
--- a/src/test/ui/compile-fail-migration/issue-32377.rs
+++ b/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
index a0698885caa..a0698885caa 100644
--- a/src/test/ui/compile-fail-migration/issue-32377.stderr
+++ b/src/test/ui/issues/issue-32377.stderr
diff --git a/src/test/ui/issue-32655.rs b/src/test/ui/issues/issue-32655.rs
index 25ecd5d0862..25ecd5d0862 100644
--- a/src/test/ui/issue-32655.rs
+++ b/src/test/ui/issues/issue-32655.rs
diff --git a/src/test/ui/issue-32655.stderr b/src/test/ui/issues/issue-32655.stderr
index a1323808a91..a1323808a91 100644
--- a/src/test/ui/issue-32655.stderr
+++ b/src/test/ui/issues/issue-32655.stderr
diff --git a/src/test/ui/issue-32709.rs b/src/test/ui/issues/issue-32709.rs
index 09538818dcd..09538818dcd 100644
--- a/src/test/ui/issue-32709.rs
+++ b/src/test/ui/issues/issue-32709.rs
diff --git a/src/test/ui/issue-32709.stderr b/src/test/ui/issues/issue-32709.stderr
index 8da4be2ba2b..8da4be2ba2b 100644
--- a/src/test/ui/issue-32709.stderr
+++ b/src/test/ui/issues/issue-32709.stderr
diff --git a/src/test/ui/issue-32782.rs b/src/test/ui/issues/issue-32782.rs
index 696ea0ef547..696ea0ef547 100644
--- a/src/test/ui/issue-32782.rs
+++ b/src/test/ui/issues/issue-32782.rs
diff --git a/src/test/ui/issue-32782.stderr b/src/test/ui/issues/issue-32782.stderr
index 8b486000a45..8b486000a45 100644
--- a/src/test/ui/issue-32782.stderr
+++ b/src/test/ui/issues/issue-32782.stderr
diff --git a/src/test/ui/issue-32797.rs b/src/test/ui/issues/issue-32797.rs
index 2c54ed3e857..2c54ed3e857 100644
--- a/src/test/ui/issue-32797.rs
+++ b/src/test/ui/issues/issue-32797.rs
diff --git a/src/test/ui/issue-32797.stderr b/src/test/ui/issues/issue-32797.stderr
index 8e1430e505d..8e1430e505d 100644
--- a/src/test/ui/issue-32797.stderr
+++ b/src/test/ui/issues/issue-32797.stderr
diff --git a/src/test/ui/issue-32829.rs b/src/test/ui/issues/issue-32829.rs
index 60e83138c76..60e83138c76 100644
--- a/src/test/ui/issue-32829.rs
+++ b/src/test/ui/issues/issue-32829.rs
diff --git a/src/test/ui/issue-32829.stderr b/src/test/ui/issues/issue-32829.stderr
index 30b6a642904..30b6a642904 100644
--- a/src/test/ui/issue-32829.stderr
+++ b/src/test/ui/issues/issue-32829.stderr
diff --git a/src/test/ui/issue-32833.rs b/src/test/ui/issues/issue-32833.rs
index 41383e93603..41383e93603 100644
--- a/src/test/ui/issue-32833.rs
+++ b/src/test/ui/issues/issue-32833.rs
diff --git a/src/test/ui/issue-32833.stderr b/src/test/ui/issues/issue-32833.stderr
index 11af5d56766..11af5d56766 100644
--- a/src/test/ui/issue-32833.stderr
+++ b/src/test/ui/issues/issue-32833.stderr
diff --git a/src/test/ui/issue-32922.rs b/src/test/ui/issues/issue-32922.rs
index 317a47156c1..317a47156c1 100644
--- a/src/test/ui/issue-32922.rs
+++ b/src/test/ui/issues/issue-32922.rs
diff --git a/src/test/ui/issue-32922.stderr b/src/test/ui/issues/issue-32922.stderr
index c1e80b0eb78..c1e80b0eb78 100644
--- a/src/test/ui/issue-32922.stderr
+++ b/src/test/ui/issues/issue-32922.stderr
diff --git a/src/test/ui/issue-32950.rs b/src/test/ui/issues/issue-32950.rs
index 4e5cdd50b2a..4e5cdd50b2a 100644
--- a/src/test/ui/issue-32950.rs
+++ b/src/test/ui/issues/issue-32950.rs
diff --git a/src/test/ui/issue-32950.stderr b/src/test/ui/issues/issue-32950.stderr
index 0363bf05f00..0363bf05f00 100644
--- a/src/test/ui/issue-32950.stderr
+++ b/src/test/ui/issues/issue-32950.stderr
diff --git a/src/test/ui/issue-32963.rs b/src/test/ui/issues/issue-32963.rs
index 24db822f89c..24db822f89c 100644
--- a/src/test/ui/issue-32963.rs
+++ b/src/test/ui/issues/issue-32963.rs
diff --git a/src/test/ui/issue-32963.stderr b/src/test/ui/issues/issue-32963.stderr
index dff7c9f2b8b..dff7c9f2b8b 100644
--- a/src/test/ui/issue-32963.stderr
+++ b/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
index 18424fcc9e0..18424fcc9e0 100644
--- a/src/test/ui/issue-32995-2.rs
+++ b/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
index 68eda14f81d..68eda14f81d 100644
--- a/src/test/ui/issue-32995-2.stderr
+++ b/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
index ffbd0c0c22a..ffbd0c0c22a 100644
--- a/src/test/ui/issue-32995.rs
+++ b/src/test/ui/issues/issue-32995.rs
diff --git a/src/test/ui/issue-32995.stderr b/src/test/ui/issues/issue-32995.stderr
index f427964135c..f427964135c 100644
--- a/src/test/ui/issue-32995.stderr
+++ b/src/test/ui/issues/issue-32995.stderr
diff --git a/src/test/ui/issue-33241.rs b/src/test/ui/issues/issue-33241.rs
index 6a411b4c59c..6a411b4c59c 100644
--- a/src/test/ui/issue-33241.rs
+++ b/src/test/ui/issues/issue-33241.rs
diff --git a/src/test/ui/issue-33241.stderr b/src/test/ui/issues/issue-33241.stderr
index 1b6577dc41f..1b6577dc41f 100644
--- a/src/test/ui/issue-33241.stderr
+++ b/src/test/ui/issues/issue-33241.stderr
diff --git a/src/test/ui/issue-33293.rs b/src/test/ui/issues/issue-33293.rs
index bed577b8b9d..bed577b8b9d 100644
--- a/src/test/ui/issue-33293.rs
+++ b/src/test/ui/issues/issue-33293.rs
diff --git a/src/test/ui/issue-33293.stderr b/src/test/ui/issues/issue-33293.stderr
index e94979b6da4..e94979b6da4 100644
--- a/src/test/ui/issue-33293.stderr
+++ b/src/test/ui/issues/issue-33293.stderr
diff --git a/src/test/ui/issue-3344.rs b/src/test/ui/issues/issue-3344.rs
index 73532cb768a..73532cb768a 100644
--- a/src/test/ui/issue-3344.rs
+++ b/src/test/ui/issues/issue-3344.rs
diff --git a/src/test/ui/issue-3344.stderr b/src/test/ui/issues/issue-3344.stderr
index eb6caa7307e..eb6caa7307e 100644
--- a/src/test/ui/issue-3344.stderr
+++ b/src/test/ui/issues/issue-3344.stderr
diff --git a/src/test/ui/issue-33464.rs b/src/test/ui/issues/issue-33464.rs
index b7dbaf20eca..b7dbaf20eca 100644
--- a/src/test/ui/issue-33464.rs
+++ b/src/test/ui/issues/issue-33464.rs
diff --git a/src/test/ui/issue-33464.stderr b/src/test/ui/issues/issue-33464.stderr
index b70fff01c9e..b70fff01c9e 100644
--- a/src/test/ui/issue-33464.stderr
+++ b/src/test/ui/issues/issue-33464.stderr
diff --git a/src/test/ui/issue-33504.rs b/src/test/ui/issues/issue-33504.rs
index 1e1994357c7..1e1994357c7 100644
--- a/src/test/ui/issue-33504.rs
+++ b/src/test/ui/issues/issue-33504.rs
diff --git a/src/test/ui/issue-33504.stderr b/src/test/ui/issues/issue-33504.stderr
index ecf8076b2b3..ecf8076b2b3 100644
--- a/src/test/ui/issue-33504.stderr
+++ b/src/test/ui/issues/issue-33504.stderr
diff --git a/src/test/ui/issue-33525.rs b/src/test/ui/issues/issue-33525.rs
index 0589618a82f..0589618a82f 100644
--- a/src/test/ui/issue-33525.rs
+++ b/src/test/ui/issues/issue-33525.rs
diff --git a/src/test/ui/issue-33525.stderr b/src/test/ui/issues/issue-33525.stderr
index 2b365e1cc98..2b365e1cc98 100644
--- a/src/test/ui/issue-33525.stderr
+++ b/src/test/ui/issues/issue-33525.stderr
diff --git a/src/test/ui/issue-33571.rs b/src/test/ui/issues/issue-33571.rs
index 5dfc41c8f4a..5dfc41c8f4a 100644
--- a/src/test/ui/issue-33571.rs
+++ b/src/test/ui/issues/issue-33571.rs
diff --git a/src/test/ui/issue-33571.stderr b/src/test/ui/issues/issue-33571.stderr
index be45f377c1f..be45f377c1f 100644
--- a/src/test/ui/issue-33571.stderr
+++ b/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
index 78ad31a04c8..78ad31a04c8 100644
--- a/src/test/ui/issue-33819.nll.stderr
+++ b/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
index 499e7e54947..499e7e54947 100644
--- a/src/test/ui/issue-33819.rs
+++ b/src/test/ui/issues/issue-33819.rs
diff --git a/src/test/ui/issue-33819.stderr b/src/test/ui/issues/issue-33819.stderr
index bb8a542b12b..bb8a542b12b 100644
--- a/src/test/ui/issue-33819.stderr
+++ b/src/test/ui/issues/issue-33819.stderr
diff --git a/src/test/ui/issue-33941.rs b/src/test/ui/issues/issue-33941.rs
index 21c169c6638..21c169c6638 100644
--- a/src/test/ui/issue-33941.rs
+++ b/src/test/ui/issues/issue-33941.rs
diff --git a/src/test/ui/issue-33941.stderr b/src/test/ui/issues/issue-33941.stderr
index f20b87fa371..f20b87fa371 100644
--- a/src/test/ui/issue-33941.stderr
+++ b/src/test/ui/issues/issue-33941.stderr
diff --git a/src/test/ui/issue-34028.rs b/src/test/ui/issues/issue-34028.rs
index 117ab18a115..117ab18a115 100644
--- a/src/test/ui/issue-34028.rs
+++ b/src/test/ui/issues/issue-34028.rs
diff --git a/src/test/ui/issue-34028.stderr b/src/test/ui/issues/issue-34028.stderr
index b715fa84f60..b715fa84f60 100644
--- a/src/test/ui/issue-34028.stderr
+++ b/src/test/ui/issues/issue-34028.stderr
diff --git a/src/test/ui/issue-34047.rs b/src/test/ui/issues/issue-34047.rs
index db284102503..db284102503 100644
--- a/src/test/ui/issue-34047.rs
+++ b/src/test/ui/issues/issue-34047.rs
diff --git a/src/test/ui/issue-34047.stderr b/src/test/ui/issues/issue-34047.stderr
index 10804cc6fff..10804cc6fff 100644
--- a/src/test/ui/issue-34047.stderr
+++ b/src/test/ui/issues/issue-34047.stderr
diff --git a/src/test/ui/issue-34171.rs b/src/test/ui/issues/issue-34171.rs
index 30dd34ae9a0..30dd34ae9a0 100644
--- a/src/test/ui/issue-34171.rs
+++ b/src/test/ui/issues/issue-34171.rs
diff --git a/src/test/ui/issue-34171.stderr b/src/test/ui/issues/issue-34171.stderr
index cb8cfbd8599..cb8cfbd8599 100644
--- a/src/test/ui/issue-34171.stderr
+++ b/src/test/ui/issues/issue-34171.stderr
diff --git a/src/test/ui/issue-34209.rs b/src/test/ui/issues/issue-34209.rs
index b3cb7d4cc30..b3cb7d4cc30 100644
--- a/src/test/ui/issue-34209.rs
+++ b/src/test/ui/issues/issue-34209.rs
diff --git a/src/test/ui/issue-34209.stderr b/src/test/ui/issues/issue-34209.stderr
index 5c31acea5b6..5c31acea5b6 100644
--- a/src/test/ui/issue-34209.stderr
+++ b/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
index 6c85414860f..6c85414860f 100644
--- a/src/test/ui/issue-34222-1.rs
+++ b/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
index ef68d41da3c..ef68d41da3c 100644
--- a/src/test/ui/issue-34222-1.stderr
+++ b/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
index a752a36ade2..a752a36ade2 100644
--- a/src/test/ui/issue-34334.rs
+++ b/src/test/ui/issues/issue-34334.rs
diff --git a/src/test/ui/issue-34334.stderr b/src/test/ui/issues/issue-34334.stderr
index 240df196ae7..240df196ae7 100644
--- a/src/test/ui/issue-34334.stderr
+++ b/src/test/ui/issues/issue-34334.stderr
diff --git a/src/test/ui/issue-34349.rs b/src/test/ui/issues/issue-34349.rs
index 591753181db..591753181db 100644
--- a/src/test/ui/issue-34349.rs
+++ b/src/test/ui/issues/issue-34349.rs
diff --git a/src/test/ui/issue-34349.stderr b/src/test/ui/issues/issue-34349.stderr
index 8683962b24d..8683962b24d 100644
--- a/src/test/ui/issue-34349.stderr
+++ b/src/test/ui/issues/issue-34349.stderr
diff --git a/src/test/ui/issue-34373.rs b/src/test/ui/issues/issue-34373.rs
index 4d7238ad76f..4d7238ad76f 100644
--- a/src/test/ui/issue-34373.rs
+++ b/src/test/ui/issues/issue-34373.rs
diff --git a/src/test/ui/issue-34373.stderr b/src/test/ui/issues/issue-34373.stderr
index ea80111b5e2..ea80111b5e2 100644
--- a/src/test/ui/issue-34373.stderr
+++ b/src/test/ui/issues/issue-34373.stderr
diff --git a/src/test/ui/issue-34418.rs b/src/test/ui/issues/issue-34418.rs
index 6bc0add2205..6bc0add2205 100644
--- a/src/test/ui/issue-34418.rs
+++ b/src/test/ui/issues/issue-34418.rs
diff --git a/src/test/ui/issue-34418.stderr b/src/test/ui/issues/issue-34418.stderr
index 4cb5ec1ae3b..4cb5ec1ae3b 100644
--- a/src/test/ui/issue-34418.stderr
+++ b/src/test/ui/issues/issue-34418.stderr
diff --git a/src/test/ui/issue-3477.rs b/src/test/ui/issues/issue-3477.rs
index 0bad7372a12..0bad7372a12 100644
--- a/src/test/ui/issue-3477.rs
+++ b/src/test/ui/issues/issue-3477.rs
diff --git a/src/test/ui/issue-3477.stderr b/src/test/ui/issues/issue-3477.stderr
index 4207828693a..4207828693a 100644
--- a/src/test/ui/issue-3477.stderr
+++ b/src/test/ui/issues/issue-3477.stderr
diff --git a/src/test/ui/issue-34839.rs b/src/test/ui/issues/issue-34839.rs
index be7e7820020..be7e7820020 100644
--- a/src/test/ui/issue-34839.rs
+++ b/src/test/ui/issues/issue-34839.rs
diff --git a/src/test/ui/issue-34839.stderr b/src/test/ui/issues/issue-34839.stderr
index 538cc7a581b..538cc7a581b 100644
--- a/src/test/ui/issue-34839.stderr
+++ b/src/test/ui/issues/issue-34839.stderr
diff --git a/src/test/ui/issue-35075.rs b/src/test/ui/issues/issue-35075.rs
index 9943cfb9bca..9943cfb9bca 100644
--- a/src/test/ui/issue-35075.rs
+++ b/src/test/ui/issues/issue-35075.rs
diff --git a/src/test/ui/issue-35075.stderr b/src/test/ui/issues/issue-35075.stderr
index 9b2f17f038b..9b2f17f038b 100644
--- a/src/test/ui/issue-35075.stderr
+++ b/src/test/ui/issues/issue-35075.stderr
diff --git a/src/test/ui/issue-35139.rs b/src/test/ui/issues/issue-35139.rs
index 67f0e7aaf97..67f0e7aaf97 100644
--- a/src/test/ui/issue-35139.rs
+++ b/src/test/ui/issues/issue-35139.rs
diff --git a/src/test/ui/issue-35139.stderr b/src/test/ui/issues/issue-35139.stderr
index 7ec1459dd16..7ec1459dd16 100644
--- a/src/test/ui/issue-35139.stderr
+++ b/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
index 1742cb4fb72..1742cb4fb72 100644
--- a/src/test/ui/issue-3521-2.rs
+++ b/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
index 07c37fadbba..07c37fadbba 100644
--- a/src/test/ui/issue-3521-2.stderr
+++ b/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
index 78af11a0b58..78af11a0b58 100644
--- a/src/test/ui/issue-3521.rs
+++ b/src/test/ui/issues/issue-3521.rs
diff --git a/src/test/ui/issue-3521.stderr b/src/test/ui/issues/issue-3521.stderr
index f4a1ef5cefa..f4a1ef5cefa 100644
--- a/src/test/ui/issue-3521.stderr
+++ b/src/test/ui/issues/issue-3521.stderr
diff --git a/src/test/ui/issue-35241.rs b/src/test/ui/issues/issue-35241.rs
index 4616f25bdfb..4616f25bdfb 100644
--- a/src/test/ui/issue-35241.rs
+++ b/src/test/ui/issues/issue-35241.rs
diff --git a/src/test/ui/issue-35241.stderr b/src/test/ui/issues/issue-35241.stderr
index 42bf0aae5b1..42bf0aae5b1 100644
--- a/src/test/ui/issue-35241.stderr
+++ b/src/test/ui/issues/issue-35241.stderr
diff --git a/src/test/ui/issue-35450.rs b/src/test/ui/issues/issue-35450.rs
index 5f54f269c6c..5f54f269c6c 100644
--- a/src/test/ui/issue-35450.rs
+++ b/src/test/ui/issues/issue-35450.rs
diff --git a/src/test/ui/issue-35450.stderr b/src/test/ui/issues/issue-35450.stderr
index b8fc7d2054c..b8fc7d2054c 100644
--- a/src/test/ui/issue-35450.stderr
+++ b/src/test/ui/issues/issue-35450.stderr
diff --git a/src/test/ui/issue-35570.rs b/src/test/ui/issues/issue-35570.rs
index 092bf00ddd6..092bf00ddd6 100644
--- a/src/test/ui/issue-35570.rs
+++ b/src/test/ui/issues/issue-35570.rs
diff --git a/src/test/ui/issue-35570.stderr b/src/test/ui/issues/issue-35570.stderr
index 349693f29d5..349693f29d5 100644
--- a/src/test/ui/issue-35570.stderr
+++ b/src/test/ui/issues/issue-35570.stderr
diff --git a/src/test/ui/issue-35668.rs b/src/test/ui/issues/issue-35668.rs
index 17fd77b6df3..17fd77b6df3 100644
--- a/src/test/ui/issue-35668.rs
+++ b/src/test/ui/issues/issue-35668.rs
diff --git a/src/test/ui/issue-35668.stderr b/src/test/ui/issues/issue-35668.stderr
index 51d6b040240..51d6b040240 100644
--- a/src/test/ui/issue-35668.stderr
+++ b/src/test/ui/issues/issue-35668.stderr
diff --git a/src/test/ui/issue-35675.rs b/src/test/ui/issues/issue-35675.rs
index f3495468151..f3495468151 100644
--- a/src/test/ui/issue-35675.rs
+++ b/src/test/ui/issues/issue-35675.rs
diff --git a/src/test/ui/issue-35675.stderr b/src/test/ui/issues/issue-35675.stderr
index fef8de3a28d..fef8de3a28d 100644
--- a/src/test/ui/issue-35675.stderr
+++ b/src/test/ui/issues/issue-35675.stderr
diff --git a/src/test/ui/issue-35869.rs b/src/test/ui/issues/issue-35869.rs
index 7bab22edcf6..7bab22edcf6 100644
--- a/src/test/ui/issue-35869.rs
+++ b/src/test/ui/issues/issue-35869.rs
diff --git a/src/test/ui/issue-35869.stderr b/src/test/ui/issues/issue-35869.stderr
index 1930dd5bbcb..1930dd5bbcb 100644
--- a/src/test/ui/issue-35869.stderr
+++ b/src/test/ui/issues/issue-35869.stderr
diff --git a/src/test/ui/issue-35976.rs b/src/test/ui/issues/issue-35976.rs
index d45b0c5a041..d45b0c5a041 100644
--- a/src/test/ui/issue-35976.rs
+++ b/src/test/ui/issues/issue-35976.rs
diff --git a/src/test/ui/issue-35976.stderr b/src/test/ui/issues/issue-35976.stderr
index f97ba33dfd3..f97ba33dfd3 100644
--- a/src/test/ui/issue-35976.stderr
+++ b/src/test/ui/issues/issue-35976.stderr
diff --git a/src/test/ui/issue-35988.rs b/src/test/ui/issues/issue-35988.rs
index 5909322ff1f..5909322ff1f 100644
--- a/src/test/ui/issue-35988.rs
+++ b/src/test/ui/issues/issue-35988.rs
diff --git a/src/test/ui/issue-35988.stderr b/src/test/ui/issues/issue-35988.stderr
index 0b9d8469247..0b9d8469247 100644
--- a/src/test/ui/issue-35988.stderr
+++ b/src/test/ui/issues/issue-35988.stderr
diff --git a/src/test/ui/issue-3601.rs b/src/test/ui/issues/issue-3601.rs
index cc69a76e043..cc69a76e043 100644
--- a/src/test/ui/issue-3601.rs
+++ b/src/test/ui/issues/issue-3601.rs
diff --git a/src/test/ui/issue-3601.stderr b/src/test/ui/issues/issue-3601.stderr
index 6c28ccb2ee8..6c28ccb2ee8 100644
--- a/src/test/ui/issue-3601.stderr
+++ b/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
index cf280bd80b2..cf280bd80b2 100644
--- a/src/test/ui/issue-36082.ast.nll.stderr
+++ b/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
index b79958de5cb..b79958de5cb 100644
--- a/src/test/ui/issue-36082.ast.stderr
+++ b/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
index cf280bd80b2..cf280bd80b2 100644
--- a/src/test/ui/issue-36082.mir.stderr
+++ b/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
index ed6a2f85fbe..ed6a2f85fbe 100644
--- a/src/test/ui/issue-36082.rs
+++ b/src/test/ui/issues/issue-36082.rs
diff --git a/src/test/ui/issue-36116.rs b/src/test/ui/issues/issue-36116.rs
index 3afbfa61984..3afbfa61984 100644
--- a/src/test/ui/issue-36116.rs
+++ b/src/test/ui/issues/issue-36116.rs
diff --git a/src/test/ui/issue-36116.stderr b/src/test/ui/issues/issue-36116.stderr
index df69dcb0d92..df69dcb0d92 100644
--- a/src/test/ui/issue-36116.stderr
+++ b/src/test/ui/issues/issue-36116.stderr
diff --git a/src/test/ui/issue-36163.rs b/src/test/ui/issues/issue-36163.rs
index 4c74d9d9173..4c74d9d9173 100644
--- a/src/test/ui/issue-36163.rs
+++ b/src/test/ui/issues/issue-36163.rs
diff --git a/src/test/ui/issue-36163.stderr b/src/test/ui/issues/issue-36163.stderr
index 5623437669f..5623437669f 100644
--- a/src/test/ui/issue-36163.stderr
+++ b/src/test/ui/issues/issue-36163.stderr
diff --git a/src/test/ui/issue-36299.rs b/src/test/ui/issues/issue-36299.rs
index 88ac74cb09e..88ac74cb09e 100644
--- a/src/test/ui/issue-36299.rs
+++ b/src/test/ui/issues/issue-36299.rs
diff --git a/src/test/ui/issue-36299.stderr b/src/test/ui/issues/issue-36299.stderr
index faa20253b9b..faa20253b9b 100644
--- a/src/test/ui/issue-36299.stderr
+++ b/src/test/ui/issues/issue-36299.stderr
diff --git a/src/test/ui/issue-36379.rs b/src/test/ui/issues/issue-36379.rs
index b20765815e0..b20765815e0 100644
--- a/src/test/ui/issue-36379.rs
+++ b/src/test/ui/issues/issue-36379.rs
diff --git a/src/test/ui/issue-36379.stderr b/src/test/ui/issues/issue-36379.stderr
index b06591f411e..b06591f411e 100644
--- a/src/test/ui/issue-36379.stderr
+++ b/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
index e4347f0ece8..e4347f0ece8 100644
--- a/src/test/ui/issue-36400.nll.stderr
+++ b/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
index fa4361e42aa..fa4361e42aa 100644
--- a/src/test/ui/issue-36400.rs
+++ b/src/test/ui/issues/issue-36400.rs
diff --git a/src/test/ui/issue-36400.stderr b/src/test/ui/issues/issue-36400.stderr
index dbd6999b4f2..dbd6999b4f2 100644
--- a/src/test/ui/issue-36400.stderr
+++ b/src/test/ui/issues/issue-36400.stderr
diff --git a/src/test/ui/issue-36617.rs b/src/test/ui/issues/issue-36617.rs
index 9f5eeb1a45d..9f5eeb1a45d 100644
--- a/src/test/ui/issue-36617.rs
+++ b/src/test/ui/issues/issue-36617.rs
diff --git a/src/test/ui/issue-36617.stderr b/src/test/ui/issues/issue-36617.stderr
index efd58235282..efd58235282 100644
--- a/src/test/ui/issue-36617.stderr
+++ b/src/test/ui/issues/issue-36617.stderr
diff --git a/src/test/ui/issue-36638.rs b/src/test/ui/issues/issue-36638.rs
index 5e43536ef3f..5e43536ef3f 100644
--- a/src/test/ui/issue-36638.rs
+++ b/src/test/ui/issues/issue-36638.rs
diff --git a/src/test/ui/issue-36638.stderr b/src/test/ui/issues/issue-36638.stderr
index d111fb469bf..d111fb469bf 100644
--- a/src/test/ui/issue-36638.stderr
+++ b/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
index fe46877e8d3..fe46877e8d3 100644
--- a/src/test/ui/issue-3668-2.rs
+++ b/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
index e78a2791907..e78a2791907 100644
--- a/src/test/ui/issue-3668-2.stderr
+++ b/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
index 00f64414a9e..00f64414a9e 100644
--- a/src/test/ui/issue-3668.rs
+++ b/src/test/ui/issues/issue-3668.rs
diff --git a/src/test/ui/issue-3668.stderr b/src/test/ui/issues/issue-3668.stderr
index 73eaf57c955..73eaf57c955 100644
--- a/src/test/ui/issue-3668.stderr
+++ b/src/test/ui/issues/issue-3668.stderr
diff --git a/src/test/ui/issue-36708.rs b/src/test/ui/issues/issue-36708.rs
index 92a724a7e96..92a724a7e96 100644
--- a/src/test/ui/issue-36708.rs
+++ b/src/test/ui/issues/issue-36708.rs
diff --git a/src/test/ui/issue-36708.stderr b/src/test/ui/issues/issue-36708.stderr
index 4e28a769f50..4e28a769f50 100644
--- a/src/test/ui/issue-36708.stderr
+++ b/src/test/ui/issues/issue-36708.stderr
diff --git a/src/test/ui/issue-3680.rs b/src/test/ui/issues/issue-3680.rs
index e698e6da529..e698e6da529 100644
--- a/src/test/ui/issue-3680.rs
+++ b/src/test/ui/issues/issue-3680.rs
diff --git a/src/test/ui/issue-3680.stderr b/src/test/ui/issues/issue-3680.stderr
index 4fea4789dbd..4fea4789dbd 100644
--- a/src/test/ui/issue-3680.stderr
+++ b/src/test/ui/issues/issue-3680.stderr
diff --git a/src/test/ui/issue-36839.rs b/src/test/ui/issues/issue-36839.rs
index 3e34b250672..3e34b250672 100644
--- a/src/test/ui/issue-36839.rs
+++ b/src/test/ui/issues/issue-36839.rs
diff --git a/src/test/ui/issue-36839.stderr b/src/test/ui/issues/issue-36839.stderr
index dd78668801c..dd78668801c 100644
--- a/src/test/ui/issue-36839.stderr
+++ b/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
index 0f5aa24926b..0f5aa24926b 100644
--- a/src/test/ui/compile-fail-migration/issue-36881.rs
+++ b/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
index 39132fde762..39132fde762 100644
--- a/src/test/ui/compile-fail-migration/issue-36881.stderr
+++ b/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
index 325f05841f4..325f05841f4 100644
--- a/src/test/ui/issue-3702-2.rs
+++ b/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
index 9ec400db47f..9ec400db47f 100644
--- a/src/test/ui/issue-3702-2.stderr
+++ b/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
index 95fd5d1222e..95fd5d1222e 100644
--- a/src/test/ui/issue-37026.rs
+++ b/src/test/ui/issues/issue-37026.rs
diff --git a/src/test/ui/issue-37026.stderr b/src/test/ui/issues/issue-37026.stderr
index c53ec5b55ce..c53ec5b55ce 100644
--- a/src/test/ui/issue-37026.stderr
+++ b/src/test/ui/issues/issue-37026.stderr
diff --git a/src/test/ui/issue-37051.rs b/src/test/ui/issues/issue-37051.rs
index ab08e1899a0..ab08e1899a0 100644
--- a/src/test/ui/issue-37051.rs
+++ b/src/test/ui/issues/issue-37051.rs
diff --git a/src/test/ui/issue-37051.stderr b/src/test/ui/issues/issue-37051.stderr
index b0404088d4d..b0404088d4d 100644
--- a/src/test/ui/issue-37051.stderr
+++ b/src/test/ui/issues/issue-37051.stderr
diff --git a/src/test/ui/issue-3707.rs b/src/test/ui/issues/issue-3707.rs
index ad56b125b08..ad56b125b08 100644
--- a/src/test/ui/issue-3707.rs
+++ b/src/test/ui/issues/issue-3707.rs
diff --git a/src/test/ui/issue-3707.stderr b/src/test/ui/issues/issue-3707.stderr
index c6d28fecaf9..c6d28fecaf9 100644
--- a/src/test/ui/issue-3707.stderr
+++ b/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
index efb0b249a8a..efb0b249a8a 100644
--- a/src/test/ui/compile-fail-migration/issue-37131.rs
+++ b/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
index 660a6935f36..660a6935f36 100644
--- a/src/test/ui/compile-fail-migration/issue-37131.stderr
+++ b/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
index 1e05bdb0c60..1e05bdb0c60 100644
--- 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
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
index a563c844359..a563c844359 100644
--- 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
diff --git a/src/test/ui/issue-37323.rs b/src/test/ui/issues/issue-37323.rs
index 98806cdd1b9..98806cdd1b9 100644
--- a/src/test/ui/issue-37323.rs
+++ b/src/test/ui/issues/issue-37323.rs
diff --git a/src/test/ui/issue-37323.stderr b/src/test/ui/issues/issue-37323.stderr
index a83923a5910..a83923a5910 100644
--- a/src/test/ui/issue-37323.stderr
+++ b/src/test/ui/issues/issue-37323.stderr
diff --git a/src/test/ui/issue-37366.rs b/src/test/ui/issues/issue-37366.rs
index 2a4808fb186..2a4808fb186 100644
--- a/src/test/ui/issue-37366.rs
+++ b/src/test/ui/issues/issue-37366.rs
diff --git a/src/test/ui/issue-37366.stderr b/src/test/ui/issues/issue-37366.stderr
index 8667feccf99..8667feccf99 100644
--- a/src/test/ui/issue-37366.stderr
+++ b/src/test/ui/issues/issue-37366.stderr
diff --git a/src/test/ui/issue-37510.rs b/src/test/ui/issues/issue-37510.rs
index 53c91f323d0..53c91f323d0 100644
--- a/src/test/ui/issue-37510.rs
+++ b/src/test/ui/issues/issue-37510.rs
diff --git a/src/test/ui/issue-37510.stderr b/src/test/ui/issues/issue-37510.stderr
index 48db0d5e202..48db0d5e202 100644
--- a/src/test/ui/issue-37510.stderr
+++ b/src/test/ui/issues/issue-37510.stderr
diff --git a/src/test/ui/issue-37515.rs b/src/test/ui/issues/issue-37515.rs
index d5733f98193..d5733f98193 100644
--- a/src/test/ui/issue-37515.rs
+++ b/src/test/ui/issues/issue-37515.rs
diff --git a/src/test/ui/issue-37515.stderr b/src/test/ui/issues/issue-37515.stderr
index 68e983f23b0..68e983f23b0 100644
--- a/src/test/ui/issue-37515.stderr
+++ b/src/test/ui/issues/issue-37515.stderr
diff --git a/src/test/ui/issue-37534.rs b/src/test/ui/issues/issue-37534.rs
index 70c8f92de63..70c8f92de63 100644
--- a/src/test/ui/issue-37534.rs
+++ b/src/test/ui/issues/issue-37534.rs
diff --git a/src/test/ui/issue-37534.stderr b/src/test/ui/issues/issue-37534.stderr
index c4fc9db31f5..c4fc9db31f5 100644
--- a/src/test/ui/issue-37534.stderr
+++ b/src/test/ui/issues/issue-37534.stderr
diff --git a/src/test/ui/issue-37550.rs b/src/test/ui/issues/issue-37550.rs
index af1f6ef5ed4..af1f6ef5ed4 100644
--- a/src/test/ui/issue-37550.rs
+++ b/src/test/ui/issues/issue-37550.rs
diff --git a/src/test/ui/issue-37550.stderr b/src/test/ui/issues/issue-37550.stderr
index 7468510de6a..7468510de6a 100644
--- a/src/test/ui/issue-37550.stderr
+++ b/src/test/ui/issues/issue-37550.stderr
diff --git a/src/test/ui/issue-37576.rs b/src/test/ui/issues/issue-37576.rs
index e3c1ada878d..e3c1ada878d 100644
--- a/src/test/ui/issue-37576.rs
+++ b/src/test/ui/issues/issue-37576.rs
diff --git a/src/test/ui/issue-37576.stderr b/src/test/ui/issues/issue-37576.stderr
index b663c8b8a28..b663c8b8a28 100644
--- a/src/test/ui/issue-37576.stderr
+++ b/src/test/ui/issues/issue-37576.stderr
diff --git a/src/test/ui/issue-3763.rs b/src/test/ui/issues/issue-3763.rs
index 851f5dfeabe..851f5dfeabe 100644
--- a/src/test/ui/issue-3763.rs
+++ b/src/test/ui/issues/issue-3763.rs
diff --git a/src/test/ui/issue-3763.stderr b/src/test/ui/issues/issue-3763.stderr
index 0dd7d6819e8..0dd7d6819e8 100644
--- a/src/test/ui/issue-3763.stderr
+++ b/src/test/ui/issues/issue-3763.stderr
diff --git a/src/test/ui/issue-37665.rs b/src/test/ui/issues/issue-37665.rs
index 81ed4375e77..81ed4375e77 100644
--- a/src/test/ui/issue-37665.rs
+++ b/src/test/ui/issues/issue-37665.rs
diff --git a/src/test/ui/issue-37665.stderr b/src/test/ui/issues/issue-37665.stderr
index cdf9129c002..cdf9129c002 100644
--- a/src/test/ui/issue-37665.stderr
+++ b/src/test/ui/issues/issue-37665.stderr
diff --git a/src/test/ui/issue-3779.rs b/src/test/ui/issues/issue-3779.rs
index 7490960da36..7490960da36 100644
--- a/src/test/ui/issue-3779.rs
+++ b/src/test/ui/issues/issue-3779.rs
diff --git a/src/test/ui/issue-3779.stderr b/src/test/ui/issues/issue-3779.stderr
index f5e89638f16..f5e89638f16 100644
--- a/src/test/ui/issue-3779.stderr
+++ b/src/test/ui/issues/issue-3779.stderr
diff --git a/src/test/ui/issue-37884.rs b/src/test/ui/issues/issue-37884.rs
index ea6403a3eef..ea6403a3eef 100644
--- a/src/test/ui/issue-37884.rs
+++ b/src/test/ui/issues/issue-37884.rs
diff --git a/src/test/ui/issue-37884.stderr b/src/test/ui/issues/issue-37884.stderr
index f01b623aced..f01b623aced 100644
--- a/src/test/ui/issue-37884.stderr
+++ b/src/test/ui/issues/issue-37884.stderr
diff --git a/src/test/ui/issue-37887.rs b/src/test/ui/issues/issue-37887.rs
index f120bbbfc9f..f120bbbfc9f 100644
--- a/src/test/ui/issue-37887.rs
+++ b/src/test/ui/issues/issue-37887.rs
diff --git a/src/test/ui/issue-37887.stderr b/src/test/ui/issues/issue-37887.stderr
index 8448466087d..8448466087d 100644
--- a/src/test/ui/issue-37887.stderr
+++ b/src/test/ui/issues/issue-37887.stderr
diff --git a/src/test/ui/issue-38160.rs b/src/test/ui/issues/issue-38160.rs
index 311d0ceb4d3..311d0ceb4d3 100644
--- a/src/test/ui/issue-38160.rs
+++ b/src/test/ui/issues/issue-38160.rs
diff --git a/src/test/ui/issue-38160.stderr b/src/test/ui/issues/issue-38160.stderr
index 1277d84a032..1277d84a032 100644
--- a/src/test/ui/issue-38160.stderr
+++ b/src/test/ui/issues/issue-38160.stderr
diff --git a/src/test/ui/issue-3820.rs b/src/test/ui/issues/issue-3820.rs
index 28de76f18da..28de76f18da 100644
--- a/src/test/ui/issue-3820.rs
+++ b/src/test/ui/issues/issue-3820.rs
diff --git a/src/test/ui/issue-3820.stderr b/src/test/ui/issues/issue-3820.stderr
index cdd14e9da7b..cdd14e9da7b 100644
--- a/src/test/ui/issue-3820.stderr
+++ b/src/test/ui/issues/issue-3820.stderr
diff --git a/src/test/ui/issue-38293.rs b/src/test/ui/issues/issue-38293.rs
index 1867bafa7e3..1867bafa7e3 100644
--- a/src/test/ui/issue-38293.rs
+++ b/src/test/ui/issues/issue-38293.rs
diff --git a/src/test/ui/issue-38293.stderr b/src/test/ui/issues/issue-38293.stderr
index 73f5425cfc0..73f5425cfc0 100644
--- a/src/test/ui/issue-38293.stderr
+++ b/src/test/ui/issues/issue-38293.stderr
diff --git a/src/test/ui/issue-38381.rs b/src/test/ui/issues/issue-38381.rs
index 6b7dde117df..6b7dde117df 100644
--- a/src/test/ui/issue-38381.rs
+++ b/src/test/ui/issues/issue-38381.rs
diff --git a/src/test/ui/issue-38381.stderr b/src/test/ui/issues/issue-38381.stderr
index baa6338a37e..baa6338a37e 100644
--- a/src/test/ui/issue-38381.stderr
+++ b/src/test/ui/issues/issue-38381.stderr
diff --git a/src/test/ui/issue-38404.rs b/src/test/ui/issues/issue-38404.rs
index a2b0d0a60c0..a2b0d0a60c0 100644
--- a/src/test/ui/issue-38404.rs
+++ b/src/test/ui/issues/issue-38404.rs
diff --git a/src/test/ui/issue-38404.stderr b/src/test/ui/issues/issue-38404.stderr
index ac55be75f5b..ac55be75f5b 100644
--- a/src/test/ui/issue-38404.stderr
+++ b/src/test/ui/issues/issue-38404.stderr
diff --git a/src/test/ui/issue-38412.rs b/src/test/ui/issues/issue-38412.rs
index b4feadbacf7..b4feadbacf7 100644
--- a/src/test/ui/issue-38412.rs
+++ b/src/test/ui/issues/issue-38412.rs
diff --git a/src/test/ui/issue-38412.stderr b/src/test/ui/issues/issue-38412.stderr
index 96851436d6c..96851436d6c 100644
--- a/src/test/ui/issue-38412.stderr
+++ b/src/test/ui/issues/issue-38412.stderr
diff --git a/src/test/ui/issue-38458.rs b/src/test/ui/issues/issue-38458.rs
index 56eb5f874cd..56eb5f874cd 100644
--- a/src/test/ui/issue-38458.rs
+++ b/src/test/ui/issues/issue-38458.rs
diff --git a/src/test/ui/issue-38458.stderr b/src/test/ui/issues/issue-38458.stderr
index d870da63d89..d870da63d89 100644
--- a/src/test/ui/issue-38458.stderr
+++ b/src/test/ui/issues/issue-38458.stderr
diff --git a/src/test/ui/issue-38604.rs b/src/test/ui/issues/issue-38604.rs
index c1939a7707f..c1939a7707f 100644
--- a/src/test/ui/issue-38604.rs
+++ b/src/test/ui/issues/issue-38604.rs
diff --git a/src/test/ui/issue-38604.stderr b/src/test/ui/issues/issue-38604.stderr
index 78aee9172f5..78aee9172f5 100644
--- a/src/test/ui/issue-38604.stderr
+++ b/src/test/ui/issues/issue-38604.stderr
diff --git a/src/test/ui/issue-38715.rs b/src/test/ui/issues/issue-38715.rs
index 552653c21ba..552653c21ba 100644
--- a/src/test/ui/issue-38715.rs
+++ b/src/test/ui/issues/issue-38715.rs
diff --git a/src/test/ui/issue-38715.stderr b/src/test/ui/issues/issue-38715.stderr
index a0dbcbd18c6..a0dbcbd18c6 100644
--- a/src/test/ui/issue-38715.stderr
+++ b/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
index 63de780e109..63de780e109 100644
--- a/src/test/ui/compile-fail-migration/isssue-38821.rs
+++ b/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
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 `<Col as Expression>::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 `<Col as Expression>::SqlType`
diff --git a/src/test/ui/issue-38857.rs b/src/test/ui/issues/issue-38857.rs
index b38b1b9fdc6..b38b1b9fdc6 100644
--- a/src/test/ui/issue-38857.rs
+++ b/src/test/ui/issues/issue-38857.rs
diff --git a/src/test/ui/issue-38857.stderr b/src/test/ui/issues/issue-38857.stderr
index 985927c25a1..985927c25a1 100644
--- a/src/test/ui/issue-38857.stderr
+++ b/src/test/ui/issues/issue-38857.stderr
diff --git a/src/test/ui/issue-38868.rs b/src/test/ui/issues/issue-38868.rs
index c7e1da7094f..c7e1da7094f 100644
--- a/src/test/ui/issue-38868.rs
+++ b/src/test/ui/issues/issue-38868.rs
diff --git a/src/test/ui/issue-38868.stderr b/src/test/ui/issues/issue-38868.stderr
index 3a8ffe7d5e9..3a8ffe7d5e9 100644
--- a/src/test/ui/issue-38868.stderr
+++ b/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
index dd58735209b..dd58735209b 100644
--- a/src/test/ui/issue-38875/auxiliary/issue_38875_b.rs
+++ b/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
index d9debe34c4d..d9debe34c4d 100644
--- a/src/test/ui/issue-38875/issue_38875.rs
+++ b/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
index e6cee4afd59..e6cee4afd59 100644
--- a/src/test/ui/issue-38919.rs
+++ b/src/test/ui/issues/issue-38919.rs
diff --git a/src/test/ui/issue-38919.stderr b/src/test/ui/issues/issue-38919.stderr
index b80367d7c6c..b80367d7c6c 100644
--- a/src/test/ui/issue-38919.stderr
+++ b/src/test/ui/issues/issue-38919.stderr
diff --git a/src/test/ui/issue-38954.rs b/src/test/ui/issues/issue-38954.rs
index 7f01ed3f820..7f01ed3f820 100644
--- a/src/test/ui/issue-38954.rs
+++ b/src/test/ui/issues/issue-38954.rs
diff --git a/src/test/ui/issue-38954.stderr b/src/test/ui/issues/issue-38954.stderr
index 2f0e579378f..2f0e579378f 100644
--- a/src/test/ui/issue-38954.stderr
+++ b/src/test/ui/issues/issue-38954.stderr
diff --git a/src/test/ui/issue-39211.rs b/src/test/ui/issues/issue-39211.rs
index 96ba1c83997..96ba1c83997 100644
--- a/src/test/ui/issue-39211.rs
+++ b/src/test/ui/issues/issue-39211.rs
diff --git a/src/test/ui/issue-39211.stderr b/src/test/ui/issues/issue-39211.stderr
index 6859c6caeb0..6859c6caeb0 100644
--- a/src/test/ui/issue-39211.stderr
+++ b/src/test/ui/issues/issue-39211.stderr
diff --git a/src/test/ui/issue-39362.rs b/src/test/ui/issues/issue-39362.rs
index 9d8abbfc65d..9d8abbfc65d 100644
--- a/src/test/ui/issue-39362.rs
+++ b/src/test/ui/issues/issue-39362.rs
diff --git a/src/test/ui/issue-39362.stderr b/src/test/ui/issues/issue-39362.stderr
index 3e613553dea..3e613553dea 100644
--- a/src/test/ui/issue-39362.stderr
+++ b/src/test/ui/issues/issue-39362.stderr
diff --git a/src/test/ui/issue-39388.rs b/src/test/ui/issues/issue-39388.rs
index 15eef429eab..15eef429eab 100644
--- a/src/test/ui/issue-39388.rs
+++ b/src/test/ui/issues/issue-39388.rs
diff --git a/src/test/ui/issue-39388.stderr b/src/test/ui/issues/issue-39388.stderr
index dc19487f3af..dc19487f3af 100644
--- a/src/test/ui/issue-39388.stderr
+++ b/src/test/ui/issues/issue-39388.stderr
diff --git a/src/test/ui/issue-39404.rs b/src/test/ui/issues/issue-39404.rs
index 56bfe27a4ff..56bfe27a4ff 100644
--- a/src/test/ui/issue-39404.rs
+++ b/src/test/ui/issues/issue-39404.rs
diff --git a/src/test/ui/issue-39404.stderr b/src/test/ui/issues/issue-39404.stderr
index 435a03c2858..435a03c2858 100644
--- a/src/test/ui/issue-39404.stderr
+++ b/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
index f01fd1fd8f1..f01fd1fd8f1 100644
--- a/src/test/ui/issue-39559-2.rs
+++ b/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
index 91520a7ec08..91520a7ec08 100644
--- a/src/test/ui/issue-39559-2.stderr
+++ b/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
index 2da21fb14bd..2da21fb14bd 100644
--- a/src/test/ui/issue-39559.rs
+++ b/src/test/ui/issues/issue-39559.rs
diff --git a/src/test/ui/issue-39559.stderr b/src/test/ui/issues/issue-39559.stderr
index 2ce6dfdbe44..2ce6dfdbe44 100644
--- a/src/test/ui/issue-39559.stderr
+++ b/src/test/ui/issues/issue-39559.stderr
diff --git a/src/test/ui/issue-39616.rs b/src/test/ui/issues/issue-39616.rs
index 13b4c0896e7..13b4c0896e7 100644
--- a/src/test/ui/issue-39616.rs
+++ b/src/test/ui/issues/issue-39616.rs
diff --git a/src/test/ui/issue-39616.stderr b/src/test/ui/issues/issue-39616.stderr
index eebf47afb54..eebf47afb54 100644
--- a/src/test/ui/issue-39616.stderr
+++ b/src/test/ui/issues/issue-39616.stderr
diff --git a/src/test/ui/issue-39687.rs b/src/test/ui/issues/issue-39687.rs
index 404465e6a0f..404465e6a0f 100644
--- a/src/test/ui/issue-39687.rs
+++ b/src/test/ui/issues/issue-39687.rs
diff --git a/src/test/ui/issue-39687.stderr b/src/test/ui/issues/issue-39687.stderr
index 9f8d0910d87..9f8d0910d87 100644
--- a/src/test/ui/issue-39687.stderr
+++ b/src/test/ui/issues/issue-39687.stderr
diff --git a/src/test/ui/issue-3973.rs b/src/test/ui/issues/issue-3973.rs
index 67a934fccce..67a934fccce 100644
--- a/src/test/ui/issue-3973.rs
+++ b/src/test/ui/issues/issue-3973.rs
diff --git a/src/test/ui/issue-3973.stderr b/src/test/ui/issues/issue-3973.stderr
index 9be07614ec1..9be07614ec1 100644
--- a/src/test/ui/issue-3973.stderr
+++ b/src/test/ui/issues/issue-3973.stderr
diff --git a/src/test/ui/issue-39848.rs b/src/test/ui/issues/issue-39848.rs
index d5ca009d310..d5ca009d310 100644
--- a/src/test/ui/issue-39848.rs
+++ b/src/test/ui/issues/issue-39848.rs
diff --git a/src/test/ui/issue-39848.stderr b/src/test/ui/issues/issue-39848.stderr
index 9ca39dbaa34..9ca39dbaa34 100644
--- a/src/test/ui/issue-39848.stderr
+++ b/src/test/ui/issues/issue-39848.stderr
diff --git a/src/test/ui/issue-3993.rs b/src/test/ui/issues/issue-3993.rs
index fae5eb51272..fae5eb51272 100644
--- a/src/test/ui/issue-3993.rs
+++ b/src/test/ui/issues/issue-3993.rs
diff --git a/src/test/ui/issue-3993.stderr b/src/test/ui/issues/issue-3993.stderr
index 4b569f2dea9..4b569f2dea9 100644
--- a/src/test/ui/issue-3993.stderr
+++ b/src/test/ui/issues/issue-3993.stderr
diff --git a/src/test/ui/issue-39970.rs b/src/test/ui/issues/issue-39970.rs
index 65ea1baa4a1..65ea1baa4a1 100644
--- a/src/test/ui/issue-39970.rs
+++ b/src/test/ui/issues/issue-39970.rs
diff --git a/src/test/ui/issue-39970.stderr b/src/test/ui/issues/issue-39970.stderr
index 397d7b8e650..397d7b8e650 100644
--- a/src/test/ui/issue-39970.stderr
+++ b/src/test/ui/issues/issue-39970.stderr
diff --git a/src/test/ui/issue-39974.rs b/src/test/ui/issues/issue-39974.rs
index 6f6b775a2a3..6f6b775a2a3 100644
--- a/src/test/ui/issue-39974.rs
+++ b/src/test/ui/issues/issue-39974.rs
diff --git a/src/test/ui/issue-39974.stderr b/src/test/ui/issues/issue-39974.stderr
index ddd149ccba8..ddd149ccba8 100644
--- a/src/test/ui/issue-39974.stderr
+++ b/src/test/ui/issues/issue-39974.stderr
diff --git a/src/test/ui/issue-40000.rs b/src/test/ui/issues/issue-40000.rs
index 7daf4bcbaa4..7daf4bcbaa4 100644
--- a/src/test/ui/issue-40000.rs
+++ b/src/test/ui/issues/issue-40000.rs
diff --git a/src/test/ui/issue-40000.stderr b/src/test/ui/issues/issue-40000.stderr
index 26e52a7ecdb..26e52a7ecdb 100644
--- a/src/test/ui/issue-40000.stderr
+++ b/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
index dcc9e0a8a65..dcc9e0a8a65 100644
--- a/src/test/ui/issue-40288-2.nll.stderr
+++ b/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
index e16a7ecf6b9..e16a7ecf6b9 100644
--- a/src/test/ui/issue-40288-2.rs
+++ b/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
index fd0b4c01636..fd0b4c01636 100644
--- a/src/test/ui/issue-40288-2.stderr
+++ b/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
index bd4efa10f3d..bd4efa10f3d 100644
--- a/src/test/ui/issue-40288.nll.stderr
+++ b/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
index b5418e85bec..b5418e85bec 100644
--- a/src/test/ui/issue-40288.rs
+++ b/src/test/ui/issues/issue-40288.rs
diff --git a/src/test/ui/issue-40288.stderr b/src/test/ui/issues/issue-40288.stderr
index e69c3bc83a6..e69c3bc83a6 100644
--- a/src/test/ui/issue-40288.stderr
+++ b/src/test/ui/issues/issue-40288.stderr
diff --git a/src/test/ui/issue-40350.rs b/src/test/ui/issues/issue-40350.rs
index 39249ee4718..39249ee4718 100644
--- a/src/test/ui/issue-40350.rs
+++ b/src/test/ui/issues/issue-40350.rs
diff --git a/src/test/ui/issue-40350.stderr b/src/test/ui/issues/issue-40350.stderr
index ad85bf2a778..ad85bf2a778 100644
--- a/src/test/ui/issue-40350.stderr
+++ b/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
index 162e43abc0a..162e43abc0a 100644
--- 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
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
index f2de2030bd1..f2de2030bd1 100644
--- 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
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
index 70be30e4f71..70be30e4f71 100644
--- 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
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
index cd75be24589..cd75be24589 100644
--- 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
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
index 894923605c0..894923605c0 100644
--- 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
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
index 4ed28963b5b..4ed28963b5b 100644
--- 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
diff --git a/src/test/ui/issue-40510-1.nll.stderr b/src/test/ui/issues/issue-40510-1.nll.stderr
index 6c77bcb2757..6c77bcb2757 100644
--- a/src/test/ui/issue-40510-1.nll.stderr
+++ b/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
index 142092ff41e..142092ff41e 100644
--- a/src/test/ui/issue-40510-1.rs
+++ b/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
index 1f5a41fce96..1f5a41fce96 100644
--- a/src/test/ui/issue-40510-1.stderr
+++ b/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
index 0fe56584822..0fe56584822 100644
--- a/src/test/ui/issue-40510-2.rs
+++ b/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
index 03998af50c2..03998af50c2 100644
--- a/src/test/ui/issue-40510-2.stderr
+++ b/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
index 8aeef86c2e8..8aeef86c2e8 100644
--- a/src/test/ui/issue-40510-3.nll.stderr
+++ b/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
index afa8f15ee57..afa8f15ee57 100644
--- a/src/test/ui/issue-40510-3.rs
+++ b/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
index c77b5cc8303..c77b5cc8303 100644
--- a/src/test/ui/issue-40510-3.stderr
+++ b/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
index a39c500225b..a39c500225b 100644
--- a/src/test/ui/issue-40510-4.rs
+++ b/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
index 1f3cd00fb48..1f3cd00fb48 100644
--- a/src/test/ui/issue-40510-4.stderr
+++ b/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
index aec20b4ad87..aec20b4ad87 100644
--- a/src/test/ui/issue-40610.rs
+++ b/src/test/ui/issues/issue-40610.rs
diff --git a/src/test/ui/issue-40610.stderr b/src/test/ui/issues/issue-40610.stderr
index faf1a4d1c38..faf1a4d1c38 100644
--- a/src/test/ui/issue-40610.stderr
+++ b/src/test/ui/issues/issue-40610.stderr
diff --git a/src/test/ui/issue-40749.rs b/src/test/ui/issues/issue-40749.rs
index 261ed49d10c..261ed49d10c 100644
--- a/src/test/ui/issue-40749.rs
+++ b/src/test/ui/issues/issue-40749.rs
diff --git a/src/test/ui/issue-40749.stderr b/src/test/ui/issues/issue-40749.stderr
index b76d469d116..b76d469d116 100644
--- a/src/test/ui/issue-40749.stderr
+++ b/src/test/ui/issues/issue-40749.stderr
diff --git a/src/test/ui/issue-40782.rs b/src/test/ui/issues/issue-40782.rs
index 10dc177c7e9..10dc177c7e9 100644
--- a/src/test/ui/issue-40782.rs
+++ b/src/test/ui/issues/issue-40782.rs
diff --git a/src/test/ui/issue-40782.stderr b/src/test/ui/issues/issue-40782.stderr
index bd646d7ce8c..bd646d7ce8c 100644
--- a/src/test/ui/issue-40782.stderr
+++ b/src/test/ui/issues/issue-40782.stderr
diff --git a/src/test/ui/issue-40845.rs b/src/test/ui/issues/issue-40845.rs
index c5604a0427b..c5604a0427b 100644
--- a/src/test/ui/issue-40845.rs
+++ b/src/test/ui/issues/issue-40845.rs
diff --git a/src/test/ui/issue-40845.stderr b/src/test/ui/issues/issue-40845.stderr
index 2e8f008a52d..2e8f008a52d 100644
--- a/src/test/ui/issue-40845.stderr
+++ b/src/test/ui/issues/issue-40845.stderr
diff --git a/src/test/ui/issue-40861.rs b/src/test/ui/issues/issue-40861.rs
index 75d58c58538..75d58c58538 100644
--- a/src/test/ui/issue-40861.rs
+++ b/src/test/ui/issues/issue-40861.rs
diff --git a/src/test/ui/issue-40861.stderr b/src/test/ui/issues/issue-40861.stderr
index dbde40fb25e..dbde40fb25e 100644
--- a/src/test/ui/issue-40861.stderr
+++ b/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
index 3f79c66252a..3f79c66252a 100644
--- a/src/test/ui/issue-41139.nll.stderr
+++ b/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
index 0509a4387ba..0509a4387ba 100644
--- a/src/test/ui/issue-41139.rs
+++ b/src/test/ui/issues/issue-41139.rs
diff --git a/src/test/ui/issue-41139.stderr b/src/test/ui/issues/issue-41139.stderr
index 9d0e19df3f2..9d0e19df3f2 100644
--- a/src/test/ui/issue-41139.stderr
+++ b/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
index 5d7546e1bc4..5d7546e1bc4 100644
--- a/src/test/ui/issue-41229-ref-str.rs
+++ b/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
index effc5f6999e..effc5f6999e 100644
--- a/src/test/ui/issue-41229-ref-str.stderr
+++ b/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
index 29912de37eb..29912de37eb 100644
--- a/src/test/ui/issue-41255.rs
+++ b/src/test/ui/issues/issue-41255.rs
diff --git a/src/test/ui/issue-41255.stderr b/src/test/ui/issues/issue-41255.stderr
index 03100b6db76..03100b6db76 100644
--- a/src/test/ui/issue-41255.stderr
+++ b/src/test/ui/issues/issue-41255.stderr
diff --git a/src/test/ui/issue-41394.rs b/src/test/ui/issues/issue-41394.rs
index 89f11edaec8..89f11edaec8 100644
--- a/src/test/ui/issue-41394.rs
+++ b/src/test/ui/issues/issue-41394.rs
diff --git a/src/test/ui/issue-41394.stderr b/src/test/ui/issues/issue-41394.stderr
index 9e4afb3b28a..9e4afb3b28a 100644
--- a/src/test/ui/issue-41394.stderr
+++ b/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
index 67be194c8ed..67be194c8ed 100644
--- a/src/test/ui/compile-fail-migration/issue-41549.rs
+++ b/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
index e5362727d94..e5362727d94 100644
--- a/src/test/ui/compile-fail-migration/issue-41549.stderr
+++ b/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
index 0b714432f16..0b714432f16 100644
--- a/src/test/ui/issue-41652/auxiliary/issue_41652_b.rs
+++ b/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
index a4e92820e21..a4e92820e21 100644
--- a/src/test/ui/issue-41652/issue_41652.rs
+++ b/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
index 3f76b25692c..3f76b25692c 100644
--- a/src/test/ui/issue-41652/issue_41652.stderr
+++ b/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
index 06ff743a0f5..06ff743a0f5 100644
--- a/src/test/ui/issue-41726.nll.stderr
+++ b/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
index c8cd9209bce..c8cd9209bce 100644
--- a/src/test/ui/issue-41726.rs
+++ b/src/test/ui/issues/issue-41726.rs
diff --git a/src/test/ui/issue-41726.stderr b/src/test/ui/issues/issue-41726.stderr
index c79196e0140..c79196e0140 100644
--- a/src/test/ui/issue-41726.stderr
+++ b/src/test/ui/issues/issue-41726.stderr
diff --git a/src/test/ui/issue-41742.rs b/src/test/ui/issues/issue-41742.rs
index 067531e036a..067531e036a 100644
--- a/src/test/ui/issue-41742.rs
+++ b/src/test/ui/issues/issue-41742.rs
diff --git a/src/test/ui/issue-41742.stderr b/src/test/ui/issues/issue-41742.stderr
index 314b44f603a..314b44f603a 100644
--- a/src/test/ui/issue-41742.stderr
+++ b/src/test/ui/issues/issue-41742.stderr
diff --git a/src/test/ui/issue-41776.rs b/src/test/ui/issues/issue-41776.rs
index 5f108e0a1ed..5f108e0a1ed 100644
--- a/src/test/ui/issue-41776.rs
+++ b/src/test/ui/issues/issue-41776.rs
diff --git a/src/test/ui/issue-41776.stderr b/src/test/ui/issues/issue-41776.stderr
index 9742f091f04..9742f091f04 100644
--- a/src/test/ui/issue-41776.stderr
+++ b/src/test/ui/issues/issue-41776.stderr
diff --git a/src/test/ui/issue-41880.rs b/src/test/ui/issues/issue-41880.rs
index 23a2b78a769..23a2b78a769 100644
--- a/src/test/ui/issue-41880.rs
+++ b/src/test/ui/issues/issue-41880.rs
diff --git a/src/test/ui/issue-41880.stderr b/src/test/ui/issues/issue-41880.stderr
index fa9fdbd8194..fa9fdbd8194 100644
--- a/src/test/ui/issue-41880.stderr
+++ b/src/test/ui/issues/issue-41880.stderr
diff --git a/src/test/ui/issue-41974.rs b/src/test/ui/issues/issue-41974.rs
index 5c9077783c7..5c9077783c7 100644
--- a/src/test/ui/issue-41974.rs
+++ b/src/test/ui/issues/issue-41974.rs
diff --git a/src/test/ui/issue-41974.stderr b/src/test/ui/issues/issue-41974.stderr
index eca40ed4355..eca40ed4355 100644
--- a/src/test/ui/issue-41974.stderr
+++ b/src/test/ui/issues/issue-41974.stderr
diff --git a/src/test/ui/issue-41998.rs b/src/test/ui/issues/issue-41998.rs
index 406aadcd212..406aadcd212 100644
--- a/src/test/ui/issue-41998.rs
+++ b/src/test/ui/issues/issue-41998.rs
diff --git a/src/test/ui/issue-41998.stderr b/src/test/ui/issues/issue-41998.stderr
index e757c7f3a44..e757c7f3a44 100644
--- a/src/test/ui/issue-41998.stderr
+++ b/src/test/ui/issues/issue-41998.stderr
diff --git a/src/test/ui/issue-4201.rs b/src/test/ui/issues/issue-4201.rs
index b1f668d9c5e..b1f668d9c5e 100644
--- a/src/test/ui/issue-4201.rs
+++ b/src/test/ui/issues/issue-4201.rs
diff --git a/src/test/ui/issue-4201.stderr b/src/test/ui/issues/issue-4201.stderr
index 40de077ce76..40de077ce76 100644
--- a/src/test/ui/issue-4201.stderr
+++ b/src/test/ui/issues/issue-4201.stderr
diff --git a/src/test/ui/issue-42060.rs b/src/test/ui/issues/issue-42060.rs
index 23df42d03c4..23df42d03c4 100644
--- a/src/test/ui/issue-42060.rs
+++ b/src/test/ui/issues/issue-42060.rs
diff --git a/src/test/ui/issue-42060.stderr b/src/test/ui/issues/issue-42060.stderr
index 69abac8ee7e..69abac8ee7e 100644
--- a/src/test/ui/issue-42060.stderr
+++ b/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
index 39e3c218f40..39e3c218f40 100644
--- a/src/test/ui/issue-42106.nll.stderr
+++ b/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
index b177a14af33..b177a14af33 100644
--- a/src/test/ui/issue-42106.rs
+++ b/src/test/ui/issues/issue-42106.rs
diff --git a/src/test/ui/issue-42106.stderr b/src/test/ui/issues/issue-42106.stderr
index d77ff315ce7..d77ff315ce7 100644
--- a/src/test/ui/issue-42106.stderr
+++ b/src/test/ui/issues/issue-42106.stderr
diff --git a/src/test/ui/issue-42312.rs b/src/test/ui/issues/issue-42312.rs
index f7705297dfd..f7705297dfd 100644
--- a/src/test/ui/issue-42312.rs
+++ b/src/test/ui/issues/issue-42312.rs
diff --git a/src/test/ui/issue-42312.stderr b/src/test/ui/issues/issue-42312.stderr
index 8c2a0987f2f..8c2a0987f2f 100644
--- a/src/test/ui/issue-42312.stderr
+++ b/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
index 1abc448dbb0..1abc448dbb0 100644
--- a/src/test/ui/issue-42344.nll.stderr
+++ b/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
index 2f11ff402be..2f11ff402be 100644
--- a/src/test/ui/issue-42344.rs
+++ b/src/test/ui/issues/issue-42344.rs
diff --git a/src/test/ui/issue-42344.stderr b/src/test/ui/issues/issue-42344.stderr
index 92bbe70d9ce..92bbe70d9ce 100644
--- a/src/test/ui/issue-42344.stderr
+++ b/src/test/ui/issues/issue-42344.stderr
diff --git a/src/test/ui/issue-4265.rs b/src/test/ui/issues/issue-4265.rs
index 62db68dcbb2..62db68dcbb2 100644
--- a/src/test/ui/issue-4265.rs
+++ b/src/test/ui/issues/issue-4265.rs
diff --git a/src/test/ui/issue-4265.stderr b/src/test/ui/issues/issue-4265.stderr
index 8f22c6757c2..8f22c6757c2 100644
--- a/src/test/ui/issue-4265.stderr
+++ b/src/test/ui/issues/issue-4265.stderr
diff --git a/src/test/ui/issue-42755.rs b/src/test/ui/issues/issue-42755.rs
index 7547c4a17be..7547c4a17be 100644
--- a/src/test/ui/issue-42755.rs
+++ b/src/test/ui/issues/issue-42755.rs
diff --git a/src/test/ui/issue-42755.stderr b/src/test/ui/issues/issue-42755.stderr
index 91439061996..91439061996 100644
--- a/src/test/ui/issue-42755.stderr
+++ b/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
index fda7cf9ae8e..fda7cf9ae8e 100644
--- a/src/test/ui/issue-42796.nll.stderr
+++ b/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
index b07c23c3fc7..b07c23c3fc7 100644
--- a/src/test/ui/issue-42796.rs
+++ b/src/test/ui/issues/issue-42796.rs
diff --git a/src/test/ui/issue-42796.stderr b/src/test/ui/issues/issue-42796.stderr
index 9c2481b2f90..9c2481b2f90 100644
--- a/src/test/ui/issue-42796.stderr
+++ b/src/test/ui/issues/issue-42796.stderr
diff --git a/src/test/ui/issue-42880.rs b/src/test/ui/issues/issue-42880.rs
index ebb1ec425d1..ebb1ec425d1 100644
--- a/src/test/ui/issue-42880.rs
+++ b/src/test/ui/issues/issue-42880.rs
diff --git a/src/test/ui/issue-42880.stderr b/src/test/ui/issues/issue-42880.stderr
index cf1c3022a22..cf1c3022a22 100644
--- a/src/test/ui/issue-42880.stderr
+++ b/src/test/ui/issues/issue-42880.stderr
diff --git a/src/test/ui/issue-42954.fixed b/src/test/ui/issues/issue-42954.fixed
index d05996fb8b9..d05996fb8b9 100644
--- a/src/test/ui/issue-42954.fixed
+++ b/src/test/ui/issues/issue-42954.fixed
diff --git a/src/test/ui/issue-42954.rs b/src/test/ui/issues/issue-42954.rs
index 8226cedc0c4..8226cedc0c4 100644
--- a/src/test/ui/issue-42954.rs
+++ b/src/test/ui/issues/issue-42954.rs
diff --git a/src/test/ui/issue-42954.stderr b/src/test/ui/issues/issue-42954.stderr
index aa332602f9e..aa332602f9e 100644
--- a/src/test/ui/issue-42954.stderr
+++ b/src/test/ui/issues/issue-42954.stderr
diff --git a/src/test/ui/issue-43023.rs b/src/test/ui/issues/issue-43023.rs
index 6a5f7a1136a..6a5f7a1136a 100644
--- a/src/test/ui/issue-43023.rs
+++ b/src/test/ui/issues/issue-43023.rs
diff --git a/src/test/ui/issue-43023.stderr b/src/test/ui/issues/issue-43023.stderr
index 2aa1efa9ca8..2aa1efa9ca8 100644
--- a/src/test/ui/issue-43023.stderr
+++ b/src/test/ui/issues/issue-43023.stderr
diff --git a/src/test/ui/issue-43105.rs b/src/test/ui/issues/issue-43105.rs
index 8a0471135af..8a0471135af 100644
--- a/src/test/ui/issue-43105.rs
+++ b/src/test/ui/issues/issue-43105.rs
diff --git a/src/test/ui/issue-43105.stderr b/src/test/ui/issues/issue-43105.stderr
index 18da9310503..18da9310503 100644
--- a/src/test/ui/issue-43105.stderr
+++ b/src/test/ui/issues/issue-43105.stderr
diff --git a/src/test/ui/issue-43162.rs b/src/test/ui/issues/issue-43162.rs
index b236283f757..b236283f757 100644
--- a/src/test/ui/issue-43162.rs
+++ b/src/test/ui/issues/issue-43162.rs
diff --git a/src/test/ui/issue-43162.stderr b/src/test/ui/issues/issue-43162.stderr
index 4b3b4638f26..4b3b4638f26 100644
--- a/src/test/ui/issue-43162.stderr
+++ b/src/test/ui/issues/issue-43162.stderr
diff --git a/src/test/ui/issue-43189.rs b/src/test/ui/issues/issue-43189.rs
index 154bee5d1d4..154bee5d1d4 100644
--- a/src/test/ui/issue-43189.rs
+++ b/src/test/ui/issues/issue-43189.rs
diff --git a/src/test/ui/issue-43189.stderr b/src/test/ui/issues/issue-43189.stderr
index b2a02401c59..b2a02401c59 100644
--- a/src/test/ui/issue-43189.stderr
+++ b/src/test/ui/issues/issue-43189.stderr
diff --git a/src/test/ui/issue-43196.rs b/src/test/ui/issues/issue-43196.rs
index ff53c9a5a54..ff53c9a5a54 100644
--- a/src/test/ui/issue-43196.rs
+++ b/src/test/ui/issues/issue-43196.rs
diff --git a/src/test/ui/issue-43196.stderr b/src/test/ui/issues/issue-43196.stderr
index 2418f517168..2418f517168 100644
--- a/src/test/ui/issue-43196.stderr
+++ b/src/test/ui/issues/issue-43196.stderr
diff --git a/src/test/ui/issue-4321.rs b/src/test/ui/issues/issue-4321.rs
index d589680b0ec..d589680b0ec 100644
--- a/src/test/ui/issue-4321.rs
+++ b/src/test/ui/issues/issue-4321.rs
diff --git a/src/test/ui/issue-4321.stderr b/src/test/ui/issues/issue-4321.stderr
index db52cd557f1..db52cd557f1 100644
--- a/src/test/ui/issue-4321.stderr
+++ b/src/test/ui/issues/issue-4321.stderr
diff --git a/src/test/ui/issue-43250.rs b/src/test/ui/issues/issue-43250.rs
index e1d34f339dc..e1d34f339dc 100644
--- a/src/test/ui/issue-43250.rs
+++ b/src/test/ui/issues/issue-43250.rs
diff --git a/src/test/ui/issue-43250.stderr b/src/test/ui/issues/issue-43250.stderr
index a05d4d41cc7..a05d4d41cc7 100644
--- a/src/test/ui/issue-43250.stderr
+++ b/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
index 4ccd24fa459..4ccd24fa459 100644
--- a/src/test/ui/issue-4335.nll.stderr
+++ b/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
index 540504eb07e..540504eb07e 100644
--- a/src/test/ui/issue-4335.rs
+++ b/src/test/ui/issues/issue-4335.rs
diff --git a/src/test/ui/issue-4335.stderr b/src/test/ui/issues/issue-4335.stderr
index 80f5b445bb6..80f5b445bb6 100644
--- a/src/test/ui/issue-4335.stderr
+++ b/src/test/ui/issues/issue-4335.stderr
diff --git a/src/test/ui/issue-43355.rs b/src/test/ui/issues/issue-43355.rs
index d793a78799a..d793a78799a 100644
--- a/src/test/ui/issue-43355.rs
+++ b/src/test/ui/issues/issue-43355.rs
diff --git a/src/test/ui/issue-43355.stderr b/src/test/ui/issues/issue-43355.stderr
index dbcf1b52b89..dbcf1b52b89 100644
--- a/src/test/ui/issue-43355.stderr
+++ b/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
index 8c5bde45bae..8c5bde45bae 100644
--- a/src/test/ui/issue-43420-no-over-suggest.rs
+++ b/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
index 80bbdd11289..80bbdd11289 100644
--- a/src/test/ui/issue-43420-no-over-suggest.stderr
+++ b/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
index 431fc8a5aa2..431fc8a5aa2 100644
--- a/src/test/ui/issue-43424.rs
+++ b/src/test/ui/issues/issue-43424.rs
diff --git a/src/test/ui/issue-43424.stderr b/src/test/ui/issues/issue-43424.stderr
index 3a9a3164703..3a9a3164703 100644
--- a/src/test/ui/issue-43424.stderr
+++ b/src/test/ui/issues/issue-43424.stderr
diff --git a/src/test/ui/issue-43431.rs b/src/test/ui/issues/issue-43431.rs
index 1e6366e068a..1e6366e068a 100644
--- a/src/test/ui/issue-43431.rs
+++ b/src/test/ui/issues/issue-43431.rs
diff --git a/src/test/ui/issue-43431.stderr b/src/test/ui/issues/issue-43431.stderr
index 3eb8fac6c0f..3eb8fac6c0f 100644
--- a/src/test/ui/issue-43431.stderr
+++ b/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
index 33abc196a6b..33abc196a6b 100644
--- a/src/test/ui/issue-4366-2.rs
+++ b/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
index 1c9a9eb25c3..1c9a9eb25c3 100644
--- a/src/test/ui/issue-4366-2.stderr
+++ b/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
index 47fd426592c..47fd426592c 100644
--- a/src/test/ui/issue-4366.rs
+++ b/src/test/ui/issues/issue-4366.rs
diff --git a/src/test/ui/issue-4366.stderr b/src/test/ui/issues/issue-4366.stderr
index e78aec9d0e8..e78aec9d0e8 100644
--- a/src/test/ui/issue-4366.stderr
+++ b/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
index a5ba9ef9bd3..a5ba9ef9bd3 100644
--- a/src/test/ui/compile-fail-migration/issue-43733-2.rs
+++ b/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
index 8eb150ff833..8eb150ff833 100644
--- a/src/test/ui/compile-fail-migration/issue-43733-2.stderr
+++ b/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
index 7b1364ff41c..7b1364ff41c 100644
--- a/src/test/ui/issue-43733.rs
+++ b/src/test/ui/issues/issue-43733.rs
diff --git a/src/test/ui/issue-43733.stderr b/src/test/ui/issues/issue-43733.stderr
index 5f91d3d2266..5f91d3d2266 100644
--- a/src/test/ui/issue-43733.stderr
+++ b/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
index 94b5c0034a7..94b5c0034a7 100644
--- a/src/test/ui/issue-43784-associated-type.rs
+++ b/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
index 798d8c66016..798d8c66016 100644
--- a/src/test/ui/issue-43784-associated-type.stderr
+++ b/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
index e70df113da3..e70df113da3 100644
--- a/src/test/ui/issue-43784-supertrait.rs
+++ b/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
index 8646b315abd..8646b315abd 100644
--- a/src/test/ui/issue-43784-supertrait.stderr
+++ b/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
index 7757a503c7e..7757a503c7e 100644
--- a/src/test/ui/issue-43806.rs
+++ b/src/test/ui/issues/issue-43806.rs
diff --git a/src/test/ui/issue-43925.rs b/src/test/ui/issues/issue-43925.rs
index 8ad57647290..8ad57647290 100644
--- a/src/test/ui/issue-43925.rs
+++ b/src/test/ui/issues/issue-43925.rs
diff --git a/src/test/ui/issue-43925.stderr b/src/test/ui/issues/issue-43925.stderr
index 995289aec01..995289aec01 100644
--- a/src/test/ui/issue-43925.stderr
+++ b/src/test/ui/issues/issue-43925.stderr
diff --git a/src/test/ui/issue-43926.rs b/src/test/ui/issues/issue-43926.rs
index 5d510b643a3..5d510b643a3 100644
--- a/src/test/ui/issue-43926.rs
+++ b/src/test/ui/issues/issue-43926.rs
diff --git a/src/test/ui/issue-43926.stderr b/src/test/ui/issues/issue-43926.stderr
index 80d8c5c9814..80d8c5c9814 100644
--- a/src/test/ui/issue-43926.stderr
+++ b/src/test/ui/issues/issue-43926.stderr
diff --git a/src/test/ui/issue-43988.rs b/src/test/ui/issues/issue-43988.rs
index 6361af76482..6361af76482 100644
--- a/src/test/ui/issue-43988.rs
+++ b/src/test/ui/issues/issue-43988.rs
diff --git a/src/test/ui/issue-43988.stderr b/src/test/ui/issues/issue-43988.stderr
index 7237851f778..7237851f778 100644
--- a/src/test/ui/issue-43988.stderr
+++ b/src/test/ui/issues/issue-43988.stderr
diff --git a/src/test/ui/issue-44021.rs b/src/test/ui/issues/issue-44021.rs
index b6ec21b94c7..b6ec21b94c7 100644
--- a/src/test/ui/issue-44021.rs
+++ b/src/test/ui/issues/issue-44021.rs
diff --git a/src/test/ui/issue-44021.stderr b/src/test/ui/issues/issue-44021.stderr
index 2c74531cf24..2c74531cf24 100644
--- a/src/test/ui/issue-44021.stderr
+++ b/src/test/ui/issues/issue-44021.stderr
diff --git a/src/test/ui/issue-44023.rs b/src/test/ui/issues/issue-44023.rs
index 97b82dc58dc..97b82dc58dc 100644
--- a/src/test/ui/issue-44023.rs
+++ b/src/test/ui/issues/issue-44023.rs
diff --git a/src/test/ui/issue-44023.stderr b/src/test/ui/issues/issue-44023.stderr
index 3baf7ec0277..3baf7ec0277 100644
--- a/src/test/ui/issue-44023.stderr
+++ b/src/test/ui/issues/issue-44023.stderr
diff --git a/src/test/ui/issue-44078.rs b/src/test/ui/issues/issue-44078.rs
index 356a7be0b41..356a7be0b41 100644
--- a/src/test/ui/issue-44078.rs
+++ b/src/test/ui/issues/issue-44078.rs
diff --git a/src/test/ui/issue-44078.stderr b/src/test/ui/issues/issue-44078.stderr
index e8dce656f65..e8dce656f65 100644
--- a/src/test/ui/issue-44078.stderr
+++ b/src/test/ui/issues/issue-44078.stderr
diff --git a/src/test/ui/issue-44239.rs b/src/test/ui/issues/issue-44239.rs
index 131c6526642..131c6526642 100644
--- a/src/test/ui/issue-44239.rs
+++ b/src/test/ui/issues/issue-44239.rs
diff --git a/src/test/ui/issue-44239.stderr b/src/test/ui/issues/issue-44239.stderr
index 43d4968a89f..43d4968a89f 100644
--- a/src/test/ui/issue-44239.stderr
+++ b/src/test/ui/issues/issue-44239.stderr
diff --git a/src/test/ui/issue-44373.rs b/src/test/ui/issues/issue-44373.rs
index d744ad11c5c..d744ad11c5c 100644
--- a/src/test/ui/issue-44373.rs
+++ b/src/test/ui/issues/issue-44373.rs
diff --git a/src/test/ui/issue-44373.stderr b/src/test/ui/issues/issue-44373.stderr
index 17a634ba747..17a634ba747 100644
--- a/src/test/ui/issue-44373.stderr
+++ b/src/test/ui/issues/issue-44373.stderr
diff --git a/src/test/ui/issue-44406.rs b/src/test/ui/issues/issue-44406.rs
index 8e99caff4ef..8e99caff4ef 100644
--- a/src/test/ui/issue-44406.rs
+++ b/src/test/ui/issues/issue-44406.rs
diff --git a/src/test/ui/issue-44406.stderr b/src/test/ui/issues/issue-44406.stderr
index 5cd9b3f065e..5cd9b3f065e 100644
--- a/src/test/ui/issue-44406.stderr
+++ b/src/test/ui/issues/issue-44406.stderr
diff --git a/src/test/ui/issue-44415.rs b/src/test/ui/issues/issue-44415.rs
index 5d295510844..5d295510844 100644
--- a/src/test/ui/issue-44415.rs
+++ b/src/test/ui/issues/issue-44415.rs
diff --git a/src/test/ui/issue-44415.stderr b/src/test/ui/issues/issue-44415.stderr
index ac2072c513e..ac2072c513e 100644
--- a/src/test/ui/issue-44415.stderr
+++ b/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
index 5af0bf6be56..5af0bf6be56 100644
--- a/src/test/ui/issue-45087-unreachable-unsafe.rs
+++ b/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
index 8a967838bc3..8a967838bc3 100644
--- a/src/test/ui/issue-45087-unreachable-unsafe.stderr
+++ b/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
index 2fce8d723d3..2fce8d723d3 100644
--- a/src/test/ui/issue-45107-unnecessary-unsafe-in-closure.rs
+++ b/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
index eaf7569100a..eaf7569100a 100644
--- a/src/test/ui/issue-45107-unnecessary-unsafe-in-closure.stderr
+++ b/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
index a906d193d99..a906d193d99 100644
--- a/src/test/ui/issue-45157.rs
+++ b/src/test/ui/issues/issue-45157.rs
diff --git a/src/test/ui/issue-45157.stderr b/src/test/ui/issues/issue-45157.stderr
index e528a84ebd1..e528a84ebd1 100644
--- a/src/test/ui/issue-45157.stderr
+++ b/src/test/ui/issues/issue-45157.stderr
diff --git a/src/test/ui/issue-4517.rs b/src/test/ui/issues/issue-4517.rs
index fbd8972cbfa..fbd8972cbfa 100644
--- a/src/test/ui/issue-4517.rs
+++ b/src/test/ui/issues/issue-4517.rs
diff --git a/src/test/ui/issue-4517.stderr b/src/test/ui/issues/issue-4517.stderr
index ca96c396fd0..ca96c396fd0 100644
--- a/src/test/ui/issue-4517.stderr
+++ b/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
index ce39776252b..ce39776252b 100644
--- a/src/test/ui/issue-45199.ast.nll.stderr
+++ b/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
index ff8f78b5116..ff8f78b5116 100644
--- a/src/test/ui/issue-45199.ast.stderr
+++ b/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
index ce39776252b..ce39776252b 100644
--- a/src/test/ui/issue-45199.mir.stderr
+++ b/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
index 61e19ffc0d2..61e19ffc0d2 100644
--- a/src/test/ui/issue-45199.rs
+++ b/src/test/ui/issues/issue-45199.rs
diff --git a/src/test/ui/issue-45296.rs b/src/test/ui/issues/issue-45296.rs
index 965747cfa05..965747cfa05 100644
--- a/src/test/ui/issue-45296.rs
+++ b/src/test/ui/issues/issue-45296.rs
diff --git a/src/test/ui/issue-45296.stderr b/src/test/ui/issues/issue-45296.stderr
index 96ee3ccc89d..96ee3ccc89d 100644
--- a/src/test/ui/issue-45296.stderr
+++ b/src/test/ui/issues/issue-45296.stderr
diff --git a/src/test/ui/issue-45562.fixed b/src/test/ui/issues/issue-45562.fixed
index 7c01f0d1ee5..7c01f0d1ee5 100644
--- a/src/test/ui/issue-45562.fixed
+++ b/src/test/ui/issues/issue-45562.fixed
diff --git a/src/test/ui/issue-45562.rs b/src/test/ui/issues/issue-45562.rs
index c27d52fcdd3..c27d52fcdd3 100644
--- a/src/test/ui/issue-45562.rs
+++ b/src/test/ui/issues/issue-45562.rs
diff --git a/src/test/ui/issue-45562.stderr b/src/test/ui/issues/issue-45562.stderr
index d9e624cadc7..d9e624cadc7 100644
--- a/src/test/ui/issue-45562.stderr
+++ b/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
index 881f37c2e0b..881f37c2e0b 100644
--- 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
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
index da42e171fcc..da42e171fcc 100644
--- a/src/test/ui/issue-45696-no-variant-box-recur.rs
+++ b/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
index 6172a5e35a8..6172a5e35a8 100644
--- 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
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
index da0dfac2d18..da0dfac2d18 100644
--- 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
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
index 09cbc2f9451..09cbc2f9451 100644
--- 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
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
index 5a4874249e2..5a4874249e2 100644
--- a/src/test/ui/issue-45696-scribble-on-boxed-borrow.rs
+++ b/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
index b8be209833a..b8be209833a 100644
--- a/src/test/ui/issue-45697-1.rs
+++ b/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
index cf108691a0e..cf108691a0e 100644
--- a/src/test/ui/issue-45697-1.stderr
+++ b/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
index 27acc2c89f7..27acc2c89f7 100644
--- a/src/test/ui/issue-45697.rs
+++ b/src/test/ui/issues/issue-45697.rs
diff --git a/src/test/ui/issue-45697.stderr b/src/test/ui/issues/issue-45697.stderr
index a85972fcd7a..a85972fcd7a 100644
--- a/src/test/ui/issue-45697.stderr
+++ b/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
index b42ced07583..b42ced07583 100644
--- a/src/test/ui/issue-45729-unsafe-in-generator.rs
+++ b/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
index 3fad5209fd5..3fad5209fd5 100644
--- a/src/test/ui/issue-45729-unsafe-in-generator.stderr
+++ b/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
index d733c8e6de2..d733c8e6de2 100644
--- a/src/test/ui/issue-45730.rs
+++ b/src/test/ui/issues/issue-45730.rs
diff --git a/src/test/ui/issue-45730.stderr b/src/test/ui/issues/issue-45730.stderr
index aa5773e3dbf..aa5773e3dbf 100644
--- a/src/test/ui/issue-45730.stderr
+++ b/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
index e3287030408..e3287030408 100644
--- 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
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
index f47ea474d51..f47ea474d51 100644
--- 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
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
index ecdfec2b3bf..ecdfec2b3bf 100644
--- 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
diff --git a/src/test/ui/issue-45801.rs b/src/test/ui/issues/issue-45801.rs
index 7823a7d6ba8..7823a7d6ba8 100644
--- a/src/test/ui/issue-45801.rs
+++ b/src/test/ui/issues/issue-45801.rs
diff --git a/src/test/ui/issue-45801.stderr b/src/test/ui/issues/issue-45801.stderr
index 91c14be8833..91c14be8833 100644
--- a/src/test/ui/issue-45801.stderr
+++ b/src/test/ui/issues/issue-45801.stderr
diff --git a/src/test/ui/issue-45965.rs b/src/test/ui/issues/issue-45965.rs
index 0b82f2b32ff..0b82f2b32ff 100644
--- a/src/test/ui/issue-45965.rs
+++ b/src/test/ui/issues/issue-45965.rs
diff --git a/src/test/ui/issue-45965.stderr b/src/test/ui/issues/issue-45965.stderr
index 2b3870feef3..2b3870feef3 100644
--- a/src/test/ui/issue-45965.stderr
+++ b/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
index bda629d48af..bda629d48af 100644
--- a/src/test/ui/issue-46023.ast.nll.stderr
+++ b/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
index 42fe73d88e6..42fe73d88e6 100644
--- a/src/test/ui/issue-46023.ast.stderr
+++ b/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
index bda629d48af..bda629d48af 100644
--- a/src/test/ui/issue-46023.mir.stderr
+++ b/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
index d5c8cd6d0f8..d5c8cd6d0f8 100644
--- a/src/test/ui/issue-46023.rs
+++ b/src/test/ui/issues/issue-46023.rs
diff --git a/src/test/ui/issue-46036.rs b/src/test/ui/issues/issue-46036.rs
index b5cdded4d30..b5cdded4d30 100644
--- a/src/test/ui/issue-46036.rs
+++ b/src/test/ui/issues/issue-46036.rs
diff --git a/src/test/ui/issue-46036.stderr b/src/test/ui/issues/issue-46036.stderr
index 463abaede88..463abaede88 100644
--- a/src/test/ui/issue-46036.stderr
+++ b/src/test/ui/issues/issue-46036.stderr
diff --git a/src/test/ui/issue-46112.rs b/src/test/ui/issues/issue-46112.rs
index 698005b5d30..698005b5d30 100644
--- a/src/test/ui/issue-46112.rs
+++ b/src/test/ui/issues/issue-46112.rs
diff --git a/src/test/ui/issue-46112.stderr b/src/test/ui/issues/issue-46112.stderr
index 796187b93aa..796187b93aa 100644
--- a/src/test/ui/issue-46112.stderr
+++ b/src/test/ui/issues/issue-46112.stderr
diff --git a/src/test/ui/issue-46186.rs b/src/test/ui/issues/issue-46186.rs
index 1440b9e8cdc..1440b9e8cdc 100644
--- a/src/test/ui/issue-46186.rs
+++ b/src/test/ui/issues/issue-46186.rs
diff --git a/src/test/ui/issue-46186.stderr b/src/test/ui/issues/issue-46186.stderr
index c64d5c68a79..c64d5c68a79 100644
--- a/src/test/ui/issue-46186.stderr
+++ b/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
index f5a20dd96dc..f5a20dd96dc 100644
--- 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
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
index 9e5abdeaa43..9e5abdeaa43 100644
--- 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
diff --git a/src/test/ui/issue-46302.rs b/src/test/ui/issues/issue-46302.rs
index 6ae6b549b07..6ae6b549b07 100644
--- a/src/test/ui/issue-46302.rs
+++ b/src/test/ui/issues/issue-46302.rs
diff --git a/src/test/ui/issue-46302.stderr b/src/test/ui/issues/issue-46302.stderr
index 8e399136fad..8e399136fad 100644
--- a/src/test/ui/issue-46302.stderr
+++ b/src/test/ui/issues/issue-46302.stderr
diff --git a/src/test/ui/issue-46311.rs b/src/test/ui/issues/issue-46311.rs
index 82f55f2c142..82f55f2c142 100644
--- a/src/test/ui/issue-46311.rs
+++ b/src/test/ui/issues/issue-46311.rs
diff --git a/src/test/ui/issue-46311.stderr b/src/test/ui/issues/issue-46311.stderr
index 790399c75ee..790399c75ee 100644
--- a/src/test/ui/issue-46311.stderr
+++ b/src/test/ui/issues/issue-46311.stderr
diff --git a/src/test/ui/issue-46332.rs b/src/test/ui/issues/issue-46332.rs
index d094497e246..d094497e246 100644
--- a/src/test/ui/issue-46332.rs
+++ b/src/test/ui/issues/issue-46332.rs
diff --git a/src/test/ui/issue-46332.stderr b/src/test/ui/issues/issue-46332.stderr
index 06553767cc9..06553767cc9 100644
--- a/src/test/ui/issue-46332.stderr
+++ b/src/test/ui/issues/issue-46332.stderr
diff --git a/src/test/ui/issue-46438.rs b/src/test/ui/issues/issue-46438.rs
index d84b5813385..d84b5813385 100644
--- a/src/test/ui/issue-46438.rs
+++ b/src/test/ui/issues/issue-46438.rs
diff --git a/src/test/ui/issue-46438.stderr b/src/test/ui/issues/issue-46438.stderr
index b0d6229d24b..b0d6229d24b 100644
--- a/src/test/ui/issue-46438.stderr
+++ b/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
index 0dbcdea89f9..0dbcdea89f9 100644
--- a/src/test/ui/issue-46471-1.rs
+++ b/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
index 7d12827dda5..7d12827dda5 100644
--- a/src/test/ui/issue-46471-1.stderr
+++ b/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
index 8faedb73842..8faedb73842 100644
--- a/src/test/ui/issue-46471.rs
+++ b/src/test/ui/issues/issue-46471.rs
diff --git a/src/test/ui/issue-46471.stderr b/src/test/ui/issues/issue-46471.stderr
index 560c341b4df..560c341b4df 100644
--- a/src/test/ui/issue-46471.stderr
+++ b/src/test/ui/issues/issue-46471.stderr
diff --git a/src/test/ui/issue-46472.rs b/src/test/ui/issues/issue-46472.rs
index 02c4dd7cb21..02c4dd7cb21 100644
--- a/src/test/ui/issue-46472.rs
+++ b/src/test/ui/issues/issue-46472.rs
diff --git a/src/test/ui/issue-46472.stderr b/src/test/ui/issues/issue-46472.stderr
index 9e5acf56d26..9e5acf56d26 100644
--- a/src/test/ui/issue-46472.stderr
+++ b/src/test/ui/issues/issue-46472.stderr
diff --git a/src/test/ui/issue-46576.rs b/src/test/ui/issues/issue-46576.rs
index 636a1e9a064..636a1e9a064 100644
--- a/src/test/ui/issue-46576.rs
+++ b/src/test/ui/issues/issue-46576.rs
diff --git a/src/test/ui/issue-46576.stderr b/src/test/ui/issues/issue-46576.stderr
index 0590de0bd35..0590de0bd35 100644
--- a/src/test/ui/issue-46576.stderr
+++ b/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
index a4ee0d4e2a3..a4ee0d4e2a3 100644
--- a/src/test/ui/issue-46604.ast.nll.stderr
+++ b/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
index 713ba476a1c..713ba476a1c 100644
--- a/src/test/ui/issue-46604.ast.stderr
+++ b/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
index a4ee0d4e2a3..a4ee0d4e2a3 100644
--- a/src/test/ui/issue-46604.mir.stderr
+++ b/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
index dc14eca1e67..dc14eca1e67 100644
--- a/src/test/ui/issue-46604.rs
+++ b/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
index 77171cad6e7..77171cad6e7 100644
--- 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
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
index e5ea9b5ed09..e5ea9b5ed09 100644
--- 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
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
index 9c492751ca1..9c492751ca1 100644
--- 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
diff --git a/src/test/ui/issue-46771.rs b/src/test/ui/issues/issue-46771.rs
index f8bcd8861f3..f8bcd8861f3 100644
--- a/src/test/ui/issue-46771.rs
+++ b/src/test/ui/issues/issue-46771.rs
diff --git a/src/test/ui/issue-46771.stderr b/src/test/ui/issues/issue-46771.stderr
index 0d57d61e9ff..0d57d61e9ff 100644
--- a/src/test/ui/issue-46771.stderr
+++ b/src/test/ui/issues/issue-46771.stderr
diff --git a/src/test/ui/issue-46843.rs b/src/test/ui/issues/issue-46843.rs
index d88b4e568b0..d88b4e568b0 100644
--- a/src/test/ui/issue-46843.rs
+++ b/src/test/ui/issues/issue-46843.rs
diff --git a/src/test/ui/issue-46843.stderr b/src/test/ui/issues/issue-46843.stderr
index 9b752f41f59..9b752f41f59 100644
--- a/src/test/ui/issue-46843.stderr
+++ b/src/test/ui/issues/issue-46843.stderr
diff --git a/src/test/ui/issue-46983.rs b/src/test/ui/issues/issue-46983.rs
index ebbd474b1c2..ebbd474b1c2 100644
--- a/src/test/ui/issue-46983.rs
+++ b/src/test/ui/issues/issue-46983.rs
diff --git a/src/test/ui/issue-46983.stderr b/src/test/ui/issues/issue-46983.stderr
index c4f2b3eba7d..c4f2b3eba7d 100644
--- a/src/test/ui/issue-46983.stderr
+++ b/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
index c59a9bc4170..c59a9bc4170 100644
--- 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
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
index 4a1c9b554a9..4a1c9b554a9 100644
--- 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
diff --git a/src/test/ui/issue-47094.rs b/src/test/ui/issues/issue-47094.rs
index 2b78c7d9b70..2b78c7d9b70 100644
--- a/src/test/ui/issue-47094.rs
+++ b/src/test/ui/issues/issue-47094.rs
diff --git a/src/test/ui/issue-47094.stderr b/src/test/ui/issues/issue-47094.stderr
index f4b622a00fe..f4b622a00fe 100644
--- a/src/test/ui/issue-47094.stderr
+++ b/src/test/ui/issues/issue-47094.stderr
diff --git a/src/test/ui/issue-47184.rs b/src/test/ui/issues/issue-47184.rs
index 0831b7e0af8..0831b7e0af8 100644
--- a/src/test/ui/issue-47184.rs
+++ b/src/test/ui/issues/issue-47184.rs
diff --git a/src/test/ui/issue-47184.stderr b/src/test/ui/issues/issue-47184.stderr
index 32a9783e9c2..32a9783e9c2 100644
--- a/src/test/ui/issue-47184.stderr
+++ b/src/test/ui/issues/issue-47184.stderr
diff --git a/src/test/ui/issue-47309.rs b/src/test/ui/issues/issue-47309.rs
index 1b9ff36f714..1b9ff36f714 100644
--- a/src/test/ui/issue-47309.rs
+++ b/src/test/ui/issues/issue-47309.rs
diff --git a/src/test/ui/issue-4736.rs b/src/test/ui/issues/issue-4736.rs
index 19803079d02..19803079d02 100644
--- a/src/test/ui/issue-4736.rs
+++ b/src/test/ui/issues/issue-4736.rs
diff --git a/src/test/ui/issue-4736.stderr b/src/test/ui/issues/issue-4736.stderr
index 6c0acc0b63f..6c0acc0b63f 100644
--- a/src/test/ui/issue-4736.stderr
+++ b/src/test/ui/issues/issue-4736.stderr
diff --git a/src/test/ui/issue-47377.rs b/src/test/ui/issues/issue-47377.rs
index f294008cfd0..f294008cfd0 100644
--- a/src/test/ui/issue-47377.rs
+++ b/src/test/ui/issues/issue-47377.rs
diff --git a/src/test/ui/issue-47377.stderr b/src/test/ui/issues/issue-47377.stderr
index 66c4a1277a0..66c4a1277a0 100644
--- a/src/test/ui/issue-47377.stderr
+++ b/src/test/ui/issues/issue-47377.stderr
diff --git a/src/test/ui/issue-47380.rs b/src/test/ui/issues/issue-47380.rs
index e43a967253c..e43a967253c 100644
--- a/src/test/ui/issue-47380.rs
+++ b/src/test/ui/issues/issue-47380.rs
diff --git a/src/test/ui/issue-47380.stderr b/src/test/ui/issues/issue-47380.stderr
index 585a2ec64d0..585a2ec64d0 100644
--- a/src/test/ui/issue-47380.stderr
+++ b/src/test/ui/issues/issue-47380.stderr
diff --git a/src/test/ui/issue-47412.rs b/src/test/ui/issues/issue-47412.rs
index 683ef876f4e..683ef876f4e 100644
--- a/src/test/ui/issue-47412.rs
+++ b/src/test/ui/issues/issue-47412.rs
diff --git a/src/test/ui/issue-47412.stderr b/src/test/ui/issues/issue-47412.stderr
index d8a47efc0aa..d8a47efc0aa 100644
--- a/src/test/ui/issue-47412.stderr
+++ b/src/test/ui/issues/issue-47412.stderr
diff --git a/src/test/ui/issue-47511.rs b/src/test/ui/issues/issue-47511.rs
index df4ff301bc9..df4ff301bc9 100644
--- a/src/test/ui/issue-47511.rs
+++ b/src/test/ui/issues/issue-47511.rs
diff --git a/src/test/ui/issue-47511.stderr b/src/test/ui/issues/issue-47511.stderr
index 6ee71fc6c73..6ee71fc6c73 100644
--- a/src/test/ui/issue-47511.stderr
+++ b/src/test/ui/issues/issue-47511.stderr
diff --git a/src/test/ui/issue-47623.rs b/src/test/ui/issues/issue-47623.rs
index 0c886fdb52f..0c886fdb52f 100644
--- a/src/test/ui/issue-47623.rs
+++ b/src/test/ui/issues/issue-47623.rs
diff --git a/src/test/ui/issue-47623.stderr b/src/test/ui/issues/issue-47623.stderr
index 8cbed1c293e..8cbed1c293e 100644
--- a/src/test/ui/issue-47623.stderr
+++ b/src/test/ui/issues/issue-47623.stderr
diff --git a/src/test/ui/issue-47646.rs b/src/test/ui/issues/issue-47646.rs
index 7a6d6dd3fe1..7a6d6dd3fe1 100644
--- a/src/test/ui/issue-47646.rs
+++ b/src/test/ui/issues/issue-47646.rs
diff --git a/src/test/ui/issue-47646.stderr b/src/test/ui/issues/issue-47646.stderr
index 4bdce85d18b..4bdce85d18b 100644
--- a/src/test/ui/issue-47646.stderr
+++ b/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
index 4ce653547da..4ce653547da 100644
--- a/src/test/ui/issue-47706-trait.rs
+++ b/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
index 717b3eb0b56..717b3eb0b56 100644
--- a/src/test/ui/issue-47706-trait.stderr
+++ b/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
index 9c521dd6479..9c521dd6479 100644
--- a/src/test/ui/issue-47706.rs
+++ b/src/test/ui/issues/issue-47706.rs
diff --git a/src/test/ui/issue-47706.stderr b/src/test/ui/issues/issue-47706.stderr
index 0a5c8beccd1..0a5c8beccd1 100644
--- a/src/test/ui/issue-47706.stderr
+++ b/src/test/ui/issues/issue-47706.stderr
diff --git a/src/test/ui/issue-47715.rs b/src/test/ui/issues/issue-47715.rs
index b6b720f088a..b6b720f088a 100644
--- a/src/test/ui/issue-47715.rs
+++ b/src/test/ui/issues/issue-47715.rs
diff --git a/src/test/ui/issue-47715.stderr b/src/test/ui/issues/issue-47715.stderr
index 29b6afe7d07..29b6afe7d07 100644
--- a/src/test/ui/issue-47715.stderr
+++ b/src/test/ui/issues/issue-47715.stderr
diff --git a/src/test/ui/issue-48131.rs b/src/test/ui/issues/issue-48131.rs
index 9eb567a5d3e..9eb567a5d3e 100644
--- a/src/test/ui/issue-48131.rs
+++ b/src/test/ui/issues/issue-48131.rs
diff --git a/src/test/ui/issue-48131.stderr b/src/test/ui/issues/issue-48131.stderr
index d0ba1a1c37d..d0ba1a1c37d 100644
--- a/src/test/ui/issue-48131.stderr
+++ b/src/test/ui/issues/issue-48131.stderr
diff --git a/src/test/ui/issue-48132.rs b/src/test/ui/issues/issue-48132.rs
index 87fee986de7..87fee986de7 100644
--- a/src/test/ui/issue-48132.rs
+++ b/src/test/ui/issues/issue-48132.rs
diff --git a/src/test/ui/issue-48179.rs b/src/test/ui/issues/issue-48179.rs
index 745b59e0658..745b59e0658 100644
--- a/src/test/ui/issue-48179.rs
+++ b/src/test/ui/issues/issue-48179.rs
diff --git a/src/test/ui/issue-48276.rs b/src/test/ui/issues/issue-48276.rs
index 30d11a2e37f..30d11a2e37f 100644
--- a/src/test/ui/issue-48276.rs
+++ b/src/test/ui/issues/issue-48276.rs
diff --git a/src/test/ui/issue-48276.stderr b/src/test/ui/issues/issue-48276.stderr
index db4894aa691..db4894aa691 100644
--- a/src/test/ui/issue-48276.stderr
+++ b/src/test/ui/issues/issue-48276.stderr
diff --git a/src/test/ui/issue-48364.rs b/src/test/ui/issues/issue-48364.rs
index 82cb722a656..82cb722a656 100644
--- a/src/test/ui/issue-48364.rs
+++ b/src/test/ui/issues/issue-48364.rs
diff --git a/src/test/ui/issue-48364.stderr b/src/test/ui/issues/issue-48364.stderr
index b420654a32d..b420654a32d 100644
--- a/src/test/ui/issue-48364.stderr
+++ b/src/test/ui/issues/issue-48364.stderr
diff --git a/src/test/ui/issue-48636.fixed b/src/test/ui/issues/issue-48636.fixed
index 0ff33c42b1c..0ff33c42b1c 100644
--- a/src/test/ui/issue-48636.fixed
+++ b/src/test/ui/issues/issue-48636.fixed
diff --git a/src/test/ui/issue-48636.rs b/src/test/ui/issues/issue-48636.rs
index 2ac41211347..2ac41211347 100644
--- a/src/test/ui/issue-48636.rs
+++ b/src/test/ui/issues/issue-48636.rs
diff --git a/src/test/ui/issue-48636.stderr b/src/test/ui/issues/issue-48636.stderr
index c4706f982ed..c4706f982ed 100644
--- a/src/test/ui/issue-48636.stderr
+++ b/src/test/ui/issues/issue-48636.stderr
diff --git a/src/test/ui/issue-48728.rs b/src/test/ui/issues/issue-48728.rs
index 251ebf5d418..251ebf5d418 100644
--- a/src/test/ui/issue-48728.rs
+++ b/src/test/ui/issues/issue-48728.rs
diff --git a/src/test/ui/issue-48728.stderr b/src/test/ui/issues/issue-48728.stderr
index 937266d6d55..937266d6d55 100644
--- a/src/test/ui/issue-48728.stderr
+++ b/src/test/ui/issues/issue-48728.stderr
diff --git a/src/test/ui/issue-48803.rs b/src/test/ui/issues/issue-48803.rs
index c6d14ace8b3..c6d14ace8b3 100644
--- a/src/test/ui/issue-48803.rs
+++ b/src/test/ui/issues/issue-48803.rs
diff --git a/src/test/ui/issue-48803.stderr b/src/test/ui/issues/issue-48803.stderr
index b37e2c07d23..b37e2c07d23 100644
--- a/src/test/ui/issue-48803.stderr
+++ b/src/test/ui/issues/issue-48803.stderr
diff --git a/src/test/ui/issue-48838.rs b/src/test/ui/issues/issue-48838.rs
index ab52a32869f..ab52a32869f 100644
--- a/src/test/ui/issue-48838.rs
+++ b/src/test/ui/issues/issue-48838.rs
diff --git a/src/test/ui/issue-48838.stderr b/src/test/ui/issues/issue-48838.stderr
index 2c7e682a982..2c7e682a982 100644
--- a/src/test/ui/issue-48838.stderr
+++ b/src/test/ui/issues/issue-48838.stderr
diff --git a/src/test/ui/issue-49040.rs b/src/test/ui/issues/issue-49040.rs
index 866ecd9e1d9..866ecd9e1d9 100644
--- a/src/test/ui/issue-49040.rs
+++ b/src/test/ui/issues/issue-49040.rs
diff --git a/src/test/ui/issue-49040.stderr b/src/test/ui/issues/issue-49040.stderr
index b6f624dac7d..b6f624dac7d 100644
--- a/src/test/ui/issue-49040.stderr
+++ b/src/test/ui/issues/issue-49040.stderr
diff --git a/src/test/ui/issue-49074.rs b/src/test/ui/issues/issue-49074.rs
index 2e7e1184410..2e7e1184410 100644
--- a/src/test/ui/issue-49074.rs
+++ b/src/test/ui/issues/issue-49074.rs
diff --git a/src/test/ui/issue-49074.stderr b/src/test/ui/issues/issue-49074.stderr
index c9984ea2e9a..c9984ea2e9a 100644
--- a/src/test/ui/issue-49074.stderr
+++ b/src/test/ui/issues/issue-49074.stderr
diff --git a/src/test/ui/issue-49257.rs b/src/test/ui/issues/issue-49257.rs
index f288a2b2174..f288a2b2174 100644
--- a/src/test/ui/issue-49257.rs
+++ b/src/test/ui/issues/issue-49257.rs
diff --git a/src/test/ui/issue-49257.stderr b/src/test/ui/issues/issue-49257.stderr
index 40179832b49..40179832b49 100644
--- a/src/test/ui/issue-49257.stderr
+++ b/src/test/ui/issues/issue-49257.stderr
diff --git a/src/test/ui/issue-4935.rs b/src/test/ui/issues/issue-4935.rs
index 5b6e2c75a1c..5b6e2c75a1c 100644
--- a/src/test/ui/issue-4935.rs
+++ b/src/test/ui/issues/issue-4935.rs
diff --git a/src/test/ui/issue-4935.stderr b/src/test/ui/issues/issue-4935.stderr
index 25efd54443a..25efd54443a 100644
--- a/src/test/ui/issue-4935.stderr
+++ b/src/test/ui/issues/issue-4935.stderr
diff --git a/src/test/ui/issue-49579.rs b/src/test/ui/issues/issue-49579.rs
index e4e97c58d8a..e4e97c58d8a 100644
--- a/src/test/ui/issue-49579.rs
+++ b/src/test/ui/issues/issue-49579.rs
diff --git a/src/test/ui/issue-4968.rs b/src/test/ui/issues/issue-4968.rs
index 77588e5c221..77588e5c221 100644
--- a/src/test/ui/issue-4968.rs
+++ b/src/test/ui/issues/issue-4968.rs
diff --git a/src/test/ui/issue-4968.stderr b/src/test/ui/issues/issue-4968.stderr
index a9d58eda6e8..a9d58eda6e8 100644
--- a/src/test/ui/issue-4968.stderr
+++ b/src/test/ui/issues/issue-4968.stderr
diff --git a/src/test/ui/issue-4972.rs b/src/test/ui/issues/issue-4972.rs
index f384dba7c9e..f384dba7c9e 100644
--- a/src/test/ui/issue-4972.rs
+++ b/src/test/ui/issues/issue-4972.rs
diff --git a/src/test/ui/issue-4972.stderr b/src/test/ui/issues/issue-4972.stderr
index e9c1bdb6f86..e9c1bdb6f86 100644
--- a/src/test/ui/issue-4972.stderr
+++ b/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
index fb4bed76a71..fb4bed76a71 100644
--- a/src/test/ui/issue-49824.nll.stderr
+++ b/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
index 1f3e5752884..1f3e5752884 100644
--- a/src/test/ui/issue-49824.rs
+++ b/src/test/ui/issues/issue-49824.rs
diff --git a/src/test/ui/issue-49824.stderr b/src/test/ui/issues/issue-49824.stderr
index b6cafe5e9e9..b6cafe5e9e9 100644
--- a/src/test/ui/issue-49824.stderr
+++ b/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
index db82f22c6d9..db82f22c6d9 100644
--- a/src/test/ui/issue-49851/compiler-builtins-error.rs
+++ b/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
index 7e23e0fd747..7e23e0fd747 100644
--- a/src/test/ui/issue-49851/compiler-builtins-error.stderr
+++ b/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
index 3e30e7a6450..3e30e7a6450 100644
--- a/src/test/ui/issue-49934.rs
+++ b/src/test/ui/issues/issue-49934.rs
diff --git a/src/test/ui/issue-49934.stderr b/src/test/ui/issues/issue-49934.stderr
index 298230b8b29..298230b8b29 100644
--- a/src/test/ui/issue-49934.stderr
+++ b/src/test/ui/issues/issue-49934.stderr
diff --git a/src/test/ui/issue-50187.rs b/src/test/ui/issues/issue-50187.rs
index ccb2742841c..ccb2742841c 100644
--- a/src/test/ui/issue-50187.rs
+++ b/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
index 4c67fb3bef1..4c67fb3bef1 100644
--- 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
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
index a56cd6e8d2f..a56cd6e8d2f 100644
--- 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
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
index 73bdf0b9209..73bdf0b9209 100644
--- 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
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
index d3d7c1993ca..d3d7c1993ca 100644
--- 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
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
index 5d1e7472d8f..5d1e7472d8f 100644
--- 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
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
index bf75687b21f..bf75687b21f 100644
--- 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
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
index bee8e0c062b..bee8e0c062b 100644
--- 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
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
index a77333a7568..a77333a7568 100644
--- 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
diff --git a/src/test/ui/issue-50403.rs b/src/test/ui/issues/issue-50403.rs
index 8d4c6c5140f..8d4c6c5140f 100644
--- a/src/test/ui/issue-50403.rs
+++ b/src/test/ui/issues/issue-50403.rs
diff --git a/src/test/ui/issue-50403.stderr b/src/test/ui/issues/issue-50403.stderr
index f2871c72e25..f2871c72e25 100644
--- a/src/test/ui/issue-50403.stderr
+++ b/src/test/ui/issues/issue-50403.stderr
diff --git a/src/test/ui/issue-50471.rs b/src/test/ui/issues/issue-50471.rs
index ce2947144af..ce2947144af 100644
--- a/src/test/ui/issue-50471.rs
+++ b/src/test/ui/issues/issue-50471.rs
diff --git a/src/test/ui/issue-50480.rs b/src/test/ui/issues/issue-50480.rs
index 3427cf6bf9c..3427cf6bf9c 100644
--- a/src/test/ui/issue-50480.rs
+++ b/src/test/ui/issues/issue-50480.rs
diff --git a/src/test/ui/issue-50480.stderr b/src/test/ui/issues/issue-50480.stderr
index f5281fec4d1..f5281fec4d1 100644
--- a/src/test/ui/issue-50480.stderr
+++ b/src/test/ui/issues/issue-50480.stderr
diff --git a/src/test/ui/issue-50576.rs b/src/test/ui/issues/issue-50576.rs
index b2032fb226b..b2032fb226b 100644
--- a/src/test/ui/issue-50576.rs
+++ b/src/test/ui/issues/issue-50576.rs
diff --git a/src/test/ui/issue-50576.stderr b/src/test/ui/issues/issue-50576.stderr
index e661be21339..e661be21339 100644
--- a/src/test/ui/issue-50576.stderr
+++ b/src/test/ui/issues/issue-50576.stderr
diff --git a/src/test/ui/issue-50577.rs b/src/test/ui/issues/issue-50577.rs
index 6fd680c1519..6fd680c1519 100644
--- a/src/test/ui/issue-50577.rs
+++ b/src/test/ui/issues/issue-50577.rs
diff --git a/src/test/ui/issue-50577.stderr b/src/test/ui/issues/issue-50577.stderr
index 8751303a0db..8751303a0db 100644
--- a/src/test/ui/issue-50577.stderr
+++ b/src/test/ui/issues/issue-50577.stderr
diff --git a/src/test/ui/issue-50581.rs b/src/test/ui/issues/issue-50581.rs
index 97b3f81eaf5..97b3f81eaf5 100644
--- a/src/test/ui/issue-50581.rs
+++ b/src/test/ui/issues/issue-50581.rs
diff --git a/src/test/ui/issue-50581.stderr b/src/test/ui/issues/issue-50581.stderr
index 38a87b1e78a..38a87b1e78a 100644
--- a/src/test/ui/issue-50581.stderr
+++ b/src/test/ui/issues/issue-50581.stderr
diff --git a/src/test/ui/issue-50585.rs b/src/test/ui/issues/issue-50585.rs
index 0c063d4cdb0..0c063d4cdb0 100644
--- a/src/test/ui/issue-50585.rs
+++ b/src/test/ui/issues/issue-50585.rs
diff --git a/src/test/ui/issue-50585.stderr b/src/test/ui/issues/issue-50585.stderr
index e4edc18c3f8..e4edc18c3f8 100644
--- a/src/test/ui/issue-50585.stderr
+++ b/src/test/ui/issues/issue-50585.stderr
diff --git a/src/test/ui/issue-50599.rs b/src/test/ui/issues/issue-50599.rs
index f46a562ce7a..f46a562ce7a 100644
--- a/src/test/ui/issue-50599.rs
+++ b/src/test/ui/issues/issue-50599.rs
diff --git a/src/test/ui/issue-50599.stderr b/src/test/ui/issues/issue-50599.stderr
index 8337a31ec14..8337a31ec14 100644
--- a/src/test/ui/issue-50599.stderr
+++ b/src/test/ui/issues/issue-50599.stderr
diff --git a/src/test/ui/issue-50600.rs b/src/test/ui/issues/issue-50600.rs
index 6169a7770bf..6169a7770bf 100644
--- a/src/test/ui/issue-50600.rs
+++ b/src/test/ui/issues/issue-50600.rs
diff --git a/src/test/ui/issue-50600.stderr b/src/test/ui/issues/issue-50600.stderr
index a72dbace248..a72dbace248 100644
--- a/src/test/ui/issue-50600.stderr
+++ b/src/test/ui/issues/issue-50600.stderr
diff --git a/src/test/ui/issue-50618.rs b/src/test/ui/issues/issue-50618.rs
index ed427c293df..ed427c293df 100644
--- a/src/test/ui/issue-50618.rs
+++ b/src/test/ui/issues/issue-50618.rs
diff --git a/src/test/ui/issue-50618.stderr b/src/test/ui/issues/issue-50618.stderr
index 07cc5a1318a..07cc5a1318a 100644
--- a/src/test/ui/issue-50618.stderr
+++ b/src/test/ui/issues/issue-50618.stderr
diff --git a/src/test/ui/issue-5062.rs b/src/test/ui/issues/issue-5062.rs
index ebfa4975d4d..ebfa4975d4d 100644
--- a/src/test/ui/issue-5062.rs
+++ b/src/test/ui/issues/issue-5062.rs
diff --git a/src/test/ui/issue-5062.stderr b/src/test/ui/issues/issue-5062.stderr
index 988c5c137b4..988c5c137b4 100644
--- a/src/test/ui/issue-5062.stderr
+++ b/src/test/ui/issues/issue-5062.stderr
diff --git a/src/test/ui/issue-5067.rs b/src/test/ui/issues/issue-5067.rs
index 267362f902d..267362f902d 100644
--- a/src/test/ui/issue-5067.rs
+++ b/src/test/ui/issues/issue-5067.rs
diff --git a/src/test/ui/issue-5067.stderr b/src/test/ui/issues/issue-5067.stderr
index 2ea3ea5204c..2ea3ea5204c 100644
--- a/src/test/ui/issue-5067.stderr
+++ b/src/test/ui/issues/issue-5067.stderr
diff --git a/src/test/ui/issue-50688.rs b/src/test/ui/issues/issue-50688.rs
index ff45cf639de..ff45cf639de 100644
--- a/src/test/ui/issue-50688.rs
+++ b/src/test/ui/issues/issue-50688.rs
diff --git a/src/test/ui/issue-50688.stderr b/src/test/ui/issues/issue-50688.stderr
index 094b0e1ec89..094b0e1ec89 100644
--- a/src/test/ui/issue-50688.stderr
+++ b/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
index f0e496a88fb..f0e496a88fb 100644
--- a/src/test/ui/issue-50714-1.rs
+++ b/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
index 5c92516cbc5..5c92516cbc5 100644
--- a/src/test/ui/issue-50714-1.stderr
+++ b/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
index 08d975326df..08d975326df 100644
--- a/src/test/ui/issue-50714.rs
+++ b/src/test/ui/issues/issue-50714.rs
diff --git a/src/test/ui/issue-50714.stderr b/src/test/ui/issues/issue-50714.stderr
index e2c99980e1b..e2c99980e1b 100644
--- a/src/test/ui/issue-50714.stderr
+++ b/src/test/ui/issues/issue-50714.stderr
diff --git a/src/test/ui/issue-50761.rs b/src/test/ui/issues/issue-50761.rs
index b8a7a089c23..b8a7a089c23 100644
--- a/src/test/ui/issue-50761.rs
+++ b/src/test/ui/issues/issue-50761.rs
diff --git a/src/test/ui/issue-50781.rs b/src/test/ui/issues/issue-50781.rs
index 43830869da7..43830869da7 100644
--- a/src/test/ui/issue-50781.rs
+++ b/src/test/ui/issues/issue-50781.rs
diff --git a/src/test/ui/issue-50781.stderr b/src/test/ui/issues/issue-50781.stderr
index 047b847e67e..047b847e67e 100644
--- a/src/test/ui/issue-50781.stderr
+++ b/src/test/ui/issues/issue-50781.stderr
diff --git a/src/test/ui/issue-50802.rs b/src/test/ui/issues/issue-50802.rs
index 6342d0757ee..6342d0757ee 100644
--- a/src/test/ui/issue-50802.rs
+++ b/src/test/ui/issues/issue-50802.rs
diff --git a/src/test/ui/issue-50802.stderr b/src/test/ui/issues/issue-50802.stderr
index 9da2648b376..9da2648b376 100644
--- a/src/test/ui/issue-50802.stderr
+++ b/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
index 1eee9b7c883..1eee9b7c883 100644
--- a/src/test/ui/issue-50825-1.rs
+++ b/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
index e45156b96cd..e45156b96cd 100644
--- a/src/test/ui/issue-50825.rs
+++ b/src/test/ui/issues/issue-50825.rs
diff --git a/src/test/ui/issue-5099.rs b/src/test/ui/issues/issue-5099.rs
index 1bb6f34b8e9..1bb6f34b8e9 100644
--- a/src/test/ui/issue-5099.rs
+++ b/src/test/ui/issues/issue-5099.rs
diff --git a/src/test/ui/issue-5099.stderr b/src/test/ui/issues/issue-5099.stderr
index 26a26f731cf..26a26f731cf 100644
--- a/src/test/ui/issue-5099.stderr
+++ b/src/test/ui/issues/issue-5099.stderr
diff --git a/src/test/ui/issue-50993.rs b/src/test/ui/issues/issue-50993.rs
index d6cdd738001..d6cdd738001 100644
--- a/src/test/ui/issue-50993.rs
+++ b/src/test/ui/issues/issue-50993.rs
diff --git a/src/test/ui/issue-50993.stderr b/src/test/ui/issues/issue-50993.stderr
index d7b33a22e9c..d7b33a22e9c 100644
--- a/src/test/ui/issue-50993.stderr
+++ b/src/test/ui/issues/issue-50993.stderr
diff --git a/src/test/ui/issue-5100.rs b/src/test/ui/issues/issue-5100.rs
index 9ef780aac8e..9ef780aac8e 100644
--- a/src/test/ui/issue-5100.rs
+++ b/src/test/ui/issues/issue-5100.rs
diff --git a/src/test/ui/issue-5100.stderr b/src/test/ui/issues/issue-5100.stderr
index 6f5a84966bf..6f5a84966bf 100644
--- a/src/test/ui/issue-5100.stderr
+++ b/src/test/ui/issues/issue-5100.stderr
diff --git a/src/test/ui/issue-51022.rs b/src/test/ui/issues/issue-51022.rs
index 831c3e5fda0..831c3e5fda0 100644
--- a/src/test/ui/issue-51022.rs
+++ b/src/test/ui/issues/issue-51022.rs
diff --git a/src/test/ui/issue-51022.stderr b/src/test/ui/issues/issue-51022.stderr
index 1daa8dfbba6..1daa8dfbba6 100644
--- a/src/test/ui/issue-51022.stderr
+++ b/src/test/ui/issues/issue-51022.stderr
diff --git a/src/test/ui/issue-51044.rs b/src/test/ui/issues/issue-51044.rs
index 6424c4229bd..6424c4229bd 100644
--- a/src/test/ui/issue-51044.rs
+++ b/src/test/ui/issues/issue-51044.rs
diff --git a/src/test/ui/issue-51102.rs b/src/test/ui/issues/issue-51102.rs
index c8f106687ae..c8f106687ae 100644
--- a/src/test/ui/issue-51102.rs
+++ b/src/test/ui/issues/issue-51102.rs
diff --git a/src/test/ui/issue-51102.stderr b/src/test/ui/issues/issue-51102.stderr
index a4bd0fb914f..a4bd0fb914f 100644
--- a/src/test/ui/issue-51102.stderr
+++ b/src/test/ui/issues/issue-51102.stderr
diff --git a/src/test/ui/issue-51116.rs b/src/test/ui/issues/issue-51116.rs
index c01559b1126..c01559b1126 100644
--- a/src/test/ui/issue-51116.rs
+++ b/src/test/ui/issues/issue-51116.rs
diff --git a/src/test/ui/issue-51116.stderr b/src/test/ui/issues/issue-51116.stderr
index fc84ee9028d..fc84ee9028d 100644
--- a/src/test/ui/issue-51116.stderr
+++ b/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
index ce02ae2aec2..ce02ae2aec2 100644
--- a/src/test/ui/issue-51244.nll.stderr
+++ b/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
index 50a21184a98..50a21184a98 100644
--- a/src/test/ui/issue-51244.rs
+++ b/src/test/ui/issues/issue-51244.rs
diff --git a/src/test/ui/issue-51244.stderr b/src/test/ui/issues/issue-51244.stderr
index 997a74295e5..997a74295e5 100644
--- a/src/test/ui/issue-51244.stderr
+++ b/src/test/ui/issues/issue-51244.stderr
diff --git a/src/test/ui/issue-51279.rs b/src/test/ui/issues/issue-51279.rs
index 4639d73e44d..4639d73e44d 100644
--- a/src/test/ui/issue-51279.rs
+++ b/src/test/ui/issues/issue-51279.rs
diff --git a/src/test/ui/issue-51279.stderr b/src/test/ui/issues/issue-51279.stderr
index 38d5a5acc50..38d5a5acc50 100644
--- a/src/test/ui/issue-51279.stderr
+++ b/src/test/ui/issues/issue-51279.stderr
diff --git a/src/test/ui/issue-51515.rs b/src/test/ui/issues/issue-51515.rs
index 3e0a3b757a3..3e0a3b757a3 100644
--- a/src/test/ui/issue-51515.rs
+++ b/src/test/ui/issues/issue-51515.rs
diff --git a/src/test/ui/issue-51515.stderr b/src/test/ui/issues/issue-51515.stderr
index 3e7349b5aca..3e7349b5aca 100644
--- a/src/test/ui/issue-51515.stderr
+++ b/src/test/ui/issues/issue-51515.stderr
diff --git a/src/test/ui/issue-5153.rs b/src/test/ui/issues/issue-5153.rs
index 9b49886961d..9b49886961d 100644
--- a/src/test/ui/issue-5153.rs
+++ b/src/test/ui/issues/issue-5153.rs
diff --git a/src/test/ui/issue-5153.stderr b/src/test/ui/issues/issue-5153.stderr
index 6f8dce109e1..6f8dce109e1 100644
--- a/src/test/ui/issue-5153.stderr
+++ b/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
index 016cff914bd..016cff914bd 100644
--- a/src/test/ui/issue-51632-try-desugar-incompatible-types.fixed
+++ b/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
index 315773a85f0..315773a85f0 100644
--- a/src/test/ui/issue-51632-try-desugar-incompatible-types.rs
+++ b/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
index a50af5624c0..a50af5624c0 100644
--- a/src/test/ui/issue-51632-try-desugar-incompatible-types.stderr
+++ b/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
index 2b9d51f81b9..2b9d51f81b9 100644
--- a/src/test/ui/issue-51714.rs
+++ b/src/test/ui/issues/issue-51714.rs
diff --git a/src/test/ui/issue-51714.stderr b/src/test/ui/issues/issue-51714.stderr
index ddc70bfb38e..ddc70bfb38e 100644
--- a/src/test/ui/issue-51714.stderr
+++ b/src/test/ui/issues/issue-51714.stderr
diff --git a/src/test/ui/issue-51848.rs b/src/test/ui/issues/issue-51848.rs
index ec90d3f62d2..ec90d3f62d2 100644
--- a/src/test/ui/issue-51848.rs
+++ b/src/test/ui/issues/issue-51848.rs
diff --git a/src/test/ui/issue-51848.stderr b/src/test/ui/issues/issue-51848.stderr
index 8e5001dca33..8e5001dca33 100644
--- a/src/test/ui/issue-51848.stderr
+++ b/src/test/ui/issues/issue-51848.stderr
diff --git a/src/test/ui/issue-51874.rs b/src/test/ui/issues/issue-51874.rs
index 63425274d4c..63425274d4c 100644
--- a/src/test/ui/issue-51874.rs
+++ b/src/test/ui/issues/issue-51874.rs
diff --git a/src/test/ui/issue-51874.stderr b/src/test/ui/issues/issue-51874.stderr
index 86746453571..86746453571 100644
--- a/src/test/ui/issue-51874.stderr
+++ b/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
index 02bed69f0d4..02bed69f0d4 100644
--- a/src/test/ui/issue-52023-array-size-pointer-cast.rs
+++ b/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
index 74270c2bef7..74270c2bef7 100644
--- a/src/test/ui/issue-52023-array-size-pointer-cast.stderr
+++ b/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
index 6f71f167611..6f71f167611 100644
--- a/src/test/ui/issue-52049.nll.stderr
+++ b/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
index daff2258d36..daff2258d36 100644
--- a/src/test/ui/issue-52049.rs
+++ b/src/test/ui/issues/issue-52049.rs
diff --git a/src/test/ui/issue-52049.stderr b/src/test/ui/issues/issue-52049.stderr
index e1e501023fc..e1e501023fc 100644
--- a/src/test/ui/issue-52049.stderr
+++ b/src/test/ui/issues/issue-52049.stderr
diff --git a/src/test/ui/issue-52057.rs b/src/test/ui/issues/issue-52057.rs
index 533623fd389..533623fd389 100644
--- a/src/test/ui/issue-52057.rs
+++ b/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
index e3e389d1197..e3e389d1197 100644
--- a/src/test/ui/issue-52126-assign-op-invariance.nll.stderr
+++ b/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
index b26ad9bc37d..b26ad9bc37d 100644
--- a/src/test/ui/issue-52126-assign-op-invariance.rs
+++ b/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
index a4ea8085c12..a4ea8085c12 100644
--- a/src/test/ui/issue-52126-assign-op-invariance.stderr
+++ b/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
index 81424577d49..81424577d49 100644
--- a/src/test/ui/issue-5216.rs
+++ b/src/test/ui/issues/issue-5216.rs
diff --git a/src/test/ui/issue-5216.stderr b/src/test/ui/issues/issue-5216.stderr
index 7ea329749a0..7ea329749a0 100644
--- a/src/test/ui/issue-5216.stderr
+++ b/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
index 4e1efc96490..4e1efc96490 100644
--- a/src/test/ui/issue-52213.nll.stderr
+++ b/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
index 810379c63d3..810379c63d3 100644
--- a/src/test/ui/issue-52213.rs
+++ b/src/test/ui/issues/issue-52213.rs
diff --git a/src/test/ui/issue-52213.stderr b/src/test/ui/issues/issue-52213.stderr
index 3c650881d7b..3c650881d7b 100644
--- a/src/test/ui/issue-52213.stderr
+++ b/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
index f88b6931344..f88b6931344 100644
--- a/src/test/ui/issue-5239-1.rs
+++ b/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
index 7ae01fb7d60..7ae01fb7d60 100644
--- a/src/test/ui/issue-5239-1.stderr
+++ b/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
index c43cc12ca02..c43cc12ca02 100644
--- a/src/test/ui/compile-fail-migration/issue-52489.rs
+++ b/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
index 5b38a0789ad..5b38a0789ad 100644
--- a/src/test/ui/compile-fail-migration/issue-52489.stderr
+++ b/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
index 87fda1dd99c..87fda1dd99c 100644
--- a/src/test/ui/issue-52533-1.nll.stderr
+++ b/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
index 22af5a86702..22af5a86702 100644
--- a/src/test/ui/issue-52533-1.rs
+++ b/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
index 38deb7d66de..38deb7d66de 100644
--- a/src/test/ui/issue-52533-1.stderr
+++ b/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
index a13b06e3204..a13b06e3204 100644
--- a/src/test/ui/issue-52533.nll.stderr
+++ b/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
index 08f2805cefd..08f2805cefd 100644
--- a/src/test/ui/issue-52533.rs
+++ b/src/test/ui/issues/issue-52533.rs
diff --git a/src/test/ui/issue-52533.stderr b/src/test/ui/issues/issue-52533.stderr
index 76a2470a2e0..76a2470a2e0 100644
--- a/src/test/ui/issue-52533.stderr
+++ b/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
index d8aad54fd3e..d8aad54fd3e 100644
--- a/src/test/ui/issue-5358-1.rs
+++ b/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
index abaea462fcc..abaea462fcc 100644
--- a/src/test/ui/issue-5358-1.stderr
+++ b/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
index 4e618f3d858..4e618f3d858 100644
--- a/src/test/ui/issue-5439.rs
+++ b/src/test/ui/issues/issue-5439.rs
diff --git a/src/test/ui/issue-5439.stderr b/src/test/ui/issues/issue-5439.stderr
index 87e20f3a03d..87e20f3a03d 100644
--- a/src/test/ui/issue-5439.stderr
+++ b/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
index 611eea533b2..611eea533b2 100644
--- a/src/test/ui/compile-fail-migration/issue-5500-1.ast.stderr
+++ b/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
index 465485e5e29..465485e5e29 100644
--- a/src/test/ui/compile-fail-migration/issue-5500-1.mir.stderr
+++ b/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
index 8d6efa774a3..8d6efa774a3 100644
--- a/src/test/ui/compile-fail-migration/issue-5500-1.rs
+++ b/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
index 02e5b9b0921..02e5b9b0921 100644
--- a/src/test/ui/compile-fail-migration/issue-5844.rs
+++ b/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
index 05b0b63439f..05b0b63439f 100644
--- a/src/test/ui/compile-fail-migration/issue-5844.stderr
+++ b/src/test/ui/issues/issue-5844.stderr
diff --git a/src/test/ui/issue-5883.rs b/src/test/ui/issues/issue-5883.rs
index a91f5d281dd..a91f5d281dd 100644
--- a/src/test/ui/issue-5883.rs
+++ b/src/test/ui/issues/issue-5883.rs
diff --git a/src/test/ui/issue-5883.stderr b/src/test/ui/issues/issue-5883.stderr
index 6a321abeaed..6a321abeaed 100644
--- a/src/test/ui/issue-5883.stderr
+++ b/src/test/ui/issues/issue-5883.stderr
diff --git a/src/test/ui/issue-5927.rs b/src/test/ui/issues/issue-5927.rs
index bb802f353af..bb802f353af 100644
--- a/src/test/ui/issue-5927.rs
+++ b/src/test/ui/issues/issue-5927.rs
diff --git a/src/test/ui/issue-5927.stderr b/src/test/ui/issues/issue-5927.stderr
index f8b9b15678d..f8b9b15678d 100644
--- a/src/test/ui/issue-5927.stderr
+++ b/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
index 463fdaa1069..463fdaa1069 100644
--- a/src/test/ui/issue-5997-enum.rs
+++ b/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
index 9f26f653ebd..9f26f653ebd 100644
--- a/src/test/ui/issue-5997-enum.stderr
+++ b/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
index af9e66b770b..af9e66b770b 100644
--- a/src/test/ui/issue-5997-struct.rs
+++ b/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
index fd6d67bd128..fd6d67bd128 100644
--- a/src/test/ui/issue-5997-struct.stderr
+++ b/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
index 87cf2b3f740..87cf2b3f740 100644
--- a/src/test/ui/issue-6458-2.rs
+++ b/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
index e192c2c3be3..e192c2c3be3 100644
--- a/src/test/ui/issue-6458-2.stderr
+++ b/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
index 038f6043fa6..038f6043fa6 100644
--- a/src/test/ui/issue-6458-3.rs
+++ b/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
index c09b2643dfa..c09b2643dfa 100644
--- a/src/test/ui/issue-6458-3.stderr
+++ b/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
index 45934d03ed4..45934d03ed4 100644
--- a/src/test/ui/issue-6458-4.rs
+++ b/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
index 13b0ace6465..13b0ace6465 100644
--- a/src/test/ui/issue-6458-4.stderr
+++ b/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
index b4e7c0c40cf..b4e7c0c40cf 100644
--- a/src/test/ui/issue-6458.rs
+++ b/src/test/ui/issues/issue-6458.rs
diff --git a/src/test/ui/issue-6458.stderr b/src/test/ui/issues/issue-6458.stderr
index 701795c748d..701795c748d 100644
--- a/src/test/ui/issue-6458.stderr
+++ b/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
index ce8a3a80e1f..ce8a3a80e1f 100644
--- a/src/test/ui/issue-6596-1.rs
+++ b/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
index b7055ab19d0..b7055ab19d0 100644
--- a/src/test/ui/issue-6596-1.stderr
+++ b/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
index 3e18de6178a..3e18de6178a 100644
--- a/src/test/ui/issue-6596-2.rs
+++ b/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
index f2ed17f35e6..f2ed17f35e6 100644
--- a/src/test/ui/issue-6596-2.stderr
+++ b/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
index 1fe10ba7a27..1fe10ba7a27 100644
--- a/src/test/ui/issue-6642.rs
+++ b/src/test/ui/issues/issue-6642.rs
diff --git a/src/test/ui/issue-6642.stderr b/src/test/ui/issues/issue-6642.stderr
index 1762af52eb0..1762af52eb0 100644
--- a/src/test/ui/issue-6642.stderr
+++ b/src/test/ui/issues/issue-6642.stderr
diff --git a/src/test/ui/issue-6738.rs b/src/test/ui/issues/issue-6738.rs
index 447d0e061ee..447d0e061ee 100644
--- a/src/test/ui/issue-6738.rs
+++ b/src/test/ui/issues/issue-6738.rs
diff --git a/src/test/ui/issue-6738.stderr b/src/test/ui/issues/issue-6738.stderr
index 8c0aff9d9ab..8c0aff9d9ab 100644
--- a/src/test/ui/issue-6738.stderr
+++ b/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
index 3ca2f39470d..3ca2f39470d 100644
--- a/src/test/ui/issue-6801.nll.stderr
+++ b/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
index 792d27c179b..792d27c179b 100644
--- a/src/test/ui/issue-6801.rs
+++ b/src/test/ui/issues/issue-6801.rs
diff --git a/src/test/ui/issue-6801.stderr b/src/test/ui/issues/issue-6801.stderr
index 8a1c669f0b2..8a1c669f0b2 100644
--- a/src/test/ui/issue-6801.stderr
+++ b/src/test/ui/issues/issue-6801.stderr
diff --git a/src/test/ui/issue-6804.rs b/src/test/ui/issues/issue-6804.rs
index fffa27ab842..fffa27ab842 100644
--- a/src/test/ui/issue-6804.rs
+++ b/src/test/ui/issues/issue-6804.rs
diff --git a/src/test/ui/issue-6804.stderr b/src/test/ui/issues/issue-6804.stderr
index 45eefbfaf8e..45eefbfaf8e 100644
--- a/src/test/ui/issue-6804.stderr
+++ b/src/test/ui/issues/issue-6804.stderr
diff --git a/src/test/ui/issue-6936.rs b/src/test/ui/issues/issue-6936.rs
index 8eb16edcbd3..8eb16edcbd3 100644
--- a/src/test/ui/issue-6936.rs
+++ b/src/test/ui/issues/issue-6936.rs
diff --git a/src/test/ui/issue-6936.stderr b/src/test/ui/issues/issue-6936.stderr
index 48fcbf40622..48fcbf40622 100644
--- a/src/test/ui/issue-6936.stderr
+++ b/src/test/ui/issues/issue-6936.stderr
diff --git a/src/test/ui/issue-7013.rs b/src/test/ui/issues/issue-7013.rs
index 0c19780bcb4..0c19780bcb4 100644
--- a/src/test/ui/issue-7013.rs
+++ b/src/test/ui/issues/issue-7013.rs
diff --git a/src/test/ui/issue-7013.stderr b/src/test/ui/issues/issue-7013.stderr
index fec6e06a699..fec6e06a699 100644
--- a/src/test/ui/issue-7013.stderr
+++ b/src/test/ui/issues/issue-7013.stderr
diff --git a/src/test/ui/issue-7044.rs b/src/test/ui/issues/issue-7044.rs
index 9b72c249356..9b72c249356 100644
--- a/src/test/ui/issue-7044.rs
+++ b/src/test/ui/issues/issue-7044.rs
diff --git a/src/test/ui/issue-7044.stderr b/src/test/ui/issues/issue-7044.stderr
index 02707b2d21e..02707b2d21e 100644
--- a/src/test/ui/issue-7044.stderr
+++ b/src/test/ui/issues/issue-7044.stderr
diff --git a/src/test/ui/issue-7061.rs b/src/test/ui/issues/issue-7061.rs
index b99f5b707ee..b99f5b707ee 100644
--- a/src/test/ui/issue-7061.rs
+++ b/src/test/ui/issues/issue-7061.rs
diff --git a/src/test/ui/issue-7061.stderr b/src/test/ui/issues/issue-7061.stderr
index 4f142ba95bc..4f142ba95bc 100644
--- a/src/test/ui/issue-7061.stderr
+++ b/src/test/ui/issues/issue-7061.stderr
diff --git a/src/test/ui/issue-7092.rs b/src/test/ui/issues/issue-7092.rs
index 26e1597b1db..26e1597b1db 100644
--- a/src/test/ui/issue-7092.rs
+++ b/src/test/ui/issues/issue-7092.rs
diff --git a/src/test/ui/issue-7092.stderr b/src/test/ui/issues/issue-7092.stderr
index 3c816098289..3c816098289 100644
--- a/src/test/ui/issue-7092.stderr
+++ b/src/test/ui/issues/issue-7092.stderr
diff --git a/src/test/ui/issue-7246.rs b/src/test/ui/issues/issue-7246.rs
index 7e8d431bf19..7e8d431bf19 100644
--- a/src/test/ui/issue-7246.rs
+++ b/src/test/ui/issues/issue-7246.rs
diff --git a/src/test/ui/issue-7246.stderr b/src/test/ui/issues/issue-7246.stderr
index 75c716e5a04..75c716e5a04 100644
--- a/src/test/ui/issue-7246.stderr
+++ b/src/test/ui/issues/issue-7246.stderr
diff --git a/src/test/ui/issue-7364.rs b/src/test/ui/issues/issue-7364.rs
index 801a1301ad7..801a1301ad7 100644
--- a/src/test/ui/issue-7364.rs
+++ b/src/test/ui/issues/issue-7364.rs
diff --git a/src/test/ui/issue-7364.stderr b/src/test/ui/issues/issue-7364.stderr
index b0d732bdb6f..b0d732bdb6f 100644
--- a/src/test/ui/issue-7364.stderr
+++ b/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
index 9bcdd690187..9bcdd690187 100644
--- a/src/test/ui/issue-7607-1.rs
+++ b/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
index bebf1c1ae98..bebf1c1ae98 100644
--- a/src/test/ui/issue-7607-1.stderr
+++ b/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
index 39a87bfaf74..39a87bfaf74 100644
--- a/src/test/ui/issue-7813.rs
+++ b/src/test/ui/issues/issue-7813.rs
diff --git a/src/test/ui/issue-7813.stderr b/src/test/ui/issues/issue-7813.stderr
index 3ab01982057..3ab01982057 100644
--- a/src/test/ui/issue-7813.stderr
+++ b/src/test/ui/issues/issue-7813.stderr
diff --git a/src/test/ui/issue-7867.rs b/src/test/ui/issues/issue-7867.rs
index 016df6cb6ef..016df6cb6ef 100644
--- a/src/test/ui/issue-7867.rs
+++ b/src/test/ui/issues/issue-7867.rs
diff --git a/src/test/ui/issue-7867.stderr b/src/test/ui/issues/issue-7867.stderr
index 03ab54d112f..03ab54d112f 100644
--- a/src/test/ui/issue-7867.stderr
+++ b/src/test/ui/issues/issue-7867.stderr
diff --git a/src/test/ui/issue-7950.rs b/src/test/ui/issues/issue-7950.rs
index dd3a48cb155..dd3a48cb155 100644
--- a/src/test/ui/issue-7950.rs
+++ b/src/test/ui/issues/issue-7950.rs
diff --git a/src/test/ui/issue-7950.stderr b/src/test/ui/issues/issue-7950.stderr
index 750127981b1..750127981b1 100644
--- a/src/test/ui/issue-7950.stderr
+++ b/src/test/ui/issues/issue-7950.stderr
diff --git a/src/test/ui/issue-7970a.rs b/src/test/ui/issues/issue-7970a.rs
index b97c3037770..b97c3037770 100644
--- a/src/test/ui/issue-7970a.rs
+++ b/src/test/ui/issues/issue-7970a.rs
diff --git a/src/test/ui/issue-7970a.stderr b/src/test/ui/issues/issue-7970a.stderr
index 7ad95717185..7ad95717185 100644
--- a/src/test/ui/issue-7970a.stderr
+++ b/src/test/ui/issues/issue-7970a.stderr
diff --git a/src/test/ui/issue-7970b.rs b/src/test/ui/issues/issue-7970b.rs
index 0cff90f281b..0cff90f281b 100644
--- a/src/test/ui/issue-7970b.rs
+++ b/src/test/ui/issues/issue-7970b.rs
diff --git a/src/test/ui/issue-7970b.stderr b/src/test/ui/issues/issue-7970b.stderr
index b2feb677863..b2feb677863 100644
--- a/src/test/ui/issue-7970b.stderr
+++ b/src/test/ui/issues/issue-7970b.stderr
diff --git a/src/test/ui/issue-8153.rs b/src/test/ui/issues/issue-8153.rs
index 457918b54d4..457918b54d4 100644
--- a/src/test/ui/issue-8153.rs
+++ b/src/test/ui/issues/issue-8153.rs
diff --git a/src/test/ui/issue-8153.stderr b/src/test/ui/issues/issue-8153.stderr
index 03fb89f8ccc..03fb89f8ccc 100644
--- a/src/test/ui/issue-8153.stderr
+++ b/src/test/ui/issues/issue-8153.stderr
diff --git a/src/test/ui/issue-8208.rs b/src/test/ui/issues/issue-8208.rs
index 670b6bd46e7..670b6bd46e7 100644
--- a/src/test/ui/issue-8208.rs
+++ b/src/test/ui/issues/issue-8208.rs
diff --git a/src/test/ui/issue-8208.stderr b/src/test/ui/issues/issue-8208.stderr
index 73a9a6a51be..73a9a6a51be 100644
--- a/src/test/ui/issue-8208.stderr
+++ b/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
index b0d6cb5df87..b0d6cb5df87 100644
--- a/src/test/ui/issue-8460-const.rs
+++ b/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
index db35cde7569..db35cde7569 100644
--- a/src/test/ui/issue-8460-const.stderr
+++ b/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
index c4ca3acf080..c4ca3acf080 100644
--- a/src/test/ui/issue-8640.rs
+++ b/src/test/ui/issues/issue-8640.rs
diff --git a/src/test/ui/issue-8640.stderr b/src/test/ui/issues/issue-8640.stderr
index 68fdea6e228..68fdea6e228 100644
--- a/src/test/ui/issue-8640.stderr
+++ b/src/test/ui/issues/issue-8640.stderr
diff --git a/src/test/ui/issue-8727.rs b/src/test/ui/issues/issue-8727.rs
index fc88a2c81b4..fc88a2c81b4 100644
--- a/src/test/ui/issue-8727.rs
+++ b/src/test/ui/issues/issue-8727.rs
diff --git a/src/test/ui/issue-8727.stderr b/src/test/ui/issues/issue-8727.stderr
index 28fb71bcc17..28fb71bcc17 100644
--- a/src/test/ui/issue-8727.stderr
+++ b/src/test/ui/issues/issue-8727.stderr
diff --git a/src/test/ui/issue-8761.rs b/src/test/ui/issues/issue-8761.rs
index f8424ea64ef..f8424ea64ef 100644
--- a/src/test/ui/issue-8761.rs
+++ b/src/test/ui/issues/issue-8761.rs
diff --git a/src/test/ui/issue-8761.stderr b/src/test/ui/issues/issue-8761.stderr
index b8144df3835..b8144df3835 100644
--- a/src/test/ui/issue-8761.stderr
+++ b/src/test/ui/issues/issue-8761.stderr
diff --git a/src/test/ui/issue-8767.rs b/src/test/ui/issues/issue-8767.rs
index 926cae788aa..926cae788aa 100644
--- a/src/test/ui/issue-8767.rs
+++ b/src/test/ui/issues/issue-8767.rs
diff --git a/src/test/ui/issue-8767.stderr b/src/test/ui/issues/issue-8767.stderr
index d03e20ba270..d03e20ba270 100644
--- a/src/test/ui/issue-8767.stderr
+++ b/src/test/ui/issues/issue-8767.stderr
diff --git a/src/test/ui/issue-9575.rs b/src/test/ui/issues/issue-9575.rs
index 9295eeb1779..9295eeb1779 100644
--- a/src/test/ui/issue-9575.rs
+++ b/src/test/ui/issues/issue-9575.rs
diff --git a/src/test/ui/issue-9575.stderr b/src/test/ui/issues/issue-9575.stderr
index d52669777bd..d52669777bd 100644
--- a/src/test/ui/issue-9575.stderr
+++ b/src/test/ui/issues/issue-9575.stderr
diff --git a/src/test/ui/issue-9725.rs b/src/test/ui/issues/issue-9725.rs
index f53122d19c1..f53122d19c1 100644
--- a/src/test/ui/issue-9725.rs
+++ b/src/test/ui/issues/issue-9725.rs
diff --git a/src/test/ui/issue-9725.stderr b/src/test/ui/issues/issue-9725.stderr
index 1d7fdad82a0..1d7fdad82a0 100644
--- a/src/test/ui/issue-9725.stderr
+++ b/src/test/ui/issues/issue-9725.stderr
diff --git a/src/test/ui/issue-9814.rs b/src/test/ui/issues/issue-9814.rs
index 226734b84d6..226734b84d6 100644
--- a/src/test/ui/issue-9814.rs
+++ b/src/test/ui/issues/issue-9814.rs
diff --git a/src/test/ui/issue-9814.stderr b/src/test/ui/issues/issue-9814.stderr
index 2e85bd46fe6..2e85bd46fe6 100644
--- a/src/test/ui/issue-9814.stderr
+++ b/src/test/ui/issues/issue-9814.stderr
diff --git a/src/test/ui/issue-pr29383.rs b/src/test/ui/issues/issue-pr29383.rs
index b60c537e1e6..b60c537e1e6 100644
--- a/src/test/ui/issue-pr29383.rs
+++ b/src/test/ui/issues/issue-pr29383.rs
diff --git a/src/test/ui/issue-pr29383.stderr b/src/test/ui/issues/issue-pr29383.stderr
index 9b8956da7a2..9b8956da7a2 100644
--- a/src/test/ui/issue-pr29383.stderr
+++ b/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
index 2b223bac8e6..2b223bac8e6 100644
--- a/src/test/ui/compile-fail-migration/issue32829.rs
+++ b/src/test/ui/issues/issue32829.rs
diff --git a/src/test/ui/compile-fail-migration/issue32829.stderr b/src/test/ui/issues/issue32829.stderr
index dad0880dbdf..dad0880dbdf 100644
--- a/src/test/ui/compile-fail-migration/issue32829.stderr
+++ b/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
index 3e445853957..3e445853957 100644
--- a/src/test/ui/compile-fail-migration/keyword-extern-as-identifier.rs
+++ b/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
index f246d6e75df..f246d6e75df 100644
--- a/src/test/ui/compile-fail-migration/keyword-false-as-identifier.rs
+++ b/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
index 13f675404f6..13f675404f6 100644
--- a/src/test/ui/compile-fail-migration/keyword-false-as-identifier.stderr
+++ b/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
index b50fc68bed6..b50fc68bed6 100644
--- a/src/test/ui/compile-fail-migration/keyword-self-as-identifier.rs
+++ b/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
index c47f4aeabef..c47f4aeabef 100644
--- a/src/test/ui/compile-fail-migration/keyword-self-as-identifier.stderr
+++ b/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
index 54dac771f01..54dac771f01 100644
--- a/src/test/ui/compile-fail-migration/keyword-super-as-identifier.rs
+++ b/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
index 649be45c224..649be45c224 100644
--- a/src/test/ui/compile-fail-migration/keyword-super-as-identifier.stderr
+++ b/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
index 02047bd639f..02047bd639f 100644
--- a/src/test/ui/compile-fail-migration/keyword-super.rs
+++ b/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
index ac692ad45d2..ac692ad45d2 100644
--- a/src/test/ui/compile-fail-migration/keyword-super.stderr
+++ b/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
index b09d09db560..b09d09db560 100644
--- a/src/test/ui/compile-fail-migration/keyword-true-as-identifier.rs
+++ b/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
index 776470ba77c..776470ba77c 100644
--- a/src/test/ui/compile-fail-migration/keyword-true-as-identifier.stderr
+++ b/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
index 747fe2d2046..747fe2d2046 100644
--- a/src/test/ui/compile-fail-migration/kindck-copy.rs
+++ b/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
index 8d72d912689..8d72d912689 100644
--- a/src/test/ui/compile-fail-migration/kindck-copy.stderr
+++ b/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
index 21aefc4f9c1..21aefc4f9c1 100644
--- a/src/test/ui/compile-fail-migration/kindck-impl-type-params-2.rs
+++ b/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
index e4c02085ddb..e4c02085ddb 100644
--- a/src/test/ui/compile-fail-migration/kindck-impl-type-params-2.stderr
+++ b/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
index 8f24baf7fc4..8f24baf7fc4 100644
--- a/src/test/ui/compile-fail-migration/kindck-impl-type-params.nll.stderr
+++ b/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
index 3a0e66f58e0..3a0e66f58e0 100644
--- a/src/test/ui/compile-fail-migration/kindck-impl-type-params.rs
+++ b/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
index b938d40c765..b938d40c765 100644
--- a/src/test/ui/compile-fail-migration/kindck-impl-type-params.stderr
+++ b/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
index 0731fbaf01c..0731fbaf01c 100644
--- a/src/test/ui/compile-fail-migration/kindck-inherited-copy-bound.rs
+++ b/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
index 542ecc0c004..542ecc0c004 100644
--- a/src/test/ui/compile-fail-migration/kindck-inherited-copy-bound.stderr
+++ b/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
index 43c212b2af5..43c212b2af5 100644
--- a/src/test/ui/compile-fail-migration/kindck-nonsendable-1.rs
+++ b/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
index a8aa02e1d62..a8aa02e1d62 100644
--- a/src/test/ui/compile-fail-migration/kindck-nonsendable-1.stderr
+++ b/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
index 82b97878549..82b97878549 100644
--- a/src/test/ui/compile-fail-migration/kindck-send-object.rs
+++ b/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
index e342352d590..e342352d590 100644
--- a/src/test/ui/compile-fail-migration/kindck-send-object.stderr
+++ b/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
index 6613a29cd76..6613a29cd76 100644
--- a/src/test/ui/compile-fail-migration/kindck-send-object1.nll.stderr
+++ b/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
index 853630aa416..853630aa416 100644
--- a/src/test/ui/compile-fail-migration/kindck-send-object1.rs
+++ b/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
index d906b7d9e16..d906b7d9e16 100644
--- a/src/test/ui/compile-fail-migration/kindck-send-object1.stderr
+++ b/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
index 0265f888e7c..0265f888e7c 100644
--- a/src/test/ui/compile-fail-migration/kindck-send-object2.rs
+++ b/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
index 475159cd400..475159cd400 100644
--- a/src/test/ui/compile-fail-migration/kindck-send-object2.stderr
+++ b/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
index e48460a8753..e48460a8753 100644
--- a/src/test/ui/compile-fail-migration/kindck-send-owned.rs
+++ b/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
index f5781bd968e..f5781bd968e 100644
--- a/src/test/ui/compile-fail-migration/kindck-send-owned.stderr
+++ b/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
index 99b995b0906..99b995b0906 100644
--- a/src/test/ui/compile-fail-migration/kindck-send-unsafe.rs
+++ b/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
index a9bbfcfa262..a9bbfcfa262 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/kindck-send-unsafe.stderr b/src/test/ui/kindck/kindck-send-unsafe.stderr
index 846de09ba3c..846de09ba3c 100644
--- a/src/test/ui/compile-fail-migration/kindck-send-unsafe.stderr
+++ b/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
index a0fb25ea06e..a0fb25ea06e 100644
--- a/src/test/ui/compile-fail-migration/label-static.rs
+++ b/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
index f5b6eba0089..f5b6eba0089 100644
--- a/src/test/ui/compile-fail-migration/label-static.stderr
+++ b/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
index 30411bf8789..30411bf8789 100644
--- a/src/test/ui/compile-fail-migration/label-underscore.rs
+++ b/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
index 9a567094c82..9a567094c82 100644
--- a/src/test/ui/compile-fail-migration/label-underscore.stderr
+++ b/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
index 4a505dff3d4..4a505dff3d4 100644
--- a/src/test/ui/label_break_value_continue.rs
+++ b/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
index 12a21a8a594..12a21a8a594 100644
--- a/src/test/ui/label_break_value_continue.stderr
+++ b/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
index 18644033e4f..18644033e4f 100644
--- a/src/test/ui/label_break_value_illegal_uses.rs
+++ b/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
index 0ab1ad2c242..0ab1ad2c242 100644
--- a/src/test/ui/label_break_value_illegal_uses.stderr
+++ b/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
index 454ebd4c6cf..454ebd4c6cf 100644
--- a/src/test/ui/label_break_value_unlabeled_break.rs
+++ b/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
index 62c4a12231b..62c4a12231b 100644
--- a/src/test/ui/label_break_value_unlabeled_break.stderr
+++ b/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
index ce2fa2548c3..ce2fa2548c3 100644
--- a/src/test/ui/compile-fail-migration/lang-item-missing.rs
+++ b/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
index f7516c7d377..f7516c7d377 100644
--- a/src/test/ui/compile-fail-migration/lang-item-missing.stderr
+++ b/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
index 39da0d47a95..39da0d47a95 100644
--- a/src/test/ui/compile-fail-migration/lexical-scopes.rs
+++ b/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
index 3a6ae52c68d..3a6ae52c68d 100644
--- a/src/test/ui/compile-fail-migration/lexical-scopes.stderr
+++ b/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
index 95f8b39c487..95f8b39c487 100644
--- 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
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
index ab9bb195631..ab9bb195631 100644
--- 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
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
index 7e9a4f82478..7e9a4f82478 100644
--- a/src/test/ui/compile-fail-migration/lifetime-bound-will-change-warning.rs
+++ b/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
index 01f215c97f2..01f215c97f2 100644
--- a/src/test/ui/compile-fail-migration/lifetime-bound-will-change-warning.stderr
+++ b/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
index a5fada7869e..a5fada7869e 100644
--- 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
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
index 30cff86ed1d..30cff86ed1d 100644
--- 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
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
index 89313f898d5..89313f898d5 100644
--- 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
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
index 5ded42e7c97..5ded42e7c97 100644
--- 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
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
index b886450336d..b886450336d 100644
--- 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
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
index 3976cb30426..3976cb30426 100644
--- 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
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
index 1705767834f..1705767834f 100644
--- 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
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
index 5847f755b3c..5847f755b3c 100644
--- 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
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
index 00eff2fe3ae..00eff2fe3ae 100644
--- 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
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
index 964f2f1c003..964f2f1c003 100644
--- 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
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
index a4e1fe5e183..a4e1fe5e183 100644
--- 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
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
index a3b46aa04a6..a3b46aa04a6 100644
--- 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
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
index 96d5c5bb161..96d5c5bb161 100644
--- 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
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
index a260c7bf7e9..a260c7bf7e9 100644
--- 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
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
index 465b33be2d0..465b33be2d0 100644
--- 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
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
index 5cf52fe79f0..5cf52fe79f0 100644
--- 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
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
index 8eac8761bd4..8eac8761bd4 100644
--- 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
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
index a62d7cc5a6f..a62d7cc5a6f 100644
--- 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
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
index 3727ddf9129..3727ddf9129 100644
--- 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
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
index 0ae98aeb843..0ae98aeb843 100644
--- 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
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
index b6bf646132e..b6bf646132e 100644
--- 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
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
index cec73d79ec2..cec73d79ec2 100644
--- 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
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
index 0eb8afbb26b..0eb8afbb26b 100644
--- 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
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
index 93f8254f825..93f8254f825 100644
--- 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
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
index 5ee2663317e..5ee2663317e 100644
--- 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
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
index b68b90e77de..b68b90e77de 100644
--- 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
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
index 93eac05e8d2..93eac05e8d2 100644
--- 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
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
index 4d57c61ba9e..4d57c61ba9e 100644
--- 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
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
index b6dfdff60be..b6dfdff60be 100644
--- 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
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
index c5b4fd1934b..c5b4fd1934b 100644
--- 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
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
index a6ccf4a53d1..a6ccf4a53d1 100644
--- 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
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
index 6c32adc11ce..6c32adc11ce 100644
--- 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
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
index 7f5b23728fd..7f5b23728fd 100644
--- 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
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
index 4710ebfa967..4710ebfa967 100644
--- 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
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
index a5fa83266a3..a5fa83266a3 100644
--- 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
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
index f35a7555d70..f35a7555d70 100644
--- 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
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
index 6f0a5179d6b..6f0a5179d6b 100644
--- 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
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
index c5f3510fa0e..c5f3510fa0e 100644
--- 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
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
index 18a720f345d..18a720f345d 100644
--- 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
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
index a8286ba2952..a8286ba2952 100644
--- 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
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
index 294a9106619..294a9106619 100644
--- 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
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
index 1834395bd3b..1834395bd3b 100644
--- 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
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
index ebe465aa581..ebe465aa581 100644
--- 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
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
index b7c252cac9b..b7c252cac9b 100644
--- 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
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
index 6cf626adf82..6cf626adf82 100644
--- 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
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
index 9884c0f3511..9884c0f3511 100644
--- 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
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
index c34278b4d9f..c34278b4d9f 100644
--- 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
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
index 36bd1c32286..36bd1c32286 100644
--- a/src/test/ui/lifetime-errors/ex2c-push-inference-variable.rs
+++ b/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
index 114024c2fb0..114024c2fb0 100644
--- a/src/test/ui/lifetime-errors/ex2c-push-inference-variable.stderr
+++ b/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
index 3097d18e86c..3097d18e86c 100644
--- 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
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
index 96316819e93..96316819e93 100644
--- 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
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
index 32fc8b42f42..32fc8b42f42 100644
--- 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
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
index ce0e9be3006..ce0e9be3006 100644
--- 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
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
index 9352ebc77f5..9352ebc77f5 100644
--- 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
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
index f62848ffa8c..f62848ffa8c 100644
--- 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
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
index c7f1a0ede3c..c7f1a0ede3c 100644
--- 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
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
index 62d7d56f9f7..62d7d56f9f7 100644
--- 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
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
index 5e110b43fb4..5e110b43fb4 100644
--- 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
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
index 09980e44c52..09980e44c52 100644
--- 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
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
index fe6b40c05a6..fe6b40c05a6 100644
--- 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
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
index 5a584296d3b..5a584296d3b 100644
--- 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
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
index 618817fd57b..618817fd57b 100644
--- 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
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
index f16120ddc22..f16120ddc22 100644
--- 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
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
index 158f40f2969..158f40f2969 100644
--- 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
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
index b4767afd413..b4767afd413 100644
--- 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
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
index 78e6dc2d3e7..78e6dc2d3e7 100644
--- 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
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
index 546789eedcb..546789eedcb 100644
--- 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
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
index e2fcbaa4c3c..e2fcbaa4c3c 100644
--- 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
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
index 78e6dc2d3e7..78e6dc2d3e7 100644
--- 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
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
index ccc5e02ab70..ccc5e02ab70 100644
--- 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
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
index aed0dcc1a67..aed0dcc1a67 100644
--- 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
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
index ffec0e8d5bb..ffec0e8d5bb 100644
--- 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
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
index f69bcb64297..f69bcb64297 100644
--- 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
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
index 7790d37d1c4..7790d37d1c4 100644
--- 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
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
index 16d18f30951..16d18f30951 100644
--- 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
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
index f9530c436a0..f9530c436a0 100644
--- 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
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
index 79f1a8c0ccf..79f1a8c0ccf 100644
--- 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
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
index 3b90b3474a1..3b90b3474a1 100644
--- 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
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
index 243103e2d18..243103e2d18 100644
--- 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
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
index 459a93813a8..459a93813a8 100644
--- 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
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
index 966b4f0b6c3..966b4f0b6c3 100644
--- 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
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
index c4dd2823431..c4dd2823431 100644
--- 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
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
index 0bacd894e6e..0bacd894e6e 100644
--- 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
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
index 055c3f80468..055c3f80468 100644
--- 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
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
index 52293e45306..52293e45306 100644
--- 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
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
index f40c67b8d11..f40c67b8d11 100644
--- 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
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
index 474da4a7d16..474da4a7d16 100644
--- 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
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
index b5d10e573c4..b5d10e573c4 100644
--- 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
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
index f9168dcf583..f9168dcf583 100644
--- 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
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
index 474da4a7d16..474da4a7d16 100644
--- 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
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
index 08913299520..08913299520 100644
--- 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
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
index c43f8477232..c43f8477232 100644
--- 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
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
index 1ffaec7ba00..1ffaec7ba00 100644
--- 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
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
index 133611ae489..133611ae489 100644
--- 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
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
index 22581d9b075..22581d9b075 100644
--- 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
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
index 97af3598010..97af3598010 100644
--- 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
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
index 01ea885b63e..01ea885b63e 100644
--- 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
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
index 908526d439e..908526d439e 100644
--- 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
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
index e6f4f0966ca..e6f4f0966ca 100644
--- 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
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
index aa5ab540295..aa5ab540295 100644
--- 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
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
index 2829ec35000..2829ec35000 100644
--- 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
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
index db53acf5afc..db53acf5afc 100644
--- 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
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
index 8a9ee9a05b8..8a9ee9a05b8 100644
--- 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
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
index 44d68df4b55..44d68df4b55 100644
--- 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
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
index b3ef06f1898..b3ef06f1898 100644
--- 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
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
index 65c9ea4e757..65c9ea4e757 100644
--- 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
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
index 5d3c6f38ad8..5d3c6f38ad8 100644
--- 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
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
index ebde6a3b53f..ebde6a3b53f 100644
--- 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
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
index 43ca5cd603f..43ca5cd603f 100644
--- 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
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
index 6460e5d687f..6460e5d687f 100644
--- 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
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
index f88eca494eb..f88eca494eb 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions.rs
+++ b/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
index 57187a47239..57187a47239 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions.stderr
+++ b/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
index 20a2cbfd3aa..20a2cbfd3aa 100644
--- 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
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
index 0620235371a..0620235371a 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/lifetime-no-keyword.rs b/src/test/ui/lifetimes/lifetime-no-keyword.rs
index d583c4fc6c6..d583c4fc6c6 100644
--- a/src/test/ui/compile-fail-migration/lifetime-no-keyword.rs
+++ b/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
index 1dcbe336c69..1dcbe336c69 100644
--- a/src/test/ui/compile-fail-migration/lifetime-no-keyword.stderr
+++ b/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
index afae4a451d6..afae4a451d6 100644
--- a/src/test/ui/compile-fail-migration/linkage2.rs
+++ b/src/test/ui/linkage2.rs
diff --git a/src/test/ui/compile-fail-migration/linkage2.stderr b/src/test/ui/linkage2.stderr
index d9edac160da..d9edac160da 100644
--- a/src/test/ui/compile-fail-migration/linkage2.stderr
+++ b/src/test/ui/linkage2.stderr
diff --git a/src/test/ui/compile-fail-migration/linkage3.rs b/src/test/ui/linkage3.rs
index c222989ed66..c222989ed66 100644
--- a/src/test/ui/compile-fail-migration/linkage3.rs
+++ b/src/test/ui/linkage3.rs
diff --git a/src/test/ui/compile-fail-migration/linkage3.stderr b/src/test/ui/linkage3.stderr
index 3429ced8ce4..3429ced8ce4 100644
--- a/src/test/ui/compile-fail-migration/linkage3.stderr
+++ b/src/test/ui/linkage3.stderr
diff --git a/src/test/ui/compile-fail-migration/linkage4.rs b/src/test/ui/linkage4.rs
index 1cf6e90d6c8..1cf6e90d6c8 100644
--- a/src/test/ui/compile-fail-migration/linkage4.rs
+++ b/src/test/ui/linkage4.rs
diff --git a/src/test/ui/compile-fail-migration/linkage4.stderr b/src/test/ui/linkage4.stderr
index c04f88d37a5..c04f88d37a5 100644
--- a/src/test/ui/compile-fail-migration/linkage4.stderr
+++ b/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
index f690cbd029d..f690cbd029d 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/inherited_stability.rs
+++ b/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
index 6ba66f3e45f..6ba66f3e45f 100644
--- a/src/test/ui/auxiliary/lint_output_format.rs
+++ b/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 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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
index 6b79c36fc05..6b79c36fc05 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/lint_stability_fields.rs
+++ b/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
index 2661b1f4eb4..2661b1f4eb4 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/lint_unused_extern_crate.rs
+++ b/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
index b61667cfd88..b61667cfd88 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/lint_unused_extern_crate2.rs
+++ b/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
index b61667cfd88..b61667cfd88 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/lint_unused_extern_crate3.rs
+++ b/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
index fc4bca865c9..fc4bca865c9 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/lint_unused_extern_crate4.rs
+++ b/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
index fc4bca865c9..fc4bca865c9 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/lint_unused_extern_crate5.rs
+++ b/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
index c839993b047..c839993b047 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/stability_cfg1.rs
+++ b/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
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"]
-#![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
-}
+// compile-flags:--cfg foo
 
-#[unstable(feature = "unstable_test_feature", issue = "0")]
-pub fn bar() -> usize {
-    40
-}
-
-#[unstable(feature = "unstable_test_feature", issue = "0")]
-pub fn baz() -> usize {
-    30
-}
+#![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)]
diff --git a/src/test/ui/lint-anon-param-edition.fixed b/src/test/ui/lint/lint-anon-param-edition.fixed
index c4379b496f8..c4379b496f8 100644
--- a/src/test/ui/lint-anon-param-edition.fixed
+++ b/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
index 13eb5dfd816..13eb5dfd816 100644
--- a/src/test/ui/lint-anon-param-edition.rs
+++ b/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
index de347770aec..de347770aec 100644
--- a/src/test/ui/lint-anon-param-edition.stderr
+++ b/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
index 930f69e51e1..930f69e51e1 100644
--- a/src/test/ui/compile-fail-migration/lint-attr-non-item-node.rs
+++ b/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
index 33d096c5bcf..33d096c5bcf 100644
--- a/src/test/ui/compile-fail-migration/lint-attr-non-item-node.stderr
+++ b/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
index 19e253e3b8e..19e253e3b8e 100644
--- a/src/test/ui/compile-fail-migration/lint-change-warnings.rs
+++ b/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
index 353802f5c28..353802f5c28 100644
--- a/src/test/ui/compile-fail-migration/lint-change-warnings.stderr
+++ b/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
index 7b7ffd8fc10..7b7ffd8fc10 100644
--- a/src/test/ui/compile-fail-migration/lint-ctypes-enum.rs
+++ b/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
index 9b1c04b2a1d..9b1c04b2a1d 100644
--- a/src/test/ui/compile-fail-migration/lint-ctypes-enum.stderr
+++ b/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
index b8b1a675c5f..b8b1a675c5f 100644
--- a/src/test/ui/lint-ctypes.rs
+++ b/src/test/ui/lint/lint-ctypes.rs
diff --git a/src/test/ui/lint-ctypes.stderr b/src/test/ui/lint/lint-ctypes.stderr
index b97e4662660..b97e4662660 100644
--- a/src/test/ui/lint-ctypes.stderr
+++ b/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
index 2fe72365bab..2fe72365bab 100644
--- a/src/test/ui/compile-fail-migration/lint-dead-code-1.rs
+++ b/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
index 9802b7e8f38..9802b7e8f38 100644
--- a/src/test/ui/compile-fail-migration/lint-dead-code-1.stderr
+++ b/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
index 4a0e4f4319e..4a0e4f4319e 100644
--- a/src/test/ui/compile-fail-migration/lint-dead-code-2.rs
+++ b/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
index 6e713c84f16..6e713c84f16 100644
--- a/src/test/ui/compile-fail-migration/lint-dead-code-2.stderr
+++ b/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
index 112d3630952..112d3630952 100644
--- a/src/test/ui/compile-fail-migration/lint-dead-code-3.rs
+++ b/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
index 994e93e8557..994e93e8557 100644
--- a/src/test/ui/compile-fail-migration/lint-dead-code-3.stderr
+++ b/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
index 1296cf46e6f..1296cf46e6f 100644
--- a/src/test/ui/compile-fail-migration/lint-dead-code-4.rs
+++ b/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
index fce2cf76898..fce2cf76898 100644
--- a/src/test/ui/compile-fail-migration/lint-dead-code-4.stderr
+++ b/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
index ee5cf24823d..ee5cf24823d 100644
--- a/src/test/ui/compile-fail-migration/lint-dead-code-5.rs
+++ b/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
index 37ca0f479f5..37ca0f479f5 100644
--- a/src/test/ui/compile-fail-migration/lint-dead-code-5.stderr
+++ b/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
index aaa01aa6bbe..aaa01aa6bbe 100644
--- a/src/test/ui/compile-fail-migration/lint-dead-code-type-alias.rs
+++ b/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
index bd11e64c781..bd11e64c781 100644
--- a/src/test/ui/compile-fail-migration/lint-dead-code-type-alias.stderr
+++ b/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
index 3301560c315..3301560c315 100644
--- a/src/test/ui/compile-fail-migration/lint-dead-code-variant.rs
+++ b/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
index 05b7e35337a..05b7e35337a 100644
--- a/src/test/ui/compile-fail-migration/lint-dead-code-variant.stderr
+++ b/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
index 18159aec708..18159aec708 100644
--- 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
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
index 2c4602ae20b..2c4602ae20b 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/lint-exceeding-bitshifts.rs b/src/test/ui/lint/lint-exceeding-bitshifts.rs
index 5ebfcc4926b..5ebfcc4926b 100644
--- a/src/test/ui/compile-fail-migration/lint-exceeding-bitshifts.rs
+++ b/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
index 5124a69195a..5124a69195a 100644
--- a/src/test/ui/compile-fail-migration/lint-exceeding-bitshifts.stderr
+++ b/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
index 3ba300eb7c4..3ba300eb7c4 100644
--- a/src/test/ui/compile-fail-migration/lint-exceeding-bitshifts2.rs
+++ b/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
index 17b4235a73f..17b4235a73f 100644
--- a/src/test/ui/compile-fail-migration/lint-exceeding-bitshifts2.stderr
+++ b/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
index 65e01600c10..65e01600c10 100644
--- a/src/test/ui/lint-forbid-attr.rs
+++ b/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
index aa0c0c1f5c2..aa0c0c1f5c2 100644
--- a/src/test/ui/lint-forbid-attr.stderr
+++ b/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
index 6a4d17b33de..6a4d17b33de 100644
--- a/src/test/ui/compile-fail-migration/lint-forbid-cmdline.rs
+++ b/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
index 37a2699e898..37a2699e898 100644
--- a/src/test/ui/compile-fail-migration/lint-forbid-cmdline.stderr
+++ b/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
index 54a720d75b5..54a720d75b5 100644
--- a/src/test/ui/compile-fail-migration/lint-impl-fn.rs
+++ b/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
index ed37e877875..ed37e877875 100644
--- a/src/test/ui/compile-fail-migration/lint-impl-fn.stderr
+++ b/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
index ad5e3aa3f06..ad5e3aa3f06 100644
--- a/src/test/ui/compile-fail-migration/lint-malformed.rs
+++ b/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
index 7b8155cb410..7b8155cb410 100644
--- a/src/test/ui/compile-fail-migration/lint-malformed.stderr
+++ b/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
index 18ea5a383f6..18ea5a383f6 100644
--- a/src/test/ui/compile-fail-migration/lint-misplaced-attr.rs
+++ b/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
index 17f29a6ba79..17f29a6ba79 100644
--- a/src/test/ui/compile-fail-migration/lint-misplaced-attr.stderr
+++ b/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
index 94a11aac067..94a11aac067 100644
--- a/src/test/ui/compile-fail-migration/lint-missing-copy-implementations.rs
+++ b/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
index 3cb89ef794a..3cb89ef794a 100644
--- a/src/test/ui/compile-fail-migration/lint-missing-copy-implementations.stderr
+++ b/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
index 4add67f61e0..4add67f61e0 100644
--- a/src/test/ui/compile-fail-migration/lint-missing-doc.rs
+++ b/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
index e61d56d8518..e61d56d8518 100644
--- a/src/test/ui/compile-fail-migration/lint-missing-doc.stderr
+++ b/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
index 5dcdf3a863f..5dcdf3a863f 100644
--- a/src/test/ui/compile-fail-migration/lint-non-camel-case-types.rs
+++ b/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
index 85610dc7fa3..85610dc7fa3 100644
--- a/src/test/ui/compile-fail-migration/lint-non-camel-case-types.stderr
+++ b/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
index fe22c21df24..fe22c21df24 100644
--- 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
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
index ce49d9a0b80..ce49d9a0b80 100644
--- 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
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
index 9ca0a34e6ff..9ca0a34e6ff 100644
--- a/src/test/ui/compile-fail-migration/lint-non-snake-case-crate.rs
+++ b/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
index 4d55661daa0..4d55661daa0 100644
--- a/src/test/ui/compile-fail-migration/lint-non-snake-case-crate.stderr
+++ b/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
index 6cfdc6ad90b..6cfdc6ad90b 100644
--- a/src/test/ui/compile-fail-migration/lint-non-snake-case-functions.rs
+++ b/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
index f7ac48da901..f7ac48da901 100644
--- a/src/test/ui/compile-fail-migration/lint-non-snake-case-functions.stderr
+++ b/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
index 64669d90d06..64669d90d06 100644
--- a/src/test/ui/compile-fail-migration/lint-non-snake-case-lifetimes.rs
+++ b/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
index dc9b5b8cd75..dc9b5b8cd75 100644
--- a/src/test/ui/compile-fail-migration/lint-non-snake-case-lifetimes.stderr
+++ b/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
index 5bc84698ec9..5bc84698ec9 100644
--- a/src/test/ui/compile-fail-migration/lint-non-snake-case-modules.rs
+++ b/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
index d55d80f31b5..d55d80f31b5 100644
--- a/src/test/ui/compile-fail-migration/lint-non-snake-case-modules.stderr
+++ b/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
index 84cc24a0010..84cc24a0010 100644
--- a/src/test/ui/compile-fail-migration/lint-non-uppercase-statics.rs
+++ b/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
index 0d56c577734..0d56c577734 100644
--- a/src/test/ui/compile-fail-migration/lint-non-uppercase-statics.stderr
+++ b/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
index b234f08d04a..b234f08d04a 100644
--- a/src/test/ui/compile-fail-migration/lint-obsolete-attr.rs
+++ b/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
index 4a8a55e260e..4a8a55e260e 100644
--- a/src/test/ui/compile-fail-migration/lint-obsolete-attr.stderr
+++ b/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
index e87ddde7413..e87ddde7413 100644
--- a/src/test/ui/lint-output-format-2.rs
+++ b/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
index 8c6247688e8..8c6247688e8 100644
--- a/src/test/ui/lint-output-format-2.stderr
+++ b/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
index 81e0b708b87..81e0b708b87 100644
--- a/src/test/ui/compile-fail-migration/lint-output-format.rs
+++ b/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
index bcc279929c6..bcc279929c6 100644
--- a/src/test/ui/compile-fail-migration/lint-output-format.stderr
+++ b/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
index 9c68da8beaf..9c68da8beaf 100644
--- a/src/test/ui/compile-fail-migration/lint-owned-heap-memory.rs
+++ b/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
index 5b61d30fd39..5b61d30fd39 100644
--- a/src/test/ui/compile-fail-migration/lint-owned-heap-memory.stderr
+++ b/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
index 57c2166565f..57c2166565f 100644
--- a/src/test/ui/compile-fail-migration/lint-qualification.rs
+++ b/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
index f4c8186caf7..f4c8186caf7 100644
--- a/src/test/ui/compile-fail-migration/lint-qualification.stderr
+++ b/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
index 9f84190ea18..9f84190ea18 100644
--- a/src/test/ui/compile-fail-migration/lint-removed-allow.rs
+++ b/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
index 8f4c757e54b..8f4c757e54b 100644
--- a/src/test/ui/compile-fail-migration/lint-removed-allow.stderr
+++ b/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
index 09725b20146..09725b20146 100644
--- a/src/test/ui/compile-fail-migration/lint-removed-cmdline.rs
+++ b/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
index 86faeec9542..86faeec9542 100644
--- a/src/test/ui/compile-fail-migration/lint-removed-cmdline.stderr
+++ b/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
index 4e53852008f..4e53852008f 100644
--- a/src/test/ui/compile-fail-migration/lint-removed.rs
+++ b/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
index 7d66186f349..7d66186f349 100644
--- a/src/test/ui/compile-fail-migration/lint-removed.stderr
+++ b/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
index f6b94e89826..f6b94e89826 100644
--- a/src/test/ui/compile-fail-migration/lint-renamed-allow.rs
+++ b/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
index 6b2eb272701..6b2eb272701 100644
--- a/src/test/ui/compile-fail-migration/lint-renamed-allow.stderr
+++ b/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
index f5abf2733b9..f5abf2733b9 100644
--- a/src/test/ui/compile-fail-migration/lint-renamed-cmdline.rs
+++ b/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
index 5e154a0033d..5e154a0033d 100644
--- a/src/test/ui/compile-fail-migration/lint-renamed-cmdline.stderr
+++ b/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
index c147ec5cf95..c147ec5cf95 100644
--- a/src/test/ui/compile-fail-migration/lint-renamed.rs
+++ b/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
index a87efc9e92c..a87efc9e92c 100644
--- a/src/test/ui/compile-fail-migration/lint-renamed.stderr
+++ b/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
index 97a976a493f..97a976a493f 100644
--- a/src/test/ui/compile-fail-migration/lint-shorthand-field.rs
+++ b/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
index 516be532f5d..516be532f5d 100644
--- a/src/test/ui/compile-fail-migration/lint-shorthand-field.stderr
+++ b/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
index 1f2fa077caf..1f2fa077caf 100644
--- a/src/test/ui/compile-fail-migration/lint-stability-2.rs
+++ b/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
index e87e0514433..e87e0514433 100644
--- a/src/test/ui/compile-fail-migration/lint-stability-2.stderr
+++ b/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
index de2c27bdcbc..de2c27bdcbc 100644
--- a/src/test/ui/compile-fail-migration/lint-stability-deprecated.rs
+++ b/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
index afebb4f36a4..afebb4f36a4 100644
--- a/src/test/ui/compile-fail-migration/lint-stability-deprecated.stderr
+++ b/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
index 0ad4466d0e2..0ad4466d0e2 100644
--- a/src/test/ui/compile-fail-migration/lint-stability-fields-deprecated.rs
+++ b/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
index f7bc87ee9d9..f7bc87ee9d9 100644
--- a/src/test/ui/compile-fail-migration/lint-stability-fields-deprecated.stderr
+++ b/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
index db6b64dabfe..db6b64dabfe 100644
--- a/src/test/ui/compile-fail-migration/lint-stability-fields.rs
+++ b/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
index 2f176062c30..2f176062c30 100644
--- a/src/test/ui/compile-fail-migration/lint-stability-fields.stderr
+++ b/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
index 720b1235d47..720b1235d47 100644
--- a/src/test/ui/compile-fail-migration/lint-stability.rs
+++ b/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
index 893c70f85f1..893c70f85f1 100644
--- a/src/test/ui/compile-fail-migration/lint-stability.stderr
+++ b/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
index d2ec00d6495..d2ec00d6495 100644
--- a/src/test/ui/compile-fail-migration/lint-stability2.rs
+++ b/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
index 5585fc9f83a..5585fc9f83a 100644
--- a/src/test/ui/compile-fail-migration/lint-stability2.stderr
+++ b/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
index 44a36f215f3..44a36f215f3 100644
--- a/src/test/ui/compile-fail-migration/lint-stability3.rs
+++ b/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
index 722223f6243..722223f6243 100644
--- a/src/test/ui/compile-fail-migration/lint-stability3.stderr
+++ b/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
index 29929c120c3..29929c120c3 100644
--- a/src/test/ui/compile-fail-migration/lint-type-limits.rs
+++ b/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
index 49b379a9901..49b379a9901 100644
--- a/src/test/ui/compile-fail-migration/lint-type-limits.stderr
+++ b/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
index 8fc18d16469..8fc18d16469 100644
--- a/src/test/ui/compile-fail-migration/lint-type-limits2.rs
+++ b/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
index a7abf7ad364..a7abf7ad364 100644
--- a/src/test/ui/compile-fail-migration/lint-type-limits2.stderr
+++ b/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
index b09dc0acdbf..b09dc0acdbf 100644
--- a/src/test/ui/compile-fail-migration/lint-type-limits3.rs
+++ b/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
index b6e14ac64e5..b6e14ac64e5 100644
--- a/src/test/ui/compile-fail-migration/lint-type-limits3.stderr
+++ b/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
index ce336905c01..ce336905c01 100644
--- a/src/test/ui/compile-fail-migration/lint-type-overflow.rs
+++ b/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
index 67f4537e1e6..67f4537e1e6 100644
--- a/src/test/ui/compile-fail-migration/lint-type-overflow.stderr
+++ b/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
index f7cf8a68d56..f7cf8a68d56 100644
--- a/src/test/ui/compile-fail-migration/lint-type-overflow2.rs
+++ b/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
index ecfd2584bba..ecfd2584bba 100644
--- a/src/test/ui/compile-fail-migration/lint-type-overflow2.stderr
+++ b/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
index bfc144615a2..bfc144615a2 100644
--- a/src/test/ui/lint-unconditional-recursion.rs
+++ b/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
index 933c191551d..933c191551d 100644
--- a/src/test/ui/lint-unconditional-recursion.stderr
+++ b/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
index cd64dfa7a47..cd64dfa7a47 100644
--- a/src/test/ui/compile-fail-migration/lint-unexported-no-mangle.rs
+++ b/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
index e7d49f339e6..e7d49f339e6 100644
--- a/src/test/ui/compile-fail-migration/lint-unexported-no-mangle.stderr
+++ b/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
index af4e81be195..af4e81be195 100644
--- a/src/test/ui/compile-fail-migration/lint-unknown-attr.rs
+++ b/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
index 5f915232c14..5f915232c14 100644
--- a/src/test/ui/compile-fail-migration/lint-unknown-attr.stderr
+++ b/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
index 5a0568f05e6..5a0568f05e6 100644
--- a/src/test/ui/compile-fail-migration/lint-unknown-feature-default.rs
+++ b/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
index bd4079ffd2e..bd4079ffd2e 100644
--- a/src/test/ui/compile-fail-migration/lint-unknown-feature-default.stderr
+++ b/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
index 81f99f99492..81f99f99492 100644
--- a/src/test/ui/compile-fail-migration/lint-unknown-feature.rs
+++ b/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
index e2744c03872..e2744c03872 100644
--- a/src/test/ui/compile-fail-migration/lint-unknown-feature.stderr
+++ b/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
index 0c41959f8a7..0c41959f8a7 100644
--- a/src/test/ui/compile-fail-migration/lint-unknown-lint-cmdline.rs
+++ b/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
index 86360041026..86360041026 100644
--- a/src/test/ui/compile-fail-migration/lint-unknown-lint-cmdline.stderr
+++ b/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
index 2de8d849d19..2de8d849d19 100644
--- a/src/test/ui/compile-fail-migration/lint-unknown-lint.rs
+++ b/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
index b398a2f3690..b398a2f3690 100644
--- a/src/test/ui/compile-fail-migration/lint-unknown-lint.stderr
+++ b/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
index 214a03c13f4..214a03c13f4 100644
--- a/src/test/ui/compile-fail-migration/lint-unnecessary-import-braces.rs
+++ b/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
index a4fd474e5cc..a4fd474e5cc 100644
--- a/src/test/ui/compile-fail-migration/lint-unnecessary-import-braces.stderr
+++ b/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
index 7cd0a6bbf0f..7cd0a6bbf0f 100644
--- a/src/test/ui/compile-fail-migration/lint-unnecessary-parens.rs
+++ b/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
index 8861524b185..8861524b185 100644
--- a/src/test/ui/compile-fail-migration/lint-unnecessary-parens.stderr
+++ b/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
index 10f245aaaf9..10f245aaaf9 100644
--- a/src/test/ui/compile-fail-migration/lint-unsafe-code.rs
+++ b/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
index ee2aba066ec..ee2aba066ec 100644
--- a/src/test/ui/compile-fail-migration/lint-unsafe-code.stderr
+++ b/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
index 8f0b53fd599..8f0b53fd599 100644
--- a/src/test/ui/compile-fail-migration/lint-unused-extern-crate.rs
+++ b/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
index 3a488b1e073..3a488b1e073 100644
--- a/src/test/ui/compile-fail-migration/lint-unused-extern-crate.stderr
+++ b/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
index 5bb2ab75c53..5bb2ab75c53 100644
--- a/src/test/ui/compile-fail-migration/lint-unused-imports.rs
+++ b/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
index a0292b6907e..a0292b6907e 100644
--- a/src/test/ui/compile-fail-migration/lint-unused-imports.stderr
+++ b/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
index 370f664e430..370f664e430 100644
--- a/src/test/ui/compile-fail-migration/lint-unused-mut-self.rs
+++ b/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
index af2baaa2e0a..af2baaa2e0a 100644
--- a/src/test/ui/compile-fail-migration/lint-unused-mut-self.stderr
+++ b/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
index 40f68c67827..40f68c67827 100644
--- a/src/test/ui/compile-fail-migration/lint-unused-mut-variables.lexical.stderr
+++ b/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
index 40f68c67827..40f68c67827 100644
--- a/src/test/ui/compile-fail-migration/lint-unused-mut-variables.nll.stderr
+++ b/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
index 14d836074dc..14d836074dc 100644
--- a/src/test/ui/compile-fail-migration/lint-unused-mut-variables.rs
+++ b/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
index 1d947684792..1d947684792 100644
--- a/src/test/ui/compile-fail-migration/lint-uppercase-variables.rs
+++ b/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
index c8381d89adc..c8381d89adc 100644
--- a/src/test/ui/compile-fail-migration/lint-uppercase-variables.stderr
+++ b/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
index 58a76bd2cf3..58a76bd2cf3 100644
--- 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
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
index 54419fd5b25..54419fd5b25 100644
--- 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
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
index 58a76bd2cf3..58a76bd2cf3 100644
--- 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
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
index 7bc3680ca77..7bc3680ca77 100644
--- 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
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
index 091547ed122..091547ed122 100644
--- 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
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
index a98c3c29bd2..a98c3c29bd2 100644
--- 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
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
index 091547ed122..091547ed122 100644
--- 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
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
index 7812cdd8684..7812cdd8684 100644
--- 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
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
index e954b1f5e0f..e954b1f5e0f 100644
--- 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
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
index 6abcf175f48..6abcf175f48 100644
--- 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
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
index e954b1f5e0f..e954b1f5e0f 100644
--- 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
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
index bb61a9037d9..bb61a9037d9 100644
--- 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
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
index 70a6ab3edf8..70a6ab3edf8 100644
--- 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
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
index 47c780e83e8..47c780e83e8 100644
--- 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
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
index 70a6ab3edf8..70a6ab3edf8 100644
--- 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
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
index 672e9fab837..672e9fab837 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/liveness-closure-require-ret.rs b/src/test/ui/liveness/liveness-closure-require-ret.rs
index 17cd8231222..17cd8231222 100644
--- a/src/test/ui/compile-fail-migration/liveness-closure-require-ret.rs
+++ b/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
index 569640c9e20..569640c9e20 100644
--- a/src/test/ui/compile-fail-migration/liveness-closure-require-ret.stderr
+++ b/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
index ddd8fc68c43..ddd8fc68c43 100644
--- a/src/test/ui/compile-fail-migration/liveness-dead.rs
+++ b/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
index 6709fee0abb..6709fee0abb 100644
--- a/src/test/ui/compile-fail-migration/liveness-dead.stderr
+++ b/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
index 1ee4be08a1c..1ee4be08a1c 100644
--- a/src/test/ui/compile-fail-migration/liveness-forgot-ret.rs
+++ b/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
index 8da489bc9ab..8da489bc9ab 100644
--- a/src/test/ui/compile-fail-migration/liveness-forgot-ret.stderr
+++ b/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
index 69bceec8c32..69bceec8c32 100644
--- a/src/test/ui/compile-fail-migration/liveness-issue-2163.rs
+++ b/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
index 66cd67821be..66cd67821be 100644
--- a/src/test/ui/compile-fail-migration/liveness-issue-2163.stderr
+++ b/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
index a35eb1af4f3..a35eb1af4f3 100644
--- a/src/test/ui/compile-fail-migration/liveness-missing-ret2.rs
+++ b/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
index b7bbea6225d..b7bbea6225d 100644
--- a/src/test/ui/compile-fail-migration/liveness-missing-ret2.stderr
+++ b/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
index 9340964c1fb..9340964c1fb 100644
--- a/src/test/ui/compile-fail-migration/liveness-move-call-arg.rs
+++ b/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
index f3423b8f5fa..f3423b8f5fa 100644
--- a/src/test/ui/compile-fail-migration/liveness-move-call-arg.stderr
+++ b/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
index 65ccaceac08..65ccaceac08 100644
--- a/src/test/ui/compile-fail-migration/liveness-move-in-loop.rs
+++ b/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
index decc7659a64..decc7659a64 100644
--- a/src/test/ui/compile-fail-migration/liveness-move-in-loop.stderr
+++ b/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
index 5ca5dc64709..5ca5dc64709 100644
--- a/src/test/ui/compile-fail-migration/liveness-move-in-while.nll.stderr
+++ b/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
index cadfd487121..cadfd487121 100644
--- a/src/test/ui/compile-fail-migration/liveness-move-in-while.rs
+++ b/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
index 7ac3ea38cb5..7ac3ea38cb5 100644
--- a/src/test/ui/compile-fail-migration/liveness-move-in-while.stderr
+++ b/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
index 663c0275b82..663c0275b82 100644
--- a/src/test/ui/liveness-return-last-stmt-semi.rs
+++ b/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
index 1fa001879a0..1fa001879a0 100644
--- a/src/test/ui/liveness-return-last-stmt-semi.stderr
+++ b/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
index d056d6be806..d056d6be806 100644
--- a/src/test/ui/compile-fail-migration/liveness-unused.rs
+++ b/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
index 2846f242fbe..2846f242fbe 100644
--- a/src/test/ui/compile-fail-migration/liveness-unused.stderr
+++ b/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
index 62d9a8b115a..62d9a8b115a 100644
--- a/src/test/ui/compile-fail-migration/liveness-use-after-move.nll.stderr
+++ b/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
index 6fcab380030..6fcab380030 100644
--- a/src/test/ui/compile-fail-migration/liveness-use-after-move.rs
+++ b/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
index be6f89c7357..be6f89c7357 100644
--- a/src/test/ui/compile-fail-migration/liveness-use-after-move.stderr
+++ b/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
index dbffe6c9135..dbffe6c9135 100644
--- a/src/test/ui/compile-fail-migration/liveness-use-after-send.nll.stderr
+++ b/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
index 03d8d62e0b4..03d8d62e0b4 100644
--- a/src/test/ui/compile-fail-migration/liveness-use-after-send.rs
+++ b/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
index 94499aabb97..94499aabb97 100644
--- a/src/test/ui/compile-fail-migration/liveness-use-after-send.stderr
+++ b/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
index f24840eca54..f24840eca54 100644
--- a/src/test/ui/loop-break-value-no-repeat.rs
+++ b/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
index 68a2bab1674..68a2bab1674 100644
--- a/src/test/ui/loop-break-value-no-repeat.stderr
+++ b/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
index 938f7fba2a0..938f7fba2a0 100644
--- a/src/test/ui/compile-fail-migration/loop-break-value.rs
+++ b/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
index ca286285c38..ca286285c38 100644
--- a/src/test/ui/compile-fail-migration/loop-break-value.stderr
+++ b/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
index f0792c145d2..f0792c145d2 100644
--- a/src/test/ui/compile-fail-migration/loop-labeled-break-value.rs
+++ b/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
index 7d140aa8aac..7d140aa8aac 100644
--- a/src/test/ui/compile-fail-migration/loop-labeled-break-value.stderr
+++ b/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
index cbf7094d837..cbf7094d837 100644
--- a/src/test/ui/compile-fail-migration/loop-proper-liveness.nll.stderr
+++ b/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
index e411313c273..e411313c273 100644
--- a/src/test/ui/compile-fail-migration/loop-proper-liveness.rs
+++ b/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
index 554abea91e3..554abea91e3 100644
--- a/src/test/ui/compile-fail-migration/loop-proper-liveness.stderr
+++ b/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
index c22091ce63c..c22091ce63c 100644
--- a/src/test/ui/compile-fail-migration/loop-properly-diverging-2.rs
+++ b/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
index f9836538382..f9836538382 100644
--- a/src/test/ui/compile-fail-migration/loop-properly-diverging-2.stderr
+++ b/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
index b273e7a0c7c..b273e7a0c7c 100644
--- a/src/test/ui/loops-reject-duplicate-labels-2.rs
+++ b/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
index 41b4a850f1b..41b4a850f1b 100644
--- a/src/test/ui/loops-reject-duplicate-labels-2.stderr
+++ b/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
index ad24f69871c..ad24f69871c 100644
--- a/src/test/ui/loops-reject-duplicate-labels.rs
+++ b/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
index d0cb81544f8..d0cb81544f8 100644
--- a/src/test/ui/loops-reject-duplicate-labels.stderr
+++ b/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
index 74da125d575..74da125d575 100644
--- a/src/test/ui/loops-reject-labels-shadowing-lifetimes.rs
+++ b/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
index af524d5b017..af524d5b017 100644
--- a/src/test/ui/loops-reject-labels-shadowing-lifetimes.stderr
+++ b/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
index 077e57c9579..077e57c9579 100644
--- a/src/test/ui/loops-reject-lifetime-shadowing-label.rs
+++ b/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
index 999cfb9cc3c..999cfb9cc3c 100644
--- a/src/test/ui/loops-reject-lifetime-shadowing-label.stderr
+++ b/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
index 9c1dbfc2af9..9c1dbfc2af9 100644
--- a/src/test/ui/compile-fail-migration/lto-duplicate-symbols.rs
+++ b/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
index 2f0e57199bb..2f0e57199bb 100644
--- a/src/test/ui/compile-fail-migration/lto-duplicate-symbols.stderr
+++ b/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
index a34e280bfa6..a34e280bfa6 100644
--- a/src/test/ui/compile-fail-migration/lub-if.nll.stderr
+++ b/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
index 8d2a0fd07e8..8d2a0fd07e8 100644
--- a/src/test/ui/compile-fail-migration/lub-if.rs
+++ b/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
index 4a436810170..4a436810170 100644
--- a/src/test/ui/compile-fail-migration/lub-if.stderr
+++ b/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
index 22bd6ea4081..22bd6ea4081 100644
--- a/src/test/ui/compile-fail-migration/lub-match.nll.stderr
+++ b/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
index b9423feb5c1..b9423feb5c1 100644
--- a/src/test/ui/compile-fail-migration/lub-match.rs
+++ b/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
index 3543676ad2f..3543676ad2f 100644
--- a/src/test/ui/compile-fail-migration/lub-match.stderr
+++ b/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
index c787cedc2d0..c787cedc2d0 100644
--- a/src/test/ui/auxiliary/macro-in-other-crate.rs
+++ b/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
index 4f75e2b5d75..4f75e2b5d75 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/macro_crate_nonterminal.rs
+++ b/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
index 060960f0dbc..060960f0dbc 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/two_macros.rs
+++ b/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
index 836164a721a..836164a721a 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/unstable-macros.rs
+++ b/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
index a77b1724876..a77b1724876 100644
--- a/src/test/ui/compile-fail-migration/macro-attribute.rs
+++ b/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
index 5ff31f05079..5ff31f05079 100644
--- a/src/test/ui/compile-fail-migration/macro-comma-behavior.core.stderr
+++ b/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
index 620e57b463d..620e57b463d 100644
--- a/src/test/ui/compile-fail-migration/macro-comma-behavior.rs
+++ b/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
index a87271ed026..a87271ed026 100644
--- a/src/test/ui/compile-fail-migration/macro-comma-behavior.std.stderr
+++ b/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
index e5fe9b4dd7f..e5fe9b4dd7f 100644
--- a/src/test/ui/compile-fail-migration/macro-comma-support.rs
+++ b/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
index 2ebba22d7a1..2ebba22d7a1 100644
--- a/src/test/ui/compile-fail-migration/macro-comma-support.stderr
+++ b/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
index 56b3d5d0def..56b3d5d0def 100644
--- a/src/test/ui/macro-context.rs
+++ b/src/test/ui/macros/macro-context.rs
diff --git a/src/test/ui/macro-context.stderr b/src/test/ui/macros/macro-context.stderr
index b3e67fb2607..b3e67fb2607 100644
--- a/src/test/ui/macro-context.stderr
+++ b/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
index 76211b88bd7..76211b88bd7 100644
--- a/src/test/ui/compile-fail-migration/macro-crate-nonterminal-non-root.rs
+++ b/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
index 029128ae92a..029128ae92a 100644
--- a/src/test/ui/compile-fail-migration/macro-crate-nonterminal-non-root.stderr
+++ b/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
index 82a5aa48729..82a5aa48729 100644
--- a/src/test/ui/compile-fail-migration/macro-error.rs
+++ b/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
index 42808eb2a6b..42808eb2a6b 100644
--- a/src/test/ui/compile-fail-migration/macro-error.stderr
+++ b/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
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/ui/compile-fail-migration/macro-expanded-include/file.txt
+++ b/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
index 888bdf5179a..888bdf5179a 100644
--- a/src/test/ui/compile-fail-migration/macro-expanded-include/foo/mod.rs
+++ b/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
index 4afb61ab76c..4afb61ab76c 100644
--- a/src/test/ui/compile-fail-migration/macro-expanded-include/test.rs
+++ b/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
index 3ef0275cfbe..3ef0275cfbe 100644
--- a/src/test/ui/compile-fail-migration/macro-expanded-include/test.stderr
+++ b/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
index 06f2d86e5d9..06f2d86e5d9 100644
--- a/src/test/ui/compile-fail-migration/macro-expansion-tests.rs
+++ b/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
index a3d4f3cd348..a3d4f3cd348 100644
--- a/src/test/ui/compile-fail-migration/macro-expansion-tests.stderr
+++ b/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
index 6e80e9b574b..6e80e9b574b 100644
--- a/src/test/ui/compile-fail-migration/macro-follow.rs
+++ b/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
index ccd658af89f..ccd658af89f 100644
--- a/src/test/ui/compile-fail-migration/macro-follow.stderr
+++ b/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
index 21cc946ded6..21cc946ded6 100644
--- a/src/test/ui/compile-fail-migration/macro-followed-by-seq-bad.rs
+++ b/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
index bb070334d36..bb070334d36 100644
--- a/src/test/ui/compile-fail-migration/macro-followed-by-seq-bad.stderr
+++ b/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
index 1111b21d455..1111b21d455 100644
--- a/src/test/ui/compile-fail-migration/macro-inner-attributes.rs
+++ b/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
index 11922bc448b..11922bc448b 100644
--- a/src/test/ui/compile-fail-migration/macro-inner-attributes.stderr
+++ b/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
index e5fdba63b0f..e5fdba63b0f 100644
--- a/src/test/ui/compile-fail-migration/macro-input-future-proofing.rs
+++ b/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
index aed7a8a119c..aed7a8a119c 100644
--- a/src/test/ui/compile-fail-migration/macro-input-future-proofing.stderr
+++ b/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
index 630e481f75e..630e481f75e 100644
--- a/src/test/ui/macro-invalid-fragment-spec.rs
+++ b/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
index 765621f51d4..765621f51d4 100644
--- a/src/test/ui/macro-invalid-fragment-spec.stderr
+++ b/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
index 3ae629cd895..3ae629cd895 100644
--- a/src/test/ui/compile-fail-migration/macro-local-data-key-priv.rs
+++ b/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
index 57f4f790cb1..57f4f790cb1 100644
--- a/src/test/ui/compile-fail-migration/macro-local-data-key-priv.stderr
+++ b/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
index 6cca729e2c2..6cca729e2c2 100644
--- a/src/test/ui/compile-fail-migration/macro-match-nonterminal.rs
+++ b/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
index 26648c443cb..26648c443cb 100644
--- a/src/test/ui/compile-fail-migration/macro-match-nonterminal.stderr
+++ b/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
index eed2a207e89..eed2a207e89 100644
--- a/src/test/ui/compile-fail-migration/macro-missing-delimiters.rs
+++ b/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
index eb43e39ea56..eb43e39ea56 100644
--- a/src/test/ui/compile-fail-migration/macro-missing-delimiters.stderr
+++ b/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
index 66f4ce55be8..66f4ce55be8 100644
--- a/src/test/ui/compile-fail-migration/macro-missing-fragment.rs
+++ b/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
index 48e07ed9dbd..48e07ed9dbd 100644
--- a/src/test/ui/compile-fail-migration/macro-missing-fragment.stderr
+++ b/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
index 647d7aaa759..647d7aaa759 100644
--- a/src/test/ui/compile-fail-migration/macro-non-lifetime.rs
+++ b/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
index 93b7f481842..93b7f481842 100644
--- a/src/test/ui/compile-fail-migration/macro-non-lifetime.stderr
+++ b/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
index acb58596fe4..acb58596fe4 100644
--- a/src/test/ui/compile-fail-migration/macro-outer-attributes.rs
+++ b/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
index 4cc8cd5dc90..4cc8cd5dc90 100644
--- a/src/test/ui/compile-fail-migration/macro-outer-attributes.stderr
+++ b/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
index 3b168fec953..3b168fec953 100644
--- a/src/test/ui/compile-fail-migration/macro-parameter-span.rs
+++ b/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
index 749221e9bf0..749221e9bf0 100644
--- a/src/test/ui/compile-fail-migration/macro-parameter-span.stderr
+++ b/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
index b953805a7eb..b953805a7eb 100644
--- a/src/test/ui/macro-path-prelude-fail-1.rs
+++ b/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
index fc74937d912..fc74937d912 100644
--- a/src/test/ui/macro-path-prelude-fail-1.stderr
+++ b/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
index ec77e276bd4..ec77e276bd4 100644
--- a/src/test/ui/macro-path-prelude-fail-2.rs
+++ b/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
index d23aed847a3..d23aed847a3 100644
--- a/src/test/ui/macro-path-prelude-fail-2.stderr
+++ b/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
index d325b046001..d325b046001 100644
--- a/src/test/ui/macro-path-prelude-fail-3.rs
+++ b/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
index c9af4b66427..c9af4b66427 100644
--- a/src/test/ui/macro-path-prelude-fail-3.stderr
+++ b/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
index bc58754513b..bc58754513b 100644
--- a/src/test/ui/macro-path-prelude-pass.rs
+++ b/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
index 6831cd81d7d..6831cd81d7d 100644
--- a/src/test/ui/macro-path-prelude-shadowing.rs
+++ b/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
index c0892f97376..c0892f97376 100644
--- a/src/test/ui/macro-path-prelude-shadowing.stderr
+++ b/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
index bab583da37b..bab583da37b 100644
--- a/src/test/ui/macro-reexport-removed.rs
+++ b/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
index ba0ab232e86..ba0ab232e86 100644
--- a/src/test/ui/macro-reexport-removed.stderr
+++ b/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
index 61abaf8a2dd..61abaf8a2dd 100644
--- a/src/test/ui/macro-shadowing.rs
+++ b/src/test/ui/macros/macro-shadowing.rs
diff --git a/src/test/ui/macro-shadowing.stderr b/src/test/ui/macros/macro-shadowing.stderr
index 28f09509a62..28f09509a62 100644
--- a/src/test/ui/macro-shadowing.stderr
+++ b/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
index a4b922c0fe1..a4b922c0fe1 100644
--- a/src/test/ui/compile-fail-migration/macro-stability.rs
+++ b/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
index 947133f287d..947133f287d 100644
--- a/src/test/ui/compile-fail-migration/macro-stability.stderr
+++ b/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
index 8f46d3301eb..8f46d3301eb 100644
--- a/src/test/ui/compile-fail-migration/macro-stmt-matchers.rs
+++ b/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
index ef6210bb6f7..ef6210bb6f7 100644
--- a/src/test/ui/compile-fail-migration/macro-stmt-matchers.stderr
+++ b/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
index 7255e7d00b6..7255e7d00b6 100644
--- a/src/test/ui/compile-fail-migration/macro-tt-matchers.rs
+++ b/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
index b7551c1bd93..b7551c1bd93 100644
--- a/src/test/ui/compile-fail-migration/macro-tt-matchers.stderr
+++ b/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
index a07cc834411..a07cc834411 100644
--- a/src/test/ui/compile-fail-migration/macro-use-bad-args-1.rs
+++ b/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
index 19a8c7c0382..19a8c7c0382 100644
--- a/src/test/ui/compile-fail-migration/macro-use-bad-args-1.stderr
+++ b/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
index 89004f16897..89004f16897 100644
--- a/src/test/ui/compile-fail-migration/macro-use-bad-args-2.rs
+++ b/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
index 0ac18201d79..0ac18201d79 100644
--- a/src/test/ui/compile-fail-migration/macro-use-bad-args-2.stderr
+++ b/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
index 9d389413ba9..9d389413ba9 100644
--- a/src/test/ui/compile-fail-migration/macro-use-scope.rs
+++ b/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
index 2e81750d43b..2e81750d43b 100644
--- a/src/test/ui/compile-fail-migration/macro-use-scope.stderr
+++ b/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
index dd725aae95e..dd725aae95e 100644
--- a/src/test/ui/compile-fail-migration/macro-use-undef.rs
+++ b/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
index 6fc57a34794..6fc57a34794 100644
--- a/src/test/ui/compile-fail-migration/macro-use-undef.stderr
+++ b/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
index 143ecb4ce5e..143ecb4ce5e 100644
--- a/src/test/ui/compile-fail-migration/macro-use-wrong-name.rs
+++ b/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
index 26271a21623..26271a21623 100644
--- a/src/test/ui/compile-fail-migration/macro-use-wrong-name.stderr
+++ b/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
index 1281adce5c5..1281adce5c5 100644
--- a/src/test/ui/compile-fail-migration/macro-with-seps-err-msg.rs
+++ b/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
index 40053853b15..40053853b15 100644
--- a/src/test/ui/compile-fail-migration/macros-in-extern.rs
+++ b/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
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
index 7046ee12b50..7046ee12b50 100644
--- a/src/test/ui/compile-fail-migration/macros-nonfatal-errors.rs
+++ b/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
index c44dcfd12af..c44dcfd12af 100644
--- a/src/test/ui/compile-fail-migration/macros-nonfatal-errors.stderr
+++ b/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
index 402cd3a2d31..402cd3a2d31 100644
--- a/src/test/ui/compile-fail-migration/main-wrong-type.rs
+++ b/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
index 15094bd1fbb..15094bd1fbb 100644
--- a/src/test/ui/compile-fail-migration/main-wrong-type.stderr
+++ b/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
index ac000628f2b..ac000628f2b 100644
--- a/src/test/ui/compile-fail-migration/malformed-derive-entry.rs
+++ b/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
index b1984f52430..b1984f52430 100644
--- a/src/test/ui/compile-fail-migration/malformed-derive-entry.stderr
+++ b/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
index 214a5e5e3eb..214a5e5e3eb 100644
--- a/src/test/ui/compile-fail-migration/malformed-plugin-1.rs
+++ b/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
index 5ceabc3b8ba..5ceabc3b8ba 100644
--- a/src/test/ui/compile-fail-migration/malformed-plugin-1.stderr
+++ b/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
index 1b112608bee..1b112608bee 100644
--- a/src/test/ui/compile-fail-migration/malformed-plugin-2.rs
+++ b/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
index 56c87f9f8dd..56c87f9f8dd 100644
--- a/src/test/ui/compile-fail-migration/malformed-plugin-2.stderr
+++ b/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
index 0c948831de2..0c948831de2 100644
--- a/src/test/ui/compile-fail-migration/malformed-plugin-3.rs
+++ b/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
index fff52c649e8..fff52c649e8 100644
--- a/src/test/ui/compile-fail-migration/malformed-plugin-3.stderr
+++ b/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
index 0b437be5393..0b437be5393 100644
--- a/src/test/ui/compile-fail-migration/malformed_macro_lhs.rs
+++ b/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
index 6b4241890b1..6b4241890b1 100644
--- a/src/test/ui/compile-fail-migration/malformed_macro_lhs.stderr
+++ b/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
index fc4fa838a56..fc4fa838a56 100644
--- a/src/test/ui/compile-fail-migration/manual-link-bad-form.rs
+++ b/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
index ed3c4c4fc4d..ed3c4c4fc4d 100644
--- a/src/test/ui/compile-fail-migration/manual-link-bad-form.stderr
+++ b/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
index e9cbdb09948..e9cbdb09948 100644
--- a/src/test/ui/compile-fail-migration/manual-link-bad-kind.rs
+++ b/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
index 03c33a97512..03c33a97512 100644
--- a/src/test/ui/compile-fail-migration/manual-link-bad-kind.stderr
+++ b/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
index 2bf61cbe24c..2bf61cbe24c 100644
--- a/src/test/ui/compile-fail-migration/manual-link-bad-search-path.rs
+++ b/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
index 2c0649ea152..2c0649ea152 100644
--- a/src/test/ui/compile-fail-migration/manual-link-bad-search-path.stderr
+++ b/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
index 1ecf63813e9..1ecf63813e9 100644
--- a/src/test/ui/compile-fail-migration/manual-link-framework.rs
+++ b/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
index 3e8da8b2f93..3e8da8b2f93 100644
--- a/src/test/ui/compile-fail-migration/manual-link-framework.stderr
+++ b/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
index e8ff9e817af..e8ff9e817af 100644
--- a/src/test/ui/compile-fail-migration/map-types.rs
+++ b/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
index 722113c7525..722113c7525 100644
--- a/src/test/ui/compile-fail-migration/map-types.stderr
+++ b/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
index 70e148627c4..70e148627c4 100644
--- a/src/test/ui/compile-fail-migration/match-argm-statics-2.rs
+++ b/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
index 485b2a3202f..485b2a3202f 100644
--- a/src/test/ui/compile-fail-migration/match-argm-statics-2.stderr
+++ b/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
index 40d73ab51c7..40d73ab51c7 100644
--- a/src/test/ui/compile-fail-migration/match-arm-statics.rs
+++ b/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
index 8862be2254f..8862be2254f 100644
--- a/src/test/ui/compile-fail-migration/match-arm-statics.stderr
+++ b/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
index abb770df107..abb770df107 100644
--- a/src/test/ui/compile-fail-migration/match-byte-array-patterns-2.rs
+++ b/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
index bc52376d824..bc52376d824 100644
--- a/src/test/ui/compile-fail-migration/match-byte-array-patterns-2.stderr
+++ b/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
index 9db4319b786..9db4319b786 100644
--- a/src/test/ui/compile-fail-migration/match-byte-array-patterns.rs
+++ b/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
index da3d57743aa..da3d57743aa 100644
--- a/src/test/ui/compile-fail-migration/match-byte-array-patterns.stderr
+++ b/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
index aa47ea670fd..aa47ea670fd 100644
--- a/src/test/ui/compile-fail-migration/match-ill-type2.rs
+++ b/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
index b649a38476e..b649a38476e 100644
--- a/src/test/ui/compile-fail-migration/match-ill-type2.stderr
+++ b/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
index 888094fd016..888094fd016 100644
--- a/src/test/ui/compile-fail-migration/match-join.rs
+++ b/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
index a4a8a9d7174..a4a8a9d7174 100644
--- a/src/test/ui/compile-fail-migration/match-join.stderr
+++ b/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
index db08f5e5e66..db08f5e5e66 100644
--- a/src/test/ui/compile-fail-migration/match-no-arms-unreachable-after.rs
+++ b/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
index 35fae051870..35fae051870 100644
--- a/src/test/ui/compile-fail-migration/match-no-arms-unreachable-after.stderr
+++ b/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
index a24d2ed4b7f..a24d2ed4b7f 100644
--- a/src/test/ui/compile-fail-migration/match-non-exhaustive.rs
+++ b/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
index 04f09caceed..04f09caceed 100644
--- a/src/test/ui/compile-fail-migration/match-non-exhaustive.stderr
+++ b/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
index aed9130d60e..aed9130d60e 100644
--- a/src/test/ui/compile-fail-migration/match-pattern-field-mismatch-2.rs
+++ b/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
index b43fa9149bd..b43fa9149bd 100644
--- a/src/test/ui/compile-fail-migration/match-pattern-field-mismatch-2.stderr
+++ b/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
index ddd5d633170..ddd5d633170 100644
--- a/src/test/ui/compile-fail-migration/match-pattern-field-mismatch.rs
+++ b/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
index d975f9afc7c..d975f9afc7c 100644
--- a/src/test/ui/compile-fail-migration/match-pattern-field-mismatch.stderr
+++ b/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
index 8777ef2ffe3..8777ef2ffe3 100644
--- a/src/test/ui/compile-fail-migration/match-privately-empty.rs
+++ b/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
index 04b4ce00e9b..04b4ce00e9b 100644
--- a/src/test/ui/compile-fail-migration/match-privately-empty.stderr
+++ b/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
index b42e2ff919a..b42e2ff919a 100644
--- a/src/test/ui/compile-fail-migration/match-range-fail-2.rs
+++ b/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
index 616f74ed858..616f74ed858 100644
--- a/src/test/ui/compile-fail-migration/match-range-fail-2.stderr
+++ b/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
index 256aa180f4a..256aa180f4a 100644
--- a/src/test/ui/compile-fail-migration/match-range-fail-dominate.rs
+++ b/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
index d75630e09c5..d75630e09c5 100644
--- a/src/test/ui/compile-fail-migration/match-range-fail-dominate.stderr
+++ b/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
index ca99b0c7b89..ca99b0c7b89 100644
--- a/src/test/ui/compile-fail-migration/match-range-fail.rs
+++ b/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
index dbc251020a9..dbc251020a9 100644
--- a/src/test/ui/compile-fail-migration/match-range-fail.stderr
+++ b/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
index cb8f8fad532..cb8f8fad532 100644
--- a/src/test/ui/compile-fail-migration/match-ref-ice.rs
+++ b/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
index 1dc87afddea..1dc87afddea 100644
--- a/src/test/ui/compile-fail-migration/match-ref-ice.stderr
+++ b/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
index cabf933bb81..cabf933bb81 100644
--- a/src/test/ui/compile-fail-migration/match-ref-mut-invariance.nll.stderr
+++ b/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
index c2b54a972bd..c2b54a972bd 100644
--- a/src/test/ui/compile-fail-migration/match-ref-mut-invariance.rs
+++ b/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
index 24677fe8597..24677fe8597 100644
--- a/src/test/ui/compile-fail-migration/match-ref-mut-invariance.stderr
+++ b/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
index f01a9f3a3b0..f01a9f3a3b0 100644
--- 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
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
index ea16c61dfd4..ea16c61dfd4 100644
--- a/src/test/ui/compile-fail-migration/match-ref-mut-let-invariance.rs
+++ b/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
index cc096d68ebd..cc096d68ebd 100644
--- a/src/test/ui/compile-fail-migration/match-ref-mut-let-invariance.stderr
+++ b/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
index a8ec95da3d8..a8ec95da3d8 100644
--- a/src/test/ui/compile-fail-migration/match-slice-patterns.rs
+++ b/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
index cefd7df8b78..cefd7df8b78 100644
--- a/src/test/ui/compile-fail-migration/match-slice-patterns.stderr
+++ b/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
index afc858c0c29..afc858c0c29 100644
--- a/src/test/ui/compile-fail-migration/match-static-const-lc.rs
+++ b/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
index 08eb5712875..08eb5712875 100644
--- a/src/test/ui/compile-fail-migration/match-static-const-lc.stderr
+++ b/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
index 0dbdda1f9ba..0dbdda1f9ba 100644
--- a/src/test/ui/compile-fail-migration/match-struct.rs
+++ b/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
index 43f17b2d747..43f17b2d747 100644
--- a/src/test/ui/compile-fail-migration/match-struct.stderr
+++ b/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
index 0fb26200359..0fb26200359 100644
--- a/src/test/ui/compile-fail-migration/match-tag-nullary.rs
+++ b/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
index 869d8ac7747..869d8ac7747 100644
--- a/src/test/ui/compile-fail-migration/match-tag-nullary.stderr
+++ b/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
index 48733fd423d..48733fd423d 100644
--- a/src/test/ui/compile-fail-migration/match-tag-unary.rs
+++ b/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
index bb4deee2569..bb4deee2569 100644
--- a/src/test/ui/compile-fail-migration/match-tag-unary.stderr
+++ b/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
index aae0f3135d8..aae0f3135d8 100644
--- 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
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
index 10a86f92fe1..10a86f92fe1 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/match-unresolved-one-arm.rs b/src/test/ui/match/match-unresolved-one-arm.rs
index ea0f8db99e8..ea0f8db99e8 100644
--- a/src/test/ui/compile-fail-migration/match-unresolved-one-arm.rs
+++ b/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
index fa689a8092b..fa689a8092b 100644
--- a/src/test/ui/compile-fail-migration/match-unresolved-one-arm.stderr
+++ b/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
index 05971d70167..05971d70167 100644
--- a/src/test/ui/compile-fail-migration/match-vec-fixed.rs
+++ b/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
index 1b85034ef6b..1b85034ef6b 100644
--- a/src/test/ui/compile-fail-migration/match-vec-fixed.stderr
+++ b/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
index 52c5375f4e7..52c5375f4e7 100644
--- a/src/test/ui/compile-fail-migration/match-vec-mismatch-2.rs
+++ b/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
index 66f58bdff32..66f58bdff32 100644
--- a/src/test/ui/compile-fail-migration/match-vec-mismatch-2.stderr
+++ b/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
index d737aa0029b..d737aa0029b 100644
--- a/src/test/ui/compile-fail-migration/match-vec-mismatch.rs
+++ b/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
index c30ddf9d0fa..c30ddf9d0fa 100644
--- a/src/test/ui/compile-fail-migration/match-vec-mismatch.stderr
+++ b/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
index d6e3fdbe088..d6e3fdbe088 100644
--- a/src/test/ui/compile-fail-migration/match-vec-unreachable.rs
+++ b/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
index e8869e86bf9..e8869e86bf9 100644
--- a/src/test/ui/compile-fail-migration/match-vec-unreachable.stderr
+++ b/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
index f10526200ff..f10526200ff 100644
--- a/src/test/ui/compile-fail-migration/maybe-bounds-where-cpass.rs
+++ b/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
index d60e4cdffb4..d60e4cdffb4 100644
--- a/src/test/ui/compile-fail-migration/maybe-bounds-where-cpass.stderr
+++ b/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
index 211fac2ee23..211fac2ee23 100644
--- a/src/test/ui/compile-fail-migration/maybe-bounds-where.rs
+++ b/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
index 02aafecb7a4..02aafecb7a4 100644
--- a/src/test/ui/compile-fail-migration/maybe-bounds-where.stderr
+++ b/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
index 20b93068c64..20b93068c64 100644
--- 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
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
index bd70879d13e..bd70879d13e 100644
--- a/src/test/ui/compile-fail-migration/meta-expected-error-correct-rev.rs
+++ b/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
index c3c39183c9a..c3c39183c9a 100644
--- 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
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
index 8869e950b3a..8869e950b3a 100644
--- a/src/test/ui/compile-fail-migration/meta-expected-error-wrong-rev.rs
+++ b/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
index 4ba0ccdba9b..4ba0ccdba9b 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/ambig_impl_2_lib.rs
+++ b/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 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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
index 9acf5a52166..9acf5a52166 100644
--- 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
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
index 7f034b9e53d..7f034b9e53d 100644
--- 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
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
index c1d4551fd9e..c1d4551fd9e 100644
--- 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
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
index 7a75f20f65a..7a75f20f65a 100644
--- 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
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
index 184927c0135..184927c0135 100644
--- 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
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
index 06003d900b7..06003d900b7 100644
--- 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
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
index 17312fb1869..17312fb1869 100644
--- 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
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
index d67e17d228f..d67e17d228f 100644
--- 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
diff --git a/src/test/ui/method-call-err-msg.rs b/src/test/ui/methods/method-call-err-msg.rs
index 3434cf96fce..3434cf96fce 100644
--- a/src/test/ui/method-call-err-msg.rs
+++ b/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
index 3e5bbdfa8f8..3e5bbdfa8f8 100644
--- a/src/test/ui/method-call-err-msg.stderr
+++ b/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
index f0a87c74703..f0a87c74703 100644
--- a/src/test/ui/compile-fail-migration/method-call-lifetime-args.rs
+++ b/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
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
index b2a94e0af42..b2a94e0af42 100644
--- 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
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
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 <https://github.com/rust-lang/rust/issues/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 <https://github.com/rust-lang/rust/issues/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 <https://github.com/rust-lang/rust/issues/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 <https://github.com/rust-lang/rust/issues/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 <https://github.com/rust-lang/rust/issues/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 <https://github.com/rust-lang/rust/issues/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 <https://github.com/rust-lang/rust/issues/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 <https://github.com/rust-lang/rust/issues/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 <https://github.com/rust-lang/rust/issues/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 <https://github.com/rust-lang/rust/issues/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 <https://github.com/rust-lang/rust/issues/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 <https://github.com/rust-lang/rust/issues/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 <https://github.com/rust-lang/rust/issues/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 <https://github.com/rust-lang/rust/issues/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
index f9a4f712e57..f9a4f712e57 100644
--- a/src/test/ui/method-call-lifetime-args-lint.rs
+++ b/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
index 1cb6804fa47..1cb6804fa47 100644
--- a/src/test/ui/method-call-lifetime-args-lint.stderr
+++ b/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
index a9505e4f936..a9505e4f936 100644
--- 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
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
index 2848ff88c17..2848ff88c17 100644
--- 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
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
index 4910bfaf4f6..4910bfaf4f6 100644
--- a/src/test/ui/compile-fail-migration/method-call-lifetime-args-unresolved.rs
+++ b/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
index 8eb860d9474..8eb860d9474 100644
--- a/src/test/ui/compile-fail-migration/method-call-lifetime-args-unresolved.stderr
+++ b/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
index 7ce3ebb8bee..7ce3ebb8bee 100644
--- a/src/test/ui/method-call-lifetime-args.rs
+++ b/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
index 8bc48cc8e73..8bc48cc8e73 100644
--- a/src/test/ui/method-call-lifetime-args.stderr
+++ b/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
index 6c0793ee78f..6c0793ee78f 100644
--- a/src/test/ui/compile-fail-migration/method-call-type-binding.rs
+++ b/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
index aafc84804b5..aafc84804b5 100644
--- a/src/test/ui/compile-fail-migration/method-call-type-binding.stderr
+++ b/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
index f3c227849dc..f3c227849dc 100644
--- a/src/test/ui/compile-fail-migration/method-macro-backtrace.rs
+++ b/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
index 28f46dba1cc..28f46dba1cc 100644
--- a/src/test/ui/compile-fail-migration/method-macro-backtrace.stderr
+++ b/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
index 7a6ea94d977..7a6ea94d977 100644
--- a/src/test/ui/method-missing-call.rs
+++ b/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
index 82d04cb06dd..82d04cb06dd 100644
--- a/src/test/ui/method-missing-call.stderr
+++ b/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
index 2b6e830ec59..2b6e830ec59 100644
--- a/src/test/ui/method-on-ambiguous-numeric-type.rs
+++ b/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
index 796520e0ec7..796520e0ec7 100644
--- a/src/test/ui/method-on-ambiguous-numeric-type.stderr
+++ b/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
index 671a518073c..671a518073c 100644
--- a/src/test/ui/compile-fail-migration/method-path-in-pattern.rs
+++ b/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
index 1fae336c79c..1fae336c79c 100644
--- a/src/test/ui/compile-fail-migration/method-path-in-pattern.stderr
+++ b/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
index 4d8959466b9..4d8959466b9 100644
--- a/src/test/ui/compile-fail-migration/method-resolvable-path-in-pattern.rs
+++ b/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
index c86367dac08..c86367dac08 100644
--- a/src/test/ui/compile-fail-migration/method-resolvable-path-in-pattern.stderr
+++ b/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
index 4c8800878f0..4c8800878f0 100644
--- a/src/test/ui/compile-fail-migration/method-self-arg-1.rs
+++ b/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
index 4a5ac2b5aed..4a5ac2b5aed 100644
--- a/src/test/ui/compile-fail-migration/method-self-arg-1.stderr
+++ b/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
index 397c6eab536..397c6eab536 100644
--- a/src/test/ui/compile-fail-migration/method-self-arg-2.rs
+++ b/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
index 4fe2da4164f..4fe2da4164f 100644
--- a/src/test/ui/compile-fail-migration/method-self-arg-2.stderr
+++ b/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
index 1ba30c67a03..1ba30c67a03 100644
--- a/src/test/ui/compile-fail-migration/minus-string.rs
+++ b/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
index cbbb11ae33a..cbbb11ae33a 100644
--- a/src/test/ui/compile-fail-migration/minus-string.stderr
+++ b/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
index a3ab14b23c7..a3ab14b23c7 100644
--- a/src/test/ui/compile-fail-migration/mir-dataflow/README.md
+++ b/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
index f5f0ede6864..f5f0ede6864 100644
--- a/src/test/ui/compile-fail-migration/mir-dataflow/def-inits-1.rs
+++ b/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
index 84d3c66ac33..84d3c66ac33 100644
--- a/src/test/ui/compile-fail-migration/mir-dataflow/def-inits-1.stderr
+++ b/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
index 595f01f7c94..595f01f7c94 100644
--- a/src/test/ui/compile-fail-migration/mir-dataflow/inits-1.rs
+++ b/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
index c39c9c8efba..c39c9c8efba 100644
--- a/src/test/ui/compile-fail-migration/mir-dataflow/inits-1.stderr
+++ b/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
index bb10c03254e..bb10c03254e 100644
--- a/src/test/ui/compile-fail-migration/mir-dataflow/uninits-1.rs
+++ b/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
index c76012404ef..c76012404ef 100644
--- a/src/test/ui/compile-fail-migration/mir-dataflow/uninits-1.stderr
+++ b/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
index 9854ea779b3..9854ea779b3 100644
--- a/src/test/ui/compile-fail-migration/mir-dataflow/uninits-2.rs
+++ b/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
index 8ed735111bd..8ed735111bd 100644
--- a/src/test/ui/compile-fail-migration/mir-dataflow/uninits-2.stderr
+++ b/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
index fa936502157..fa936502157 100644
--- a/src/test/ui/compile-fail-migration/mir-unpretty.rs
+++ b/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
index 5a53b69ebbb..5a53b69ebbb 100644
--- a/src/test/ui/compile-fail-migration/mir-unpretty.stderr
+++ b/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 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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
index 3842d48f8fa..3842d48f8fa 100644
--- a/src/test/ui/missing-alloc_error_handler.rs
+++ b/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
index 5489b2cbbfa..5489b2cbbfa 100644
--- a/src/test/ui/missing-alloc_error_handler.stderr
+++ b/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
index c949dcb635a..c949dcb635a 100644
--- a/src/test/ui/missing-allocator.rs
+++ b/src/test/ui/missing/missing-allocator.rs
diff --git a/src/test/ui/missing-allocator.stderr b/src/test/ui/missing/missing-allocator.stderr
index 11e0085d1ce..11e0085d1ce 100644
--- a/src/test/ui/missing-allocator.stderr
+++ b/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
index 777ff5b9b26..777ff5b9b26 100644
--- a/src/test/ui/missing-block-hint.rs
+++ b/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
index a48eff890b3..a48eff890b3 100644
--- a/src/test/ui/missing-block-hint.stderr
+++ b/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
index 4832f35f42d..4832f35f42d 100644
--- a/src/test/ui/missing-comma-in-match.fixed
+++ b/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
index e39b20e77ea..e39b20e77ea 100644
--- a/src/test/ui/missing-comma-in-match.rs
+++ b/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
index 77935934107..77935934107 100644
--- a/src/test/ui/missing-comma-in-match.stderr
+++ b/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
index 7eee51e4076..7eee51e4076 100644
--- a/src/test/ui/compile-fail-migration/missing-derivable-attr.rs
+++ b/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
index cccba2f5f3f..cccba2f5f3f 100644
--- a/src/test/ui/compile-fail-migration/missing-derivable-attr.stderr
+++ b/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
index dfde3799499..dfde3799499 100644
--- a/src/test/ui/missing-fields-in-struct-pattern.rs
+++ b/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
index d1c3260f11e..d1c3260f11e 100644
--- a/src/test/ui/missing-fields-in-struct-pattern.stderr
+++ b/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
index 49fc586d6b5..49fc586d6b5 100644
--- a/src/test/ui/missing-items/auxiliary/m1.rs
+++ b/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
index 526fc3a8658..526fc3a8658 100644
--- a/src/test/ui/missing-items/issue-40221.rs
+++ b/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
index 81c9f40f6cf..81c9f40f6cf 100644
--- a/src/test/ui/missing-items/issue-40221.stderr
+++ b/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
index f655047f6f5..f655047f6f5 100644
--- a/src/test/ui/missing-items/m2.rs
+++ b/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
index 3f7a4039eb7..3f7a4039eb7 100644
--- a/src/test/ui/missing-items/m2.stderr
+++ b/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
index f2d5359fb16..f2d5359fb16 100644
--- a/src/test/ui/missing-items/missing-type-parameter.rs
+++ b/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
index a27e8aac28f..a27e8aac28f 100644
--- a/src/test/ui/missing-items/missing-type-parameter.stderr
+++ b/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
index bfe49ea0009..bfe49ea0009 100644
--- a/src/test/ui/compile-fail-migration/missing-macro-use.rs
+++ b/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
index 6986b4d5733..6986b4d5733 100644
--- a/src/test/ui/compile-fail-migration/missing-macro-use.stderr
+++ b/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
index 2788a5c2d58..2788a5c2d58 100644
--- a/src/test/ui/compile-fail-migration/missing-main.rs
+++ b/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
index 34b03ada3d2..34b03ada3d2 100644
--- a/src/test/ui/compile-fail-migration/missing-main.stderr
+++ b/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
index efd0c827a35..efd0c827a35 100644
--- a/src/test/ui/compile-fail-migration/missing-return.rs
+++ b/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
index d12a5832877..d12a5832877 100644
--- a/src/test/ui/compile-fail-migration/missing-return.stderr
+++ b/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
index bbc958b87a5..bbc958b87a5 100644
--- a/src/test/ui/compile-fail-migration/missing-semicolon-warning.rs
+++ b/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
index 72319a257d8..72319a257d8 100644
--- a/src/test/ui/compile-fail-migration/missing-semicolon-warning.stderr
+++ b/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
index 1922efb5e19..1922efb5e19 100644
--- a/src/test/ui/compile-fail-migration/missing-stability.rs
+++ b/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
index 6e2802e43c5..6e2802e43c5 100644
--- a/src/test/ui/compile-fail-migration/missing-stability.stderr
+++ b/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
index ddc9081e33b..ddc9081e33b 100644
--- a/src/test/ui/compile-fail-migration/missing_debug_impls.rs
+++ b/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
index 4b4c05f79f0..4b4c05f79f0 100644
--- a/src/test/ui/compile-fail-migration/missing_debug_impls.stderr
+++ b/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
index b7470811f60..b7470811f60 100644
--- a/src/test/ui/compile-fail-migration/mod_file_aux.rs
+++ b/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
index 52837479869..52837479869 100644
--- a/src/test/ui/compile-fail-migration/mod_file_correct_spans.rs
+++ b/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
index 6f5e4cc51eb..6f5e4cc51eb 100644
--- a/src/test/ui/compile-fail-migration/mod_file_correct_spans.stderr
+++ b/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
index 27c253234be..27c253234be 100644
--- a/src/test/ui/compile-fail-migration/mod_file_disambig.rs
+++ b/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
index 16a013ebfdb..16a013ebfdb 100644
--- a/src/test/ui/compile-fail-migration/mod_file_disambig.stderr
+++ b/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
index f617b293463..f617b293463 100644
--- a/src/test/ui/compile-fail-migration/mod_file_disambig_aux.rs
+++ b/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
index f617b293463..f617b293463 100644
--- a/src/test/ui/compile-fail-migration/mod_file_disambig_aux/mod.rs
+++ b/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
index 6d3038b4820..6d3038b4820 100644
--- a/src/test/ui/compile-fail-migration/module-macro_use-arguments.rs
+++ b/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
index c61288776dd..c61288776dd 100644
--- a/src/test/ui/compile-fail-migration/module-macro_use-arguments.stderr
+++ b/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
index 05fe48e0199..05fe48e0199 100644
--- a/src/test/ui/compile-fail-migration/move-guard-same-consts.rs
+++ b/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
index 71f90ee7e54..71f90ee7e54 100644
--- a/src/test/ui/compile-fail-migration/move-guard-same-consts.stderr
+++ b/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
index 068bfa3cd7c..068bfa3cd7c 100644
--- a/src/test/ui/compile-fail-migration/move-in-guard-1.rs
+++ b/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
index 5dd46a61176..5dd46a61176 100644
--- a/src/test/ui/compile-fail-migration/move-in-guard-1.stderr
+++ b/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
index 984963b2f83..984963b2f83 100644
--- a/src/test/ui/compile-fail-migration/move-in-guard-2.rs
+++ b/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
index a12d9e98b1b..a12d9e98b1b 100644
--- a/src/test/ui/compile-fail-migration/move-in-guard-2.stderr
+++ b/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
index 42f43d3f661..42f43d3f661 100644
--- 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
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
index 61ccb694fd2..61ccb694fd2 100644
--- a/src/test/ui/compile-fail-migration/move-into-dead-array-1.rs
+++ b/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
index ac18565f194..ac18565f194 100644
--- a/src/test/ui/compile-fail-migration/move-into-dead-array-1.stderr
+++ b/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
index cc6cc4211c0..cc6cc4211c0 100644
--- 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
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
index d484837c001..d484837c001 100644
--- a/src/test/ui/compile-fail-migration/move-into-dead-array-2.rs
+++ b/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
index 0d999e67f98..0d999e67f98 100644
--- a/src/test/ui/compile-fail-migration/move-into-dead-array-2.stderr
+++ b/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
index 796b13538b2..796b13538b2 100644
--- a/src/test/ui/compile-fail-migration/move-out-of-array-1.rs
+++ b/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
index d015505a46b..d015505a46b 100644
--- a/src/test/ui/compile-fail-migration/move-out-of-array-1.stderr
+++ b/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
index b061b6a7963..b061b6a7963 100644
--- 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
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
index 5efbef549dd..5efbef549dd 100644
--- a/src/test/ui/compile-fail-migration/move-out-of-slice-1.rs
+++ b/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
index 87e68140774..87e68140774 100644
--- a/src/test/ui/compile-fail-migration/move-out-of-slice-1.stderr
+++ b/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
index e18db1b48a1..e18db1b48a1 100644
--- 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
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
index b7393666719..b7393666719 100644
--- a/src/test/ui/compile-fail-migration/move-out-of-tuple-field.rs
+++ b/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
index 1e8acf5a64b..1e8acf5a64b 100644
--- a/src/test/ui/compile-fail-migration/move-out-of-tuple-field.stderr
+++ b/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
index 39c7f0633e3..39c7f0633e3 100644
--- 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
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
index 63fb4ff02a4..63fb4ff02a4 100644
--- 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
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
index 81546511e03..81546511e03 100644
--- 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
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
index 94f2074b45d..94f2074b45d 100644
--- 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
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
index dd4c4c843ab..dd4c4c843ab 100644
--- a/src/test/ui/moves-based-on-type-block-bad.rs
+++ b/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
index f1b88292410..f1b88292410 100644
--- a/src/test/ui/moves-based-on-type-block-bad.stderr
+++ b/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
index 0081fa67b9d..0081fa67b9d 100644
--- 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
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
index 32fa773ec80..32fa773ec80 100644
--- 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
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
index 54b25678819..54b25678819 100644
--- 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
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
index 50b51c6f397..50b51c6f397 100644
--- 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
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
index 0c4aae8cfad..0c4aae8cfad 100644
--- 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
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
index 421d25721e4..421d25721e4 100644
--- 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
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
index 82420730644..82420730644 100644
--- 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
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
index 5329dcaaaf4..5329dcaaaf4 100644
--- 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
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
index 8c40b4db4f7..8c40b4db4f7 100644
--- 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
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
index aa248dab85c..aa248dab85c 100644
--- 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
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
index 194f278259b..194f278259b 100644
--- a/src/test/ui/compile-fail-migration/moves-based-on-type-exprs.rs
+++ b/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
index 003ae017b58..003ae017b58 100644
--- a/src/test/ui/compile-fail-migration/moves-based-on-type-exprs.stderr
+++ b/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
index d5b18a6c962..d5b18a6c962 100644
--- 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
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
index 1fd3d03570a..1fd3d03570a 100644
--- a/src/test/ui/moves-based-on-type-match-bindings.rs
+++ b/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
index 62e16df583f..62e16df583f 100644
--- a/src/test/ui/moves-based-on-type-match-bindings.stderr
+++ b/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
index 4f2220b0de3..4f2220b0de3 100644
--- 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
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
index 4251be36ab4..4251be36ab4 100644
--- 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
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
index 43de9016a7d..43de9016a7d 100644
--- 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
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
index e23a6beb87e..e23a6beb87e 100644
--- 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
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
index d5296065999..d5296065999 100644
--- 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
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
index 65cea57f0ed..65cea57f0ed 100644
--- 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
diff --git a/src/test/ui/moves-based-on-type-tuple.rs b/src/test/ui/moves/moves-based-on-type-tuple.rs
index 27903fee117..27903fee117 100644
--- a/src/test/ui/moves-based-on-type-tuple.rs
+++ b/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
index b0a3b6bf1fd..b0a3b6bf1fd 100644
--- a/src/test/ui/moves-based-on-type-tuple.stderr
+++ b/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
index d1a528c50a1..d1a528c50a1 100644
--- a/src/test/ui/compile-fail-migration/moves-sru-moved-field.nll.stderr
+++ b/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
index 15977fbeb73..15977fbeb73 100644
--- a/src/test/ui/compile-fail-migration/moves-sru-moved-field.rs
+++ b/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
index 878dd7ba830..878dd7ba830 100644
--- a/src/test/ui/compile-fail-migration/moves-sru-moved-field.stderr
+++ b/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
index d9c232d7dac..d9c232d7dac 100644
--- a/src/test/ui/compile-fail-migration/multiple-main-2.rs
+++ b/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
index e63bbc5cc43..e63bbc5cc43 100644
--- a/src/test/ui/compile-fail-migration/multiple-main-2.stderr
+++ b/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
index 866a59e7a4f..866a59e7a4f 100644
--- a/src/test/ui/compile-fail-migration/multiple-main-3.rs
+++ b/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
index d489e34b875..d489e34b875 100644
--- a/src/test/ui/compile-fail-migration/multiple-main-3.stderr
+++ b/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
index f5ebf84b8e0..f5ebf84b8e0 100644
--- a/src/test/ui/compile-fail-migration/multiple-plugin-registrars.rs
+++ b/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
index f1370df0f8b..f1370df0f8b 100644
--- a/src/test/ui/compile-fail-migration/multiple-plugin-registrars.stderr
+++ b/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
index 15e1be66e78..15e1be66e78 100644
--- a/src/test/ui/compile-fail-migration/mut-cant-alias.rs
+++ b/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
index b9497940301..b9497940301 100644
--- a/src/test/ui/compile-fail-migration/mut-cant-alias.stderr
+++ b/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
index 73982fa2811..73982fa2811 100644
--- a/src/test/ui/compile-fail-migration/mut-cross-borrowing.rs
+++ b/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
index be32f235be3..be32f235be3 100644
--- a/src/test/ui/compile-fail-migration/mut-cross-borrowing.stderr
+++ b/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
index 0df303eed77..0df303eed77 100644
--- 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
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
index 47a33e320bd..47a33e320bd 100644
--- a/src/test/ui/compile-fail-migration/mut-pattern-internal-mutability.ast.stderr
+++ b/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
index 0df303eed77..0df303eed77 100644
--- a/src/test/ui/compile-fail-migration/mut-pattern-internal-mutability.mir.stderr
+++ b/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
index a05ee64937e..a05ee64937e 100644
--- a/src/test/ui/compile-fail-migration/mut-pattern-internal-mutability.rs
+++ b/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
index 7685a5c0808..7685a5c0808 100644
--- a/src/test/ui/compile-fail-migration/mut-pattern-mismatched.rs
+++ b/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
index 20bd804addc..20bd804addc 100644
--- a/src/test/ui/compile-fail-migration/mut-pattern-mismatched.stderr
+++ b/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
index 715c4adf2e6..715c4adf2e6 100644
--- a/src/test/ui/mut-ref.rs
+++ b/src/test/ui/mut/mut-ref.rs
diff --git a/src/test/ui/mut-ref.stderr b/src/test/ui/mut/mut-ref.stderr
index d2df58881a2..d2df58881a2 100644
--- a/src/test/ui/mut-ref.stderr
+++ b/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
index 39a1e93d619..39a1e93d619 100644
--- a/src/test/ui/compile-fail-migration/mut-suggestion.nll.stderr
+++ b/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
index 0015c8e5c00..0015c8e5c00 100644
--- a/src/test/ui/compile-fail-migration/mut-suggestion.rs
+++ b/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
index 4aa964903f5..4aa964903f5 100644
--- a/src/test/ui/compile-fail-migration/mut-suggestion.stderr
+++ b/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
index 3433f9f0b21..3433f9f0b21 100644
--- a/src/test/ui/compile-fail-migration/mutable-class-fields-2.nll.stderr
+++ b/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
index 46af3a862c2..46af3a862c2 100644
--- a/src/test/ui/compile-fail-migration/mutable-class-fields-2.rs
+++ b/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
index aa588d8acaf..aa588d8acaf 100644
--- a/src/test/ui/compile-fail-migration/mutable-class-fields-2.stderr
+++ b/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
index 1d1e58de587..1d1e58de587 100644
--- a/src/test/ui/compile-fail-migration/mutable-class-fields.ast.nll.stderr
+++ b/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
index 0a4d3a0e968..0a4d3a0e968 100644
--- a/src/test/ui/compile-fail-migration/mutable-class-fields.ast.stderr
+++ b/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
index 1d1e58de587..1d1e58de587 100644
--- a/src/test/ui/compile-fail-migration/mutable-class-fields.mir.stderr
+++ b/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
index f138ae93f71..f138ae93f71 100644
--- a/src/test/ui/compile-fail-migration/mutable-class-fields.rs
+++ b/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
index 9107745b0e9..9107745b0e9 100644
--- a/src/test/ui/compile-fail-migration/mutable-enum-indirect.rs
+++ b/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
index 1ad4b6a1517..1ad4b6a1517 100644
--- a/src/test/ui/compile-fail-migration/mutable-enum-indirect.stderr
+++ b/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
index 2d4b50eb7b2..2d4b50eb7b2 100644
--- a/src/test/ui/compile-fail-migration/mutexguard-sync.rs
+++ b/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
index 709829e484b..709829e484b 100644
--- a/src/test/ui/compile-fail-migration/mutexguard-sync.stderr
+++ b/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
index d82e9bb7022..d82e9bb7022 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/namespace-mix.rs
+++ b/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 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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
index c1c724fc431..c1c724fc431 100644
--- a/src/test/ui/compile-fail-migration/namespace-mix.rs
+++ b/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
index 6d72b6044ae..6d72b6044ae 100644
--- a/src/test/ui/compile-fail-migration/namespace-mix.stderr
+++ b/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
index 67800f8de4e..67800f8de4e 100644
--- 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
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
index 47ecb1248b2..47ecb1248b2 100644
--- 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
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
index d5e659c236e..d5e659c236e 100644
--- 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
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
index 916801df2e8..916801df2e8 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/nested-cfg-attrs.rs b/src/test/ui/nested-cfg-attrs.rs
index f0c41ff7854..f0c41ff7854 100644
--- a/src/test/ui/compile-fail-migration/nested-cfg-attrs.rs
+++ b/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
index 5501dc8c6ad..5501dc8c6ad 100644
--- a/src/test/ui/compile-fail-migration/nested-cfg-attrs.stderr
+++ b/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
index aac37289bb7..aac37289bb7 100644
--- a/src/test/ui/compile-fail-migration/nested-ty-params.rs
+++ b/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
index 93b934f610f..93b934f610f 100644
--- a/src/test/ui/compile-fail-migration/nested-ty-params.stderr
+++ b/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
index 0fb75b535c6..0fb75b535c6 100644
--- a/src/test/ui/compile-fail-migration/never-assign-dead-code.rs
+++ b/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
index 7c7126c93c6..7c7126c93c6 100644
--- a/src/test/ui/compile-fail-migration/never-assign-dead-code.stderr
+++ b/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
index c0dd2cab749..c0dd2cab749 100644
--- a/src/test/ui/compile-fail-migration/never-assign-wrong-type.rs
+++ b/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
index 41afe88b384..41afe88b384 100644
--- a/src/test/ui/compile-fail-migration/never-assign-wrong-type.stderr
+++ b/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
index cbcc47f60c3..cbcc47f60c3 100644
--- a/src/test/ui/compile-fail-migration/never_transmute_never.rs
+++ b/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
index 7b1dd9265af..7b1dd9265af 100644
--- 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
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
index 3aa95fcad01..3aa95fcad01 100644
--- 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
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
index 2a4295fd90a..2a4295fd90a 100644
--- 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
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
index edf32d3d223..edf32d3d223 100644
--- 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
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
index 97126e98cbf..97126e98cbf 100644
--- 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
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
index 9afae71edbe..9afae71edbe 100644
--- 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
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
index b5357d0ee82..b5357d0ee82 100644
--- 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
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
index 4c739cfe978..4c739cfe978 100644
--- 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
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
index 54b1fcbd5bb..54b1fcbd5bb 100644
--- 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
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
index d6186d7561a..d6186d7561a 100644
--- 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
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
index 54b1fcbd5bb..54b1fcbd5bb 100644
--- 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
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
index 98553144627..98553144627 100644
--- a/src/test/ui/compile-fail-migration/nll/match-guards-always-borrow.rs
+++ b/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
index caa3173d746..caa3173d746 100644
--- 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
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
index c1022d66070..c1022d66070 100644
--- 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
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
index caa3173d746..caa3173d746 100644
--- 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
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
index 589a3daa38d..589a3daa38d 100644
--- 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
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
index fa3a5e0c0d7..fa3a5e0c0d7 100644
--- 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
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
index e1c47a6bbff..e1c47a6bbff 100644
--- 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
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
index d966c62c85f..d966c62c85f 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/nll/return_from_loop.rs b/src/test/ui/nll/return_from_loop.rs
index 13f1ca6431b..13f1ca6431b 100644
--- a/src/test/ui/compile-fail-migration/nll/return_from_loop.rs
+++ b/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
index 7130aa64dab..7130aa64dab 100644
--- a/src/test/ui/compile-fail-migration/nll/return_from_loop.stderr
+++ b/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
index e9110b8114b..e9110b8114b 100644
--- a/src/test/ui/compile-fail-migration/nll/unused-mut-issue-50343.rs
+++ b/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
index bfc67e213ec..bfc67e213ec 100644
--- a/src/test/ui/compile-fail-migration/nll/unused-mut-issue-50343.stderr
+++ b/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
index 0efdd19df3c..0efdd19df3c 100644
--- a/src/test/ui/compile-fail-migration/nll/where_clauses_in_functions.rs
+++ b/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
index 3d5dd4beb04..3d5dd4beb04 100644
--- a/src/test/ui/compile-fail-migration/nll/where_clauses_in_functions.stderr
+++ b/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
index 92e7db86173..92e7db86173 100644
--- a/src/test/ui/compile-fail-migration/nll/where_clauses_in_structs.rs
+++ b/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
index c7ad9879b29..c7ad9879b29 100644
--- a/src/test/ui/compile-fail-migration/nll/where_clauses_in_structs.stderr
+++ b/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
index a58d5ad6fa7..a58d5ad6fa7 100644
--- a/src/test/ui/compile-fail-migration/no-capture-arc.nll.stderr
+++ b/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
index 5e1d22bf63b..5e1d22bf63b 100644
--- a/src/test/ui/compile-fail-migration/no-capture-arc.rs
+++ b/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
index d6801d7e6e1..d6801d7e6e1 100644
--- a/src/test/ui/compile-fail-migration/no-capture-arc.stderr
+++ b/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
index c64839ad0de..c64839ad0de 100644
--- a/src/test/ui/compile-fail-migration/no-implicit-prelude-nested.rs
+++ b/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
index dd0666a6fd4..dd0666a6fd4 100644
--- a/src/test/ui/compile-fail-migration/no-implicit-prelude-nested.stderr
+++ b/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
index 0e39d9ebdc1..0e39d9ebdc1 100644
--- a/src/test/ui/compile-fail-migration/no-implicit-prelude.rs
+++ b/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
index ae1098585b7..ae1098585b7 100644
--- a/src/test/ui/compile-fail-migration/no-implicit-prelude.stderr
+++ b/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
index f74ff55e2c0..f74ff55e2c0 100644
--- a/src/test/ui/compile-fail-migration/no-link.rs
+++ b/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
index 3af7968f640..3af7968f640 100644
--- a/src/test/ui/compile-fail-migration/no-link.stderr
+++ b/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
index 4d2412c34a5..4d2412c34a5 100644
--- a/src/test/ui/compile-fail-migration/no-patterns-in-args-2.rs
+++ b/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
index 11476169c7d..11476169c7d 100644
--- a/src/test/ui/compile-fail-migration/no-patterns-in-args-2.stderr
+++ b/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
index f85ce8f57ea..f85ce8f57ea 100644
--- a/src/test/ui/compile-fail-migration/no-patterns-in-args-macro.rs
+++ b/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
index 57af3178439..57af3178439 100644
--- a/src/test/ui/compile-fail-migration/no-patterns-in-args-macro.stderr
+++ b/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
index 902affc8046..902affc8046 100644
--- a/src/test/ui/compile-fail-migration/no-reuse-move-arc.nll.stderr
+++ b/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
index 76c8a444320..76c8a444320 100644
--- a/src/test/ui/compile-fail-migration/no-reuse-move-arc.rs
+++ b/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
index 91cba6e76ef..91cba6e76ef 100644
--- a/src/test/ui/compile-fail-migration/no-reuse-move-arc.stderr
+++ b/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
index 6825963c486..6825963c486 100644
--- a/src/test/ui/compile-fail-migration/no-send-res-ports.rs
+++ b/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
index 936b95413ce..936b95413ce 100644
--- a/src/test/ui/compile-fail-migration/no-send-res-ports.stderr
+++ b/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
index 49064853d21..49064853d21 100644
--- a/src/test/ui/compile-fail-migration/no-std-inject.rs
+++ b/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
index c1ea823a9bd..c1ea823a9bd 100644
--- a/src/test/ui/compile-fail-migration/no-std-inject.stderr
+++ b/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
index f049f69e4bb..f049f69e4bb 100644
--- a/src/test/ui/compile-fail-migration/no-type-for-node-ice.rs
+++ b/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
index c9de7d28af0..c9de7d28af0 100644
--- a/src/test/ui/compile-fail-migration/no-type-for-node-ice.stderr
+++ b/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
index 2940b891534..2940b891534 100644
--- 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
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
index 91a90266e5e..91a90266e5e 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/no_crate_type.rs b/src/test/ui/no_crate_type.rs
index b2cc5cae697..b2cc5cae697 100644
--- a/src/test/ui/compile-fail-migration/no_crate_type.rs
+++ b/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
index 87f83f2d8df..87f83f2d8df 100644
--- a/src/test/ui/compile-fail-migration/no_crate_type.stderr
+++ b/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
index 1c2bf1573dc..1c2bf1573dc 100644
--- a/src/test/ui/compile-fail-migration/no_owned_box_lang_item.rs
+++ b/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
index c55c246b5e1..c55c246b5e1 100644
--- a/src/test/ui/compile-fail-migration/no_owned_box_lang_item.stderr
+++ b/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
index 83f19ed19ef..83f19ed19ef 100644
--- a/src/test/ui/compile-fail-migration/no_send-enum.rs
+++ b/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
index 4d53c5f3013..4d53c5f3013 100644
--- a/src/test/ui/compile-fail-migration/no_send-enum.stderr
+++ b/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
index d3616d14422..d3616d14422 100644
--- a/src/test/ui/compile-fail-migration/no_send-rc.rs
+++ b/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
index a0dce6c817c..a0dce6c817c 100644
--- a/src/test/ui/compile-fail-migration/no_send-rc.stderr
+++ b/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
index d38d993e7e8..d38d993e7e8 100644
--- a/src/test/ui/compile-fail-migration/no_send-struct.rs
+++ b/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
index dc7b5ec67f2..dc7b5ec67f2 100644
--- a/src/test/ui/compile-fail-migration/no_send-struct.stderr
+++ b/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
index 77a7012b3b0..77a7012b3b0 100644
--- a/src/test/ui/compile-fail-migration/no_share-enum.rs
+++ b/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
index 57b889158d0..57b889158d0 100644
--- a/src/test/ui/compile-fail-migration/no_share-enum.stderr
+++ b/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
index 34e43e9f2aa..34e43e9f2aa 100644
--- a/src/test/ui/compile-fail-migration/no_share-struct.rs
+++ b/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
index 66291db5e53..66291db5e53 100644
--- a/src/test/ui/compile-fail-migration/no_share-struct.stderr
+++ b/src/test/ui/no_share-struct.stderr
diff --git a/src/test/ui/compile-fail-migration/noexporttypeexe.rs b/src/test/ui/noexporttypeexe.rs
index c950ef5b680..c950ef5b680 100644
--- a/src/test/ui/compile-fail-migration/noexporttypeexe.rs
+++ b/src/test/ui/noexporttypeexe.rs
diff --git a/src/test/ui/compile-fail-migration/noexporttypeexe.stderr b/src/test/ui/noexporttypeexe.stderr
index 1671b3eae49..1671b3eae49 100644
--- a/src/test/ui/compile-fail-migration/noexporttypeexe.stderr
+++ b/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
index 6dfd74f541e..6dfd74f541e 100644
--- a/src/test/ui/compile-fail-migration/nolink-with-link-args.rs
+++ b/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
index 1aae25105a8..1aae25105a8 100644
--- a/src/test/ui/compile-fail-migration/non-constant-in-const-path.rs
+++ b/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
index 91ef9fd81e8..91ef9fd81e8 100644
--- a/src/test/ui/compile-fail-migration/non-constant-in-const-path.stderr
+++ b/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
index 63e5f963754..63e5f963754 100644
--- a/src/test/ui/compile-fail-migration/non-copyable-void.rs
+++ b/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
index b5c83ec2289..b5c83ec2289 100644
--- a/src/test/ui/compile-fail-migration/non-copyable-void.stderr
+++ b/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
index 1d524217a12..1d524217a12 100644
--- a/src/test/ui/compile-fail-migration/non-exhaustive-match-nested.rs
+++ b/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
index 6fb9788139f..6fb9788139f 100644
--- a/src/test/ui/compile-fail-migration/non-exhaustive-match-nested.stderr
+++ b/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
index 13b62429f46..13b62429f46 100644
--- a/src/test/ui/compile-fail-migration/non-exhaustive-match.rs
+++ b/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
index f48a0bc15eb..f48a0bc15eb 100644
--- a/src/test/ui/compile-fail-migration/non-exhaustive-match.stderr
+++ b/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
index dd14a10a2bc..dd14a10a2bc 100644
--- a/src/test/ui/non-exhaustive-pattern-witness.rs
+++ b/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
index e364e822ea8..e364e822ea8 100644
--- a/src/test/ui/non-exhaustive-pattern-witness.stderr
+++ b/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
index 2a6e148ca79..2a6e148ca79 100644
--- a/src/test/ui/compile-fail-migration/non-interger-atomic.rs
+++ b/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
index 8cb114dd42c..8cb114dd42c 100644
--- a/src/test/ui/compile-fail-migration/non-interger-atomic.stderr
+++ b/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
index f5712b0c957..f5712b0c957 100644
--- a/src/test/ui/compile-fail-migration/noncopyable-class.rs
+++ b/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
index 49ad30e56af..49ad30e56af 100644
--- a/src/test/ui/compile-fail-migration/noncopyable-class.stderr
+++ b/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
index 0abbc05eef0..0abbc05eef0 100644
--- a/src/test/ui/compile-fail-migration/nonscalar-cast.rs
+++ b/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
index d66ccd08f55..d66ccd08f55 100644
--- a/src/test/ui/compile-fail-migration/nonscalar-cast.stderr
+++ b/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
index 967cb3610ca..967cb3610ca 100644
--- a/src/test/ui/compile-fail-migration/not-clone-closure.rs
+++ b/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
index eda9b1c495e..eda9b1c495e 100644
--- a/src/test/ui/compile-fail-migration/not-clone-closure.stderr
+++ b/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
index b278df5e4b4..b278df5e4b4 100644
--- a/src/test/ui/compile-fail-migration/not-copy-closure.nll.stderr
+++ b/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
index 10567c5c961..10567c5c961 100644
--- a/src/test/ui/compile-fail-migration/not-copy-closure.rs
+++ b/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
index 7193a3ed027..7193a3ed027 100644
--- a/src/test/ui/compile-fail-migration/not-copy-closure.stderr
+++ b/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
index 5490acf4bd6..5490acf4bd6 100644
--- a/src/test/ui/compile-fail-migration/not-panic-safe-2.rs
+++ b/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
index 19408623ea3..19408623ea3 100644
--- a/src/test/ui/compile-fail-migration/not-panic-safe-2.stderr
+++ b/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
index 0fac395a115..0fac395a115 100644
--- a/src/test/ui/compile-fail-migration/not-panic-safe-3.rs
+++ b/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
index a353c82c687..a353c82c687 100644
--- a/src/test/ui/compile-fail-migration/not-panic-safe-3.stderr
+++ b/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
index bf0392018b5..bf0392018b5 100644
--- a/src/test/ui/compile-fail-migration/not-panic-safe-4.rs
+++ b/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
index 27d3defe123..27d3defe123 100644
--- a/src/test/ui/compile-fail-migration/not-panic-safe-4.stderr
+++ b/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
index 627a0fe78cf..627a0fe78cf 100644
--- a/src/test/ui/compile-fail-migration/not-panic-safe-5.rs
+++ b/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
index ba3b3fadb6a..ba3b3fadb6a 100644
--- a/src/test/ui/compile-fail-migration/not-panic-safe-5.stderr
+++ b/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
index 950f0a0b53a..950f0a0b53a 100644
--- a/src/test/ui/compile-fail-migration/not-panic-safe-6.rs
+++ b/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
index da6c2a58294..da6c2a58294 100644
--- a/src/test/ui/compile-fail-migration/not-panic-safe-6.stderr
+++ b/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
index 0ebf3d3fed7..0ebf3d3fed7 100644
--- a/src/test/ui/compile-fail-migration/not-panic-safe.rs
+++ b/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
index f349b5d2e26..f349b5d2e26 100644
--- a/src/test/ui/compile-fail-migration/not-panic-safe.stderr
+++ b/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
index a383244f415..a383244f415 100644
--- a/src/test/ui/compile-fail-migration/not-sync.rs
+++ b/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
index 026fd5dd713..026fd5dd713 100644
--- a/src/test/ui/compile-fail-migration/not-sync.stderr
+++ b/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
index 4148e5b88fe..4148e5b88fe 100644
--- a/src/test/ui/compile-fail-migration/not-utf8.bin
+++ b/src/test/ui/not-utf8.bin
Binary files differdiff --git a/src/test/ui/compile-fail-migration/not-utf8.rs b/src/test/ui/not-utf8.rs
index 5331062d9b6..5331062d9b6 100644
--- a/src/test/ui/compile-fail-migration/not-utf8.rs
+++ b/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
index 28c23f4f348..28c23f4f348 100644
--- a/src/test/ui/compile-fail-migration/not-utf8.stderr
+++ b/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
index 2092b6bce37..2092b6bce37 100644
--- a/src/test/ui/numeric-cast-2.rs
+++ b/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
index 3d485583717..3d485583717 100644
--- a/src/test/ui/numeric-cast-2.stderr
+++ b/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
index 69bfdfa94b1..69bfdfa94b1 100644
--- a/src/test/ui/numeric-cast.rs
+++ b/src/test/ui/numeric/numeric-cast.rs
diff --git a/src/test/ui/numeric-cast.stderr b/src/test/ui/numeric/numeric-cast.stderr
index 4aac65ff4cb..4aac65ff4cb 100644
--- a/src/test/ui/numeric-cast.stderr
+++ b/src/test/ui/numeric/numeric-cast.stderr
diff --git a/src/test/ui/numeric-fields.rs b/src/test/ui/numeric/numeric-fields.rs
index 89d09560369..89d09560369 100644
--- a/src/test/ui/numeric-fields.rs
+++ b/src/test/ui/numeric/numeric-fields.rs
diff --git a/src/test/ui/numeric-fields.stderr b/src/test/ui/numeric/numeric-fields.stderr
index 68a87da8ded..68a87da8ded 100644
--- a/src/test/ui/numeric-fields.stderr
+++ b/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
index 30f8d5e2f45..30f8d5e2f45 100644
--- a/src/test/ui/compile-fail-migration/object-does-not-impl-trait.rs
+++ b/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
index a1ebdf3e666..a1ebdf3e666 100644
--- a/src/test/ui/compile-fail-migration/object-does-not-impl-trait.stderr
+++ b/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
index 3df83d91999..3df83d91999 100644
--- a/src/test/ui/compile-fail-migration/object-lifetime-default-ambiguous.rs
+++ b/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
index cb603f2c472..cb603f2c472 100644
--- a/src/test/ui/compile-fail-migration/object-lifetime-default-ambiguous.stderr
+++ b/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
index 509d35a9433..509d35a9433 100644
--- 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
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
index e37b6a2bb9c..e37b6a2bb9c 100644
--- a/src/test/ui/compile-fail-migration/object-lifetime-default-elision.rs
+++ b/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
index 45e7d8451f7..45e7d8451f7 100644
--- a/src/test/ui/compile-fail-migration/object-lifetime-default-elision.stderr
+++ b/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
index 5cfced1a72f..5cfced1a72f 100644
--- 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
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
index b253612bc32..b253612bc32 100644
--- 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
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
index 9972930c13e..9972930c13e 100644
--- 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
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
index 42bcdf2bd8c..42bcdf2bd8c 100644
--- 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
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
index 98301ef1a0a..98301ef1a0a 100644
--- 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
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
index a59d8090baf..a59d8090baf 100644
--- 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
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
index 73b419d5113..73b419d5113 100644
--- 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
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
index 836e4fa1142..836e4fa1142 100644
--- 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
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
index beda4df5295..beda4df5295 100644
--- 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
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
index f76a03d078b..f76a03d078b 100644
--- 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
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
index 54657e76e97..54657e76e97 100644
--- a/src/test/ui/compile-fail-migration/object-lifetime-default-mybox.rs
+++ b/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
index ec003693617..ec003693617 100644
--- a/src/test/ui/compile-fail-migration/object-lifetime-default-mybox.stderr
+++ b/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
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
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>(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
index 98c14cee942..98c14cee942 100644
--- a/src/test/ui/compile-fail-migration/object-pointer-types.rs
+++ b/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
index 5d8679b8aa5..5d8679b8aa5 100644
--- a/src/test/ui/compile-fail-migration/object-pointer-types.stderr
+++ b/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
index 4bce2c5982a..4bce2c5982a 100644
--- a/src/test/ui/object-safety-associated-consts.rs
+++ b/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
index 39ec5a64e93..39ec5a64e93 100644
--- a/src/test/ui/object-safety-associated-consts.stderr
+++ b/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
index cf0ee588263..cf0ee588263 100644
--- 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
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
index e575bbb6cea..e575bbb6cea 100644
--- 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
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
index 015284657af..015284657af 100644
--- 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
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
index 5a8772d6142..5a8772d6142 100644
--- 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
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
index 61259641c0e..61259641c0e 100644
--- 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
diff --git a/src/test/ui/object-safety-generics.rs b/src/test/ui/object-safety/object-safety-generics.rs
index 969ceeec276..969ceeec276 100644
--- a/src/test/ui/object-safety-generics.rs
+++ b/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
index e5dfa666630..e5dfa666630 100644
--- a/src/test/ui/object-safety-generics.stderr
+++ b/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
index 06d2441d3c0..06d2441d3c0 100644
--- a/src/test/ui/compile-fail-migration/object-safety-issue-22040.rs
+++ b/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
index b718e92fc47..b718e92fc47 100644
--- a/src/test/ui/compile-fail-migration/object-safety-issue-22040.stderr
+++ b/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
index 0f59a928fef..0f59a928fef 100644
--- a/src/test/ui/object-safety-mentions-Self.rs
+++ b/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
index b181be95a54..b181be95a54 100644
--- a/src/test/ui/object-safety-mentions-Self.stderr
+++ b/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
index dd1d5af3f4a..dd1d5af3f4a 100644
--- a/src/test/ui/compile-fail-migration/object-safety-no-static.rs
+++ b/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
index f17d2907148..f17d2907148 100644
--- a/src/test/ui/compile-fail-migration/object-safety-no-static.stderr
+++ b/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
index 518c45ac9df..518c45ac9df 100644
--- a/src/test/ui/compile-fail-migration/object-safety-phantom-fn.rs
+++ b/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
index 645867f4606..645867f4606 100644
--- a/src/test/ui/compile-fail-migration/object-safety-phantom-fn.stderr
+++ b/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
index 3e1942d5a01..3e1942d5a01 100644
--- a/src/test/ui/compile-fail-migration/object-safety-sized-2.rs
+++ b/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
index 1e179b662b9..1e179b662b9 100644
--- a/src/test/ui/compile-fail-migration/object-safety-sized-2.stderr
+++ b/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
index 7c58609c7e9..7c58609c7e9 100644
--- a/src/test/ui/object-safety-sized.rs
+++ b/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
index a6dd16666c6..a6dd16666c6 100644
--- a/src/test/ui/object-safety-sized.stderr
+++ b/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
index 53b4fc2de9e..53b4fc2de9e 100644
--- a/src/test/ui/object-safety-supertrait-mentions-Self.rs
+++ b/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
index f562bc6c54f..f562bc6c54f 100644
--- a/src/test/ui/object-safety-supertrait-mentions-Self.stderr
+++ b/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 <https://github.com/rust-lang/rust/issues/27779#issuecomment-378416911>
-
-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 <https://github.com/rust-lang/rust/issues/27779#issuecomment-378416911>
-
-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
index 5d162fe944e..5d162fe944e 100644
--- a/src/test/ui/compile-fail-migration/occurs-check-2.rs
+++ b/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
index 547491c395b..547491c395b 100644
--- a/src/test/ui/compile-fail-migration/occurs-check-2.stderr
+++ b/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
index ba7688e8524..ba7688e8524 100644
--- a/src/test/ui/compile-fail-migration/occurs-check-3.rs
+++ b/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
index 1483d41d723..1483d41d723 100644
--- a/src/test/ui/compile-fail-migration/occurs-check-3.stderr
+++ b/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
index 2c784365ea9..2c784365ea9 100644
--- a/src/test/ui/compile-fail-migration/occurs-check.rs
+++ b/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
index c6994d0c537..c6994d0c537 100644
--- a/src/test/ui/compile-fail-migration/occurs-check.stderr
+++ b/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
index 9a71dc98014..9a71dc98014 100644
--- a/src/test/ui/compile-fail-migration/old-suffixes-are-really-forbidden.rs
+++ b/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
index d580a18f46b..d580a18f46b 100644
--- a/src/test/ui/compile-fail-migration/old-suffixes-are-really-forbidden.stderr
+++ b/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
index 6441f308f29..6441f308f29 100644
--- 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
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
index 81a501f5680..81a501f5680 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/opt-in-copy.rs b/src/test/ui/opt-in-copy.rs
index bc18b52a0c1..bc18b52a0c1 100644
--- a/src/test/ui/compile-fail-migration/opt-in-copy.rs
+++ b/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
index c6440804be6..c6440804be6 100644
--- a/src/test/ui/compile-fail-migration/opt-in-copy.stderr
+++ b/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
index 59508d6ac95..59508d6ac95 100644
--- a/src/test/ui/compile-fail-migration/or-patter-mismatch.rs
+++ b/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
index 8bf4d2e5332..8bf4d2e5332 100644
--- a/src/test/ui/compile-fail-migration/or-patter-mismatch.stderr
+++ b/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
index 8201565c331..8201565c331 100644
--- a/src/test/ui/compile-fail-migration/orphan-check-diagnostics.rs
+++ b/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
index dc134dd8d6f..dc134dd8d6f 100644
--- a/src/test/ui/compile-fail-migration/orphan-check-diagnostics.stderr
+++ b/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
index 026ef3c95f6..026ef3c95f6 100644
--- a/src/test/ui/compile-fail-migration/osx-frameworks.rs
+++ b/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
index cdc2357c36c..cdc2357c36c 100644
--- a/src/test/ui/compile-fail-migration/osx-frameworks.stderr
+++ b/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
index 1fafaf85112..1fafaf85112 100644
--- a/src/test/ui/compile-fail-migration/out-of-order-shadowing.rs
+++ b/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
index 78e32e23ff6..78e32e23ff6 100644
--- a/src/test/ui/compile-fail-migration/out-of-order-shadowing.stderr
+++ b/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
index 158e99ac200..158e99ac200 100644
--- a/src/test/ui/compile-fail-migration/output-type-mismatch.rs
+++ b/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
index e869dfa78a0..e869dfa78a0 100644
--- a/src/test/ui/compile-fail-migration/output-type-mismatch.stderr
+++ b/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
index a649ae25f34..a649ae25f34 100644
--- a/src/test/ui/compile-fail-migration/overlap-marker-trait.rs
+++ b/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
index d739dfc59d2..d739dfc59d2 100644
--- a/src/test/ui/compile-fail-migration/overlap-marker-trait.stderr
+++ b/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
index 7113224664b..7113224664b 100644
--- a/src/test/ui/compile-fail-migration/overloaded-calls-nontuple.rs
+++ b/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
index 78b86889553..78b86889553 100644
--- a/src/test/ui/compile-fail-migration/overloaded-calls-nontuple.stderr
+++ b/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
index c96184d5988..c96184d5988 100644
--- a/src/test/ui/compile-fail-migration/packed-struct-generic-transmute.rs
+++ b/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
index 397b1ddba71..397b1ddba71 100644
--- a/src/test/ui/compile-fail-migration/packed-struct-generic-transmute.stderr
+++ b/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
index abb02dd39e6..abb02dd39e6 100644
--- a/src/test/ui/compile-fail-migration/packed-struct-transmute.rs
+++ b/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
index 6158dea524e..6158dea524e 100644
--- a/src/test/ui/compile-fail-migration/packed-struct-transmute.stderr
+++ b/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
index db16ac325ac..db16ac325ac 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/some-panic-impl.rs
+++ b/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
index fec11fdbd7b..fec11fdbd7b 100644
--- 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
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
index 0e020fbc78b..0e020fbc78b 100644
--- 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
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
index 2a628c05699..2a628c05699 100644
--- 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
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
index 71ed1efdcf2..71ed1efdcf2 100644
--- 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
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
index 29337025b70..29337025b70 100644
--- 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
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
index 3fd29bcd3e9..3fd29bcd3e9 100644
--- 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
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
index d5f942ba2d6..d5f942ba2d6 100644
--- 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
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
index 362be2fc3b9..362be2fc3b9 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/panic-implementation-duplicate.rs b/src/test/ui/panic-implementation/panic-implementation-duplicate.rs
index 017113af409..017113af409 100644
--- a/src/test/ui/compile-fail-migration/panic-implementation-duplicate.rs
+++ b/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
index d553c02379c..d553c02379c 100644
--- a/src/test/ui/compile-fail-migration/panic-implementation-duplicate.stderr
+++ b/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
index b11081a3e3b..b11081a3e3b 100644
--- a/src/test/ui/compile-fail-migration/panic-implementation-missing.rs
+++ b/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
index e813338dcc0..e813338dcc0 100644
--- a/src/test/ui/compile-fail-migration/panic-implementation-missing.stderr
+++ b/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
index 597f44d9832..597f44d9832 100644
--- 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
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
index 2bae12efbde..2bae12efbde 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/panic-implementation-std.rs b/src/test/ui/panic-implementation/panic-implementation-std.rs
index f25cd3605c1..f25cd3605c1 100644
--- a/src/test/ui/compile-fail-migration/panic-implementation-std.rs
+++ b/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
index 5016d502cee..5016d502cee 100644
--- a/src/test/ui/compile-fail-migration/panic-implementation-std.stderr
+++ b/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
index 78dc545c036..78dc545c036 100644
--- a/src/test/ui/compile-fail-migration/panic-implementation-twice.rs
+++ b/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
index 3cb6ebeb59a..3cb6ebeb59a 100644
--- a/src/test/ui/compile-fail-migration/panic-implementation-twice.stderr
+++ b/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
index f392ccd7676..f392ccd7676 100644
--- 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
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
index 704b81ae1ce..704b81ae1ce 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/panic-runtime/auxiliary/depends.rs b/src/test/ui/panic-runtime/auxiliary/depends.rs
index b90dec9281b..b90dec9281b 100644
--- a/src/test/ui/compile-fail-migration/panic-runtime/auxiliary/depends.rs
+++ b/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
index d6c21fecf6b..d6c21fecf6b 100644
--- 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
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
index 3b74156b6b0..3b74156b6b0 100644
--- 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
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
index d9848a554ab..d9848a554ab 100644
--- 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
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
index 4bb36839d98..4bb36839d98 100644
--- 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
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
index 4bb36839d98..4bb36839d98 100644
--- 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
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
index e1902e44a60..e1902e44a60 100644
--- 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
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
index 2183338b249..2183338b249 100644
--- 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
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
index f067b6b8349..f067b6b8349 100644
--- a/src/test/ui/compile-fail-migration/panic-runtime/bad-panic-flag1.rs
+++ b/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
index 3a65419c98f..3a65419c98f 100644
--- a/src/test/ui/compile-fail-migration/panic-runtime/bad-panic-flag1.stderr
+++ b/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
index 0ecf65f080f..0ecf65f080f 100644
--- a/src/test/ui/compile-fail-migration/panic-runtime/bad-panic-flag2.rs
+++ b/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
index 8d919e55c90..8d919e55c90 100644
--- a/src/test/ui/compile-fail-migration/panic-runtime/bad-panic-flag2.stderr
+++ b/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
index 71751034c39..71751034c39 100644
--- a/src/test/ui/compile-fail-migration/panic-runtime/libtest-unwinds.rs
+++ b/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
index 704b81ae1ce..704b81ae1ce 100644
--- a/src/test/ui/compile-fail-migration/panic-runtime/libtest-unwinds.stderr
+++ b/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
index 1b3b978c408..1b3b978c408 100644
--- a/src/test/ui/compile-fail-migration/panic-runtime/needs-gate.rs
+++ b/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
index aa2b97556dc..aa2b97556dc 100644
--- a/src/test/ui/compile-fail-migration/panic-runtime/needs-gate.stderr
+++ b/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
index 7cfdacbd983..7cfdacbd983 100644
--- 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
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
index 0e68c9b806d..0e68c9b806d 100644
--- 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
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
index f886aac9a10..f886aac9a10 100644
--- 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
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
index 4af754c81f9..4af754c81f9 100644
--- 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
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
index 0fe0da2fa2c..0fe0da2fa2c 100644
--- a/src/test/ui/compile-fail-migration/panic-runtime/two-panic-runtimes.rs
+++ b/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
index 0c81a103049..0c81a103049 100644
--- a/src/test/ui/compile-fail-migration/panic-runtime/two-panic-runtimes.stderr
+++ b/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
index b178006411b..b178006411b 100644
--- 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
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
index 69064b75ac5..69064b75ac5 100644
--- 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
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
index de8e010c3cb..de8e010c3cb 100644
--- 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
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
index 69064b75ac5..69064b75ac5 100644
--- 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
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
index dda92d9a560..dda92d9a560 100644
--- 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
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
index d4fd2cca81f..d4fd2cca81f 100644
--- 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
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
index 49f719057d2..49f719057d2 100644
--- 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
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
index 364a27a24eb..364a27a24eb 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/panic_implementation-closures.rs b/src/test/ui/panic_implementation-closures.rs
index 4fa9a639928..4fa9a639928 100644
--- a/src/test/ui/compile-fail-migration/panic_implementation-closures.rs
+++ b/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
index 8ed5050f3de..8ed5050f3de 100644
--- a/src/test/ui/compile-fail-migration/paren-span.rs
+++ b/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
index df6881a1af3..df6881a1af3 100644
--- a/src/test/ui/compile-fail-migration/paren-span.stderr
+++ b/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
index bc7c333723d..bc7c333723d 100644
--- a/src/test/ui/compile-fail-migration/parse-error-correct.rs
+++ b/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
index 3eb0b19a6aa..3eb0b19a6aa 100644
--- a/src/test/ui/compile-fail-migration/parse-error-correct.stderr
+++ b/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
index 9fb4d6facdd..9fb4d6facdd 100644
--- a/src/test/ui/compile-fail-migration/parser-recovery-1.rs
+++ b/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
index bf4070682fb..bf4070682fb 100644
--- a/src/test/ui/compile-fail-migration/parser-recovery-1.stderr
+++ b/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
index 03b1a9b876f..03b1a9b876f 100644
--- a/src/test/ui/compile-fail-migration/parser-recovery-2.rs
+++ b/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
index 7b520607352..7b520607352 100644
--- a/src/test/ui/compile-fail-migration/parser-recovery-2.stderr
+++ b/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
index 3dbe08f1908..3dbe08f1908 100644
--- a/src/test/ui/compile-fail-migration/pat-shadow-in-nested-binding.rs
+++ b/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
index 9dd6a318e98..9dd6a318e98 100644
--- a/src/test/ui/compile-fail-migration/pat-shadow-in-nested-binding.stderr
+++ b/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
index 251e7b47dcc..251e7b47dcc 100644
--- a/src/test/ui/compile-fail-migration/pat-tuple-bad-type.rs
+++ b/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
index d4f80550b3e..d4f80550b3e 100644
--- a/src/test/ui/compile-fail-migration/pat-tuple-bad-type.stderr
+++ b/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
index 851fa5c5be6..851fa5c5be6 100644
--- a/src/test/ui/compile-fail-migration/pat-tuple-overfield.rs
+++ b/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
index 2802b42f313..2802b42f313 100644
--- a/src/test/ui/compile-fail-migration/pat-tuple-overfield.stderr
+++ b/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
index 8fef98f815f..8fef98f815f 100644
--- a/src/test/ui/compile-fail-migration/patkind-litrange-no-expr.rs
+++ b/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
index f22870fb029..f22870fb029 100644
--- a/src/test/ui/compile-fail-migration/patkind-litrange-no-expr.stderr
+++ b/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
index c740f6bb47c..c740f6bb47c 100644
--- a/src/test/ui/compile-fail-migration/pattern-binding-disambiguation.rs
+++ b/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
index 7acdb07e10d..7acdb07e10d 100644
--- a/src/test/ui/compile-fail-migration/pattern-binding-disambiguation.stderr
+++ b/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
index da2a97b0ca8..da2a97b0ca8 100644
--- a/src/test/ui/compile-fail-migration/pattern-bindings-after-at.rs
+++ b/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
index 8c715001baa..8c715001baa 100644
--- a/src/test/ui/compile-fail-migration/pattern-bindings-after-at.stderr
+++ b/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
index e63b84594aa..e63b84594aa 100644
--- a/src/test/ui/compile-fail-migration/pattern-error-continue.rs
+++ b/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
index b24366c48bc..b24366c48bc 100644
--- a/src/test/ui/compile-fail-migration/pattern-error-continue.stderr
+++ b/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
index 0b7886842b4..0b7886842b4 100644
--- a/src/test/ui/compile-fail-migration/pattern-ident-path-generics.rs
+++ b/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
index cd205956571..cd205956571 100644
--- a/src/test/ui/compile-fail-migration/pattern-ident-path-generics.stderr
+++ b/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
index cd4a98835c8..cd4a98835c8 100644
--- a/src/test/ui/compile-fail-migration/pattern-tyvar-2.rs
+++ b/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
index fd7ab84cc56..fd7ab84cc56 100644
--- a/src/test/ui/compile-fail-migration/pattern-tyvar-2.stderr
+++ b/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
index be8d3e027e7..be8d3e027e7 100644
--- a/src/test/ui/compile-fail-migration/pattern-tyvar.rs
+++ b/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
index 55e09e02a1d..55e09e02a1d 100644
--- a/src/test/ui/compile-fail-migration/pattern-tyvar.stderr
+++ b/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
index 51e7d5da98f..51e7d5da98f 100644
--- a/src/test/ui/compile-fail-migration/phantom-oibit.rs
+++ b/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
index 5156ba94cef..5156ba94cef 100644
--- a/src/test/ui/compile-fail-migration/phantom-oibit.stderr
+++ b/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
index e8a9031dba8..e8a9031dba8 100644
--- a/src/test/ui/compile-fail-migration/platform-intrinsic-params.rs
+++ b/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
index e41de9fe02d..e41de9fe02d 100644
--- a/src/test/ui/compile-fail-migration/platform-intrinsic-params.stderr
+++ b/src/test/ui/platform-intrinsic-params.stderr
diff --git a/src/test/ui/compile-fail-migration/pptypedef.rs b/src/test/ui/pptypedef.rs
index 7ece52e7537..7ece52e7537 100644
--- a/src/test/ui/compile-fail-migration/pptypedef.rs
+++ b/src/test/ui/pptypedef.rs
diff --git a/src/test/ui/compile-fail-migration/pptypedef.stderr b/src/test/ui/pptypedef.stderr
index bde48d86ba5..bde48d86ba5 100644
--- a/src/test/ui/compile-fail-migration/pptypedef.stderr
+++ b/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
index cc0b74dc82a..cc0b74dc82a 100644
--- a/src/test/ui/compile-fail-migration/prim-with-args.rs
+++ b/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
index bfe7256f8a2..bfe7256f8a2 100644
--- a/src/test/ui/compile-fail-migration/prim-with-args.stderr
+++ b/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
index 8901d8c08e5..8901d8c08e5 100644
--- a/src/test/ui/compile-fail-migration/priv-in-bad-locations.rs
+++ b/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
index e395a2243df..e395a2243df 100644
--- a/src/test/ui/compile-fail-migration/priv-in-bad-locations.stderr
+++ b/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
index 63cb6e82c25..63cb6e82c25 100644
--- a/src/test/ui/compile-fail-migration/privacy/associated-item-privacy-inherent.rs
+++ b/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
index 391e5bbb4c0..391e5bbb4c0 100644
--- a/src/test/ui/compile-fail-migration/privacy/associated-item-privacy-inherent.stderr
+++ b/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
index bdc0c680a92..bdc0c680a92 100644
--- a/src/test/ui/compile-fail-migration/privacy/associated-item-privacy-trait.rs
+++ b/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
index 5aac27346f3..5aac27346f3 100644
--- a/src/test/ui/compile-fail-migration/privacy/associated-item-privacy-trait.stderr
+++ b/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
index 6019369aa2e..6019369aa2e 100644
--- 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
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
index e762dc62853..e762dc62853 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/auxiliary/cci_class.rs b/src/test/ui/privacy/auxiliary/cci_class.rs
index 08a13fd8bcc..08a13fd8bcc 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/cci_class.rs
+++ b/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
index 7fe608f1634..7fe608f1634 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/cci_class_5.rs
+++ b/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
index 141b6bdd604..141b6bdd604 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/privacy_tuple_struct.rs
+++ b/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
index fc43765f63c..fc43765f63c 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/private-inferred-type.rs
+++ b/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
index 95144916fd7..95144916fd7 100644
--- a/src/test/ui/compile-fail-migration/privacy/legacy-ctor-visibility.rs
+++ b/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
index 7652d65a3a4..7652d65a3a4 100644
--- a/src/test/ui/compile-fail-migration/privacy/legacy-ctor-visibility.stderr
+++ b/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
index 0a8689ea6d6..0a8689ea6d6 100644
--- a/src/test/ui/compile-fail-migration/privacy-in-paths.rs
+++ b/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
index f0aa3d36479..f0aa3d36479 100644
--- a/src/test/ui/compile-fail-migration/privacy-in-paths.stderr
+++ b/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
index e7e522f99d4..e7e522f99d4 100644
--- a/src/test/ui/compile-fail-migration/privacy-ns1.rs
+++ b/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
index 503cfbfaa2d..503cfbfaa2d 100644
--- a/src/test/ui/compile-fail-migration/privacy-ns1.stderr
+++ b/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
index ec9396b5e7b..ec9396b5e7b 100644
--- a/src/test/ui/compile-fail-migration/privacy-ns2.rs
+++ b/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
index 0cd341d9a58..0cd341d9a58 100644
--- a/src/test/ui/compile-fail-migration/privacy-ns2.stderr
+++ b/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
index f245b7cef29..f245b7cef29 100644
--- a/src/test/ui/compile-fail-migration/privacy-sanity.rs
+++ b/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
index fbfa15f8cb0..fbfa15f8cb0 100644
--- a/src/test/ui/compile-fail-migration/privacy-sanity.stderr
+++ b/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
index 28c1a003e39..28c1a003e39 100644
--- a/src/test/ui/compile-fail-migration/privacy-ufcs.rs
+++ b/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
index 2030e2e0f1b..2030e2e0f1b 100644
--- a/src/test/ui/compile-fail-migration/privacy-ufcs.stderr
+++ b/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
index afe8c2fda3d..afe8c2fda3d 100644
--- a/src/test/ui/compile-fail-migration/privacy1.rs
+++ b/src/test/ui/privacy/privacy1.rs
diff --git a/src/test/ui/compile-fail-migration/privacy1.stderr b/src/test/ui/privacy/privacy1.stderr
index 344f990699f..344f990699f 100644
--- a/src/test/ui/compile-fail-migration/privacy1.stderr
+++ b/src/test/ui/privacy/privacy1.stderr
diff --git a/src/test/ui/compile-fail-migration/privacy2.rs b/src/test/ui/privacy/privacy2.rs
index 113dd287940..113dd287940 100644
--- a/src/test/ui/compile-fail-migration/privacy2.rs
+++ b/src/test/ui/privacy/privacy2.rs
diff --git a/src/test/ui/compile-fail-migration/privacy2.stderr b/src/test/ui/privacy/privacy2.stderr
index ec5567b25e4..ec5567b25e4 100644
--- a/src/test/ui/compile-fail-migration/privacy2.stderr
+++ b/src/test/ui/privacy/privacy2.stderr
diff --git a/src/test/ui/compile-fail-migration/privacy3.rs b/src/test/ui/privacy/privacy3.rs
index b841717bd11..b841717bd11 100644
--- a/src/test/ui/compile-fail-migration/privacy3.rs
+++ b/src/test/ui/privacy/privacy3.rs
diff --git a/src/test/ui/compile-fail-migration/privacy3.stderr b/src/test/ui/privacy/privacy3.stderr
index 11c71616d90..11c71616d90 100644
--- a/src/test/ui/compile-fail-migration/privacy3.stderr
+++ b/src/test/ui/privacy/privacy3.stderr
diff --git a/src/test/ui/compile-fail-migration/privacy4.rs b/src/test/ui/privacy/privacy4.rs
index d9f76744284..d9f76744284 100644
--- a/src/test/ui/compile-fail-migration/privacy4.rs
+++ b/src/test/ui/privacy/privacy4.rs
diff --git a/src/test/ui/compile-fail-migration/privacy4.stderr b/src/test/ui/privacy/privacy4.stderr
index 811f5d5942a..811f5d5942a 100644
--- a/src/test/ui/compile-fail-migration/privacy4.stderr
+++ b/src/test/ui/privacy/privacy4.stderr
diff --git a/src/test/ui/compile-fail-migration/privacy5.rs b/src/test/ui/privacy/privacy5.rs
index 599c1f87160..599c1f87160 100644
--- a/src/test/ui/compile-fail-migration/privacy5.rs
+++ b/src/test/ui/privacy/privacy5.rs
diff --git a/src/test/ui/compile-fail-migration/privacy5.stderr b/src/test/ui/privacy/privacy5.stderr
index bcb63151362..bcb63151362 100644
--- a/src/test/ui/compile-fail-migration/privacy5.stderr
+++ b/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
index e04380f12ac..e04380f12ac 100644
--- a/src/test/ui/compile-fail-migration/private-impl-method.rs
+++ b/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
index 0e36c7003ee..0e36c7003ee 100644
--- a/src/test/ui/compile-fail-migration/private-impl-method.stderr
+++ b/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
index 59dee256642..59dee256642 100644
--- a/src/test/ui/compile-fail-migration/private-in-public-assoc-ty.rs
+++ b/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
index a95547bc507..a95547bc507 100644
--- a/src/test/ui/compile-fail-migration/private-in-public-assoc-ty.stderr
+++ b/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
index 480406054ad..480406054ad 100644
--- a/src/test/ui/compile-fail-migration/private-in-public-ill-formed.rs
+++ b/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
index 649f5fc2fca..649f5fc2fca 100644
--- a/src/test/ui/compile-fail-migration/private-in-public-ill-formed.stderr
+++ b/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
index fd92300cd15..fd92300cd15 100644
--- a/src/test/ui/compile-fail-migration/private-in-public-lint.rs
+++ b/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
index 202cb342d8c..202cb342d8c 100644
--- a/src/test/ui/compile-fail-migration/private-in-public-lint.stderr
+++ b/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
index 6eeb14638e7..6eeb14638e7 100644
--- a/src/test/ui/compile-fail-migration/private-in-public-warn.rs
+++ b/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
index 04e743a5b0e..04e743a5b0e 100644
--- a/src/test/ui/compile-fail-migration/private-in-public-warn.stderr
+++ b/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
index b865e391d29..b865e391d29 100644
--- a/src/test/ui/compile-fail-migration/private-in-public.rs
+++ b/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
index 586327fbf26..586327fbf26 100644
--- a/src/test/ui/compile-fail-migration/private-in-public.stderr
+++ b/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
index ba8b3d1810a..ba8b3d1810a 100644
--- a/src/test/ui/compile-fail-migration/private-inferred-type-1.rs
+++ b/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
index 4036152c27f..4036152c27f 100644
--- a/src/test/ui/compile-fail-migration/private-inferred-type-1.stderr
+++ b/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
index e981f125750..e981f125750 100644
--- a/src/test/ui/compile-fail-migration/private-inferred-type-2.rs
+++ b/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
index 0559473e361..0559473e361 100644
--- a/src/test/ui/compile-fail-migration/private-inferred-type-2.stderr
+++ b/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
index 0c393f02323..0c393f02323 100644
--- a/src/test/ui/compile-fail-migration/private-inferred-type-3.rs
+++ b/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
index 3c37a7ee1e8..3c37a7ee1e8 100644
--- a/src/test/ui/compile-fail-migration/private-inferred-type-3.stderr
+++ b/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
index 3ca8b1eb2ed..3ca8b1eb2ed 100644
--- a/src/test/ui/compile-fail-migration/private-inferred-type.rs
+++ b/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
index abbe43fe384..abbe43fe384 100644
--- a/src/test/ui/compile-fail-migration/private-inferred-type.stderr
+++ b/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
index 2b9e32b8f58..2b9e32b8f58 100644
--- a/src/test/ui/compile-fail-migration/private-item-simple.rs
+++ b/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
index 811b026eab9..811b026eab9 100644
--- a/src/test/ui/compile-fail-migration/private-item-simple.stderr
+++ b/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
index 68059baa385..68059baa385 100644
--- a/src/test/ui/compile-fail-migration/private-method-cross-crate.rs
+++ b/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
index 27d398c0166..27d398c0166 100644
--- a/src/test/ui/compile-fail-migration/private-method-cross-crate.stderr
+++ b/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
index c6419991b11..c6419991b11 100644
--- a/src/test/ui/compile-fail-migration/private-method-inherited.rs
+++ b/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
index 3f10750e46f..3f10750e46f 100644
--- a/src/test/ui/compile-fail-migration/private-method-inherited.stderr
+++ b/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
index 16510c2c8c9..16510c2c8c9 100644
--- a/src/test/ui/compile-fail-migration/private-method.rs
+++ b/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
index fce03d35e39..fce03d35e39 100644
--- a/src/test/ui/compile-fail-migration/private-method.stderr
+++ b/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
index 067c17668c6..067c17668c6 100644
--- a/src/test/ui/compile-fail-migration/private-struct-field-cross-crate.rs
+++ b/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
index b9401baf0d0..b9401baf0d0 100644
--- a/src/test/ui/compile-fail-migration/private-struct-field-cross-crate.stderr
+++ b/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
index 0a0f2d490a8..0a0f2d490a8 100644
--- a/src/test/ui/compile-fail-migration/private-struct-field-ctor.rs
+++ b/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
index 711d265c559..711d265c559 100644
--- a/src/test/ui/compile-fail-migration/private-struct-field-ctor.stderr
+++ b/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
index e9dd6cd1d74..e9dd6cd1d74 100644
--- a/src/test/ui/compile-fail-migration/private-struct-field-pattern.rs
+++ b/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
index bc09a2a6daf..bc09a2a6daf 100644
--- a/src/test/ui/compile-fail-migration/private-struct-field-pattern.stderr
+++ b/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
index 1423117dc81..1423117dc81 100644
--- a/src/test/ui/compile-fail-migration/private-struct-field.rs
+++ b/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
index db16e1ba1fc..db16e1ba1fc 100644
--- a/src/test/ui/compile-fail-migration/private-struct-field.stderr
+++ b/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
index 4235b4be271..4235b4be271 100644
--- a/src/test/ui/compile-fail-migration/private-type-in-interface.rs
+++ b/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
index 5b12ed5e5f4..5b12ed5e5f4 100644
--- a/src/test/ui/compile-fail-migration/private-type-in-interface.stderr
+++ b/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
index 5d770f88155..5d770f88155 100644
--- a/src/test/ui/compile-fail-migration/private-variant-reexport.rs
+++ b/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
index 11e13ab9ba8..11e13ab9ba8 100644
--- a/src/test/ui/compile-fail-migration/private-variant-reexport.stderr
+++ b/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
index c4ab96c8456..c4ab96c8456 100644
--- a/src/test/ui/compile-fail-migration/privacy/restricted/auxiliary/pub_restricted.rs
+++ b/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
index abd71b9c90b..abd71b9c90b 100644
--- a/src/test/ui/compile-fail-migration/privacy/restricted/lookup-ignores-private.rs
+++ b/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
index 7fc53e8c324..7fc53e8c324 100644
--- a/src/test/ui/compile-fail-migration/privacy/restricted/lookup-ignores-private.stderr
+++ b/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
index 4d3f5377797..4d3f5377797 100644
--- a/src/test/ui/compile-fail-migration/privacy/restricted/private-in-public.rs
+++ b/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
index e0d3abdc213..e0d3abdc213 100644
--- a/src/test/ui/compile-fail-migration/privacy/restricted/private-in-public.stderr
+++ b/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
index 21d90dfea4b..21d90dfea4b 100644
--- a/src/test/ui/compile-fail-migration/privacy/restricted/struct-literal-field.rs
+++ b/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
index 6d668c8767a..6d668c8767a 100644
--- a/src/test/ui/compile-fail-migration/privacy/restricted/struct-literal-field.stderr
+++ b/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
index 8c1d609e244..8c1d609e244 100644
--- a/src/test/ui/compile-fail-migration/privacy/restricted/test.rs
+++ b/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
index 67a95c35590..67a95c35590 100644
--- a/src/test/ui/compile-fail-migration/privacy/restricted/test.stderr
+++ b/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
index eeebb1b737a..eeebb1b737a 100644
--- a/src/test/ui/compile-fail-migration/privacy/union-field-privacy-1.rs
+++ b/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
index c93760a1b89..c93760a1b89 100644
--- a/src/test/ui/compile-fail-migration/privacy/union-field-privacy-1.stderr
+++ b/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
index d6bb765202d..d6bb765202d 100644
--- a/src/test/ui/compile-fail-migration/privacy/union-field-privacy-2.rs
+++ b/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
index cc12483a653..cc12483a653 100644
--- a/src/test/ui/compile-fail-migration/privacy/union-field-privacy-2.stderr
+++ b/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
index 1390c9507c1..1390c9507c1 100644
--- a/src/test/ui/compile-fail-migration/ptr-coercion.rs
+++ b/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
index c5ed80db1a8..c5ed80db1a8 100644
--- a/src/test/ui/compile-fail-migration/ptr-coercion.stderr
+++ b/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
index 44884bfcdfd..44884bfcdfd 100644
--- a/src/test/ui/pub-ident-fn-2.rs
+++ b/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
index bbbb3df8769..bbbb3df8769 100644
--- a/src/test/ui/pub-ident-fn-2.stderr
+++ b/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
index 1ccadc8a40b..1ccadc8a40b 100644
--- a/src/test/ui/pub-ident-fn-or-struct-2.rs
+++ b/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
index e492a8c4756..e492a8c4756 100644
--- a/src/test/ui/pub-ident-fn-or-struct-2.stderr
+++ b/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
index 0664918945b..0664918945b 100644
--- a/src/test/ui/pub-ident-fn-or-struct.rs
+++ b/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
index c1bff34cec3..c1bff34cec3 100644
--- a/src/test/ui/pub-ident-fn-or-struct.stderr
+++ b/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
index f2d0c6c3e1d..f2d0c6c3e1d 100644
--- a/src/test/ui/pub-ident-fn.fixed
+++ b/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
index 82c32f57eea..82c32f57eea 100644
--- a/src/test/ui/pub-ident-fn.rs
+++ b/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
index f7c96b8b9f4..f7c96b8b9f4 100644
--- a/src/test/ui/pub-ident-fn.stderr
+++ b/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
index d08d498f87a..d08d498f87a 100644
--- a/src/test/ui/pub-ident-struct.rs
+++ b/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
index cd53cea7212..cd53cea7212 100644
--- a/src/test/ui/pub-ident-struct.stderr
+++ b/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
index 2e71e007e9e..2e71e007e9e 100644
--- a/src/test/ui/compile-fail-migration/pub-reexport-priv-extern-crate.rs
+++ b/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
index d298542bd5d..d298542bd5d 100644
--- a/src/test/ui/compile-fail-migration/pub-reexport-priv-extern-crate.stderr
+++ b/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
index b0dd1f2518c..b0dd1f2518c 100644
--- a/src/test/ui/qualified-path-params-2.rs
+++ b/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
index 8b618cbf7ba..8b618cbf7ba 100644
--- a/src/test/ui/qualified-path-params-2.stderr
+++ b/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
index 018a3b2ae32..018a3b2ae32 100644
--- a/src/test/ui/compile-fail-migration/qualified-path-params.rs
+++ b/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
index e76c373eec5..e76c373eec5 100644
--- a/src/test/ui/compile-fail-migration/qualified-path-params.stderr
+++ b/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
index e15c9af41e0..e15c9af41e0 100644
--- a/src/test/ui/compile-fail-migration/question-mark-type-infer.rs
+++ b/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
index 53848ed0727..53848ed0727 100644
--- a/src/test/ui/compile-fail-migration/question-mark-type-infer.stderr
+++ b/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
index 1fafb1c7a1b..1fafb1c7a1b 100644
--- a/src/test/ui/compile-fail-migration/quote-with-interpolated.rs
+++ b/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
index 10b3fc0a9ae..10b3fc0a9ae 100644
--- a/src/test/ui/compile-fail-migration/quote-with-interpolated.stderr
+++ b/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
index 59c78052e15..59c78052e15 100644
--- a/src/test/ui/compile-fail-migration/range-1.rs
+++ b/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
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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index ce0c9947a05..ce0c9947a05 100644
--- a/src/test/ui/range-inclusive-pattern-precedence.rs
+++ b/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
index cd5ce3035c6..cd5ce3035c6 100644
--- a/src/test/ui/range-inclusive-pattern-precedence.stderr
+++ b/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
index 78d3702b449..78d3702b449 100644
--- a/src/test/ui/compile-fail-migration/range_traits-1.rs
+++ b/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
index ee72dfe13d4..ee72dfe13d4 100644
--- a/src/test/ui/compile-fail-migration/range_traits-1.stderr
+++ b/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
index 64fcd25f538..64fcd25f538 100644
--- a/src/test/ui/compile-fail-migration/range_traits-2.rs
+++ b/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
index 0151ede2164..0151ede2164 100644
--- a/src/test/ui/compile-fail-migration/range_traits-2.stderr
+++ b/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
index d26b7956ae8..d26b7956ae8 100644
--- a/src/test/ui/compile-fail-migration/range_traits-3.rs
+++ b/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
index a625fda2bc2..a625fda2bc2 100644
--- a/src/test/ui/compile-fail-migration/range_traits-3.stderr
+++ b/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
index 630969bdbdf..630969bdbdf 100644
--- a/src/test/ui/compile-fail-migration/range_traits-4.rs
+++ b/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
index cf8ae671ffc..cf8ae671ffc 100644
--- a/src/test/ui/compile-fail-migration/range_traits-4.stderr
+++ b/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
index 5963c4a9496..5963c4a9496 100644
--- a/src/test/ui/compile-fail-migration/range_traits-5.rs
+++ b/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
index eadb3a08ba0..eadb3a08ba0 100644
--- a/src/test/ui/compile-fail-migration/range_traits-5.stderr
+++ b/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
index f9510b5061c..f9510b5061c 100644
--- a/src/test/ui/compile-fail-migration/range_traits-6.rs
+++ b/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
index 9470540cc5f..9470540cc5f 100644
--- a/src/test/ui/compile-fail-migration/range_traits-6.stderr
+++ b/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
index 871b55b85cf..871b55b85cf 100644
--- a/src/test/ui/compile-fail-migration/range_traits-7.rs
+++ b/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
index 516667a11cd..516667a11cd 100644
--- a/src/test/ui/compile-fail-migration/range_traits-7.stderr
+++ b/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
index 9bb6653d770..9bb6653d770 100644
--- a/src/test/ui/raw-literal-keywords.rs
+++ b/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
index 022f80ae8a4..022f80ae8a4 100644
--- a/src/test/ui/raw-literal-keywords.stderr
+++ b/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
index f88d6cf9a67..f88d6cf9a67 100644
--- a/src/test/ui/raw-literal-self.rs
+++ b/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
index e3345847aa8..e3345847aa8 100644
--- a/src/test/ui/raw-literal-self.stderr
+++ b/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
index ec33e486195..ec33e486195 100644
--- a/src/test/ui/raw-literal-underscore.rs
+++ b/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
index 8072eee4f06..8072eee4f06 100644
--- a/src/test/ui/raw-literal-underscore.stderr
+++ b/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
index f1eb91d44fd..f1eb91d44fd 100644
--- a/src/test/ui/raw_string.rs
+++ b/src/test/ui/raw/raw_string.rs
diff --git a/src/test/ui/raw_string.stderr b/src/test/ui/raw/raw_string.stderr
index ddf1cfe406f..ddf1cfe406f 100644
--- a/src/test/ui/raw_string.stderr
+++ b/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
index 1186e3d62f7..1186e3d62f7 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/recursive_reexports.rs
+++ b/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
index 3221ae46296..3221ae46296 100644
--- a/src/test/ui/compile-fail-migration/recursion.rs
+++ b/src/test/ui/recursion/recursion.rs
diff --git a/src/test/ui/compile-fail-migration/recursion.stderr b/src/test/ui/recursion/recursion.stderr
index 5953e5c4087..5953e5c4087 100644
--- a/src/test/ui/compile-fail-migration/recursion.stderr
+++ b/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
index 555755cdb96..555755cdb96 100644
--- a/src/test/ui/compile-fail-migration/recursive-enum.rs
+++ b/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
index c06058b2b59..c06058b2b59 100644
--- a/src/test/ui/compile-fail-migration/recursive-enum.stderr
+++ b/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
index b57b73325c0..b57b73325c0 100644
--- a/src/test/ui/compile-fail-migration/recursive-reexports.rs
+++ b/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
index e6b8647a981..e6b8647a981 100644
--- a/src/test/ui/compile-fail-migration/recursive-reexports.stderr
+++ b/src/test/ui/recursion/recursive-reexports.stderr
diff --git a/src/test/ui/recursive-requirements.rs b/src/test/ui/recursion/recursive-requirements.rs
index 2c0f0338b2d..2c0f0338b2d 100644
--- a/src/test/ui/recursive-requirements.rs
+++ b/src/test/ui/recursion/recursive-requirements.rs
diff --git a/src/test/ui/recursive-requirements.stderr b/src/test/ui/recursion/recursive-requirements.stderr
index d9e08102ab6..d9e08102ab6 100644
--- a/src/test/ui/recursive-requirements.stderr
+++ b/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
index 62c1859e09d..62c1859e09d 100644
--- a/src/test/ui/compile-fail-migration/recursive-static-definition.rs
+++ b/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
index 2ab93bfd685..2ab93bfd685 100644
--- a/src/test/ui/compile-fail-migration/recursive-static-definition.stderr
+++ b/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
index fa936697072..fa936697072 100644
--- a/src/test/ui/compile-fail-migration/recursive-types-are-not-uninhabited.rs
+++ b/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
index c4d40412760..c4d40412760 100644
--- a/src/test/ui/compile-fail-migration/recursive-types-are-not-uninhabited.stderr
+++ b/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
index 3fbd497c7ae..3fbd497c7ae 100644
--- a/src/test/ui/compile-fail-migration/ref-suggestion.nll.stderr
+++ b/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
index 0a0867195d9..0a0867195d9 100644
--- a/src/test/ui/compile-fail-migration/ref-suggestion.rs
+++ b/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
index 63ee203ed24..63ee203ed24 100644
--- a/src/test/ui/compile-fail-migration/ref-suggestion.stderr
+++ b/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
index 7b4009481ab..7b4009481ab 100644
--- a/src/test/ui/compile-fail-migration/refutable-pattern-errors.rs
+++ b/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
index c2d5fe001fc..c2d5fe001fc 100644
--- a/src/test/ui/compile-fail-migration/refutable-pattern-errors.stderr
+++ b/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
index be42f0f0ed8..be42f0f0ed8 100644
--- a/src/test/ui/compile-fail-migration/refutable-pattern-in-fn-arg.rs
+++ b/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
index e03532667f5..e03532667f5 100644
--- a/src/test/ui/compile-fail-migration/refutable-pattern-in-fn-arg.stderr
+++ b/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
index 6be65a5e359..6be65a5e359 100644
--- a/src/test/ui/compile-fail-migration/regions-fn-subtyping-return-static.rs
+++ b/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
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
index f49ac4fc8e4..f49ac4fc8e4 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/rbmtp_cross_crate_lib.rs
+++ b/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
index 5f386e58fac..5f386e58fac 100644
--- 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
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
index 23dc39db129..23dc39db129 100644
--- 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
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
index 5f386e58fac..5f386e58fac 100644
--- 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
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
index 642e90f6de8..642e90f6de8 100644
--- 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
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
index d0d6bd4c785..d0d6bd4c785 100644
--- 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
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
index 4fda8ec3f38..4fda8ec3f38 100644
--- a/src/test/ui/region-borrow-params-issue-29793-small.rs
+++ b/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
index cfe38fe2004..cfe38fe2004 100644
--- a/src/test/ui/region-borrow-params-issue-29793-small.stderr
+++ b/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
index c1df057b396..c1df057b396 100644
--- 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
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
index 585ccf465d8..585ccf465d8 100644
--- 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
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
index da6ebaaefad..da6ebaaefad 100644
--- 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
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
index b73c283fa51..b73c283fa51 100644
--- 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
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
index 7adf68ee9b6..7adf68ee9b6 100644
--- 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
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
index 3115e5a9a43..3115e5a9a43 100644
--- 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
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
index ce9dd59bbf5..ce9dd59bbf5 100644
--- 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
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
index fd8d5ff9e7e..fd8d5ff9e7e 100644
--- 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
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
index 7d1a836c674..7d1a836c674 100644
--- 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
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
index 9fc12ae05b4..9fc12ae05b4 100644
--- 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
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
index 646ae8183a2..646ae8183a2 100644
--- a/src/test/ui/compile-fail-migration/region-invariant-static-error-reporting.rs
+++ b/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
index a1f65561d3e..a1f65561d3e 100644
--- a/src/test/ui/compile-fail-migration/region-invariant-static-error-reporting.stderr
+++ b/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
index 91243478313..91243478313 100644
--- 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
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
index e3d96f52e81..e3d96f52e81 100644
--- 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
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
index 0ca7ee8d8a5..0ca7ee8d8a5 100644
--- 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
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
index 655b199fc65..655b199fc65 100644
--- 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
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
index d8d12444ddd..d8d12444ddd 100644
--- 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
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
index 26e24b2ed16..26e24b2ed16 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/region-object-lifetime-1.rs b/src/test/ui/regions/region-object-lifetime-1.rs
index 1e615be9d6a..1e615be9d6a 100644
--- a/src/test/ui/compile-fail-migration/region-object-lifetime-1.rs
+++ b/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
index 39deed32c76..39deed32c76 100644
--- a/src/test/ui/compile-fail-migration/region-object-lifetime-1.stderr
+++ b/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
index 4395fee02c4..4395fee02c4 100644
--- a/src/test/ui/compile-fail-migration/region-object-lifetime-2.nll.stderr
+++ b/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
index e011b8f5697..e011b8f5697 100644
--- a/src/test/ui/compile-fail-migration/region-object-lifetime-2.rs
+++ b/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
index e396680f99b..e396680f99b 100644
--- a/src/test/ui/compile-fail-migration/region-object-lifetime-2.stderr
+++ b/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
index 84dd97643a1..84dd97643a1 100644
--- a/src/test/ui/compile-fail-migration/region-object-lifetime-3.rs
+++ b/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
index 9431e8f5291..9431e8f5291 100644
--- a/src/test/ui/compile-fail-migration/region-object-lifetime-3.stderr
+++ b/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
index 7bae6ccb37c..7bae6ccb37c 100644
--- a/src/test/ui/compile-fail-migration/region-object-lifetime-4.nll.stderr
+++ b/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
index 0a68e7f1076..0a68e7f1076 100644
--- a/src/test/ui/compile-fail-migration/region-object-lifetime-4.rs
+++ b/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
index ef62afbef3b..ef62afbef3b 100644
--- a/src/test/ui/compile-fail-migration/region-object-lifetime-4.stderr
+++ b/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
index 3bfa5ec3941..3bfa5ec3941 100644
--- a/src/test/ui/compile-fail-migration/region-object-lifetime-5.nll.stderr
+++ b/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
index 26aad0e33b1..26aad0e33b1 100644
--- a/src/test/ui/compile-fail-migration/region-object-lifetime-5.rs
+++ b/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
index 2dbdacfacdc..2dbdacfacdc 100644
--- a/src/test/ui/compile-fail-migration/region-object-lifetime-5.stderr
+++ b/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
index 87a0a3267ef..87a0a3267ef 100644
--- 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
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
index 5bf397ab383..5bf397ab383 100644
--- a/src/test/ui/compile-fail-migration/region-object-lifetime-in-coercion.rs
+++ b/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
index ac8c4d3a16a..ac8c4d3a16a 100644
--- a/src/test/ui/compile-fail-migration/region-object-lifetime-in-coercion.stderr
+++ b/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
index 9bfc80c9459..9bfc80c9459 100644
--- a/src/test/ui/compile-fail-migration/regions-addr-of-arg.nll.stderr
+++ b/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
index c54b4aaace5..c54b4aaace5 100644
--- a/src/test/ui/compile-fail-migration/regions-addr-of-arg.rs
+++ b/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
index 9158a4ac7a7..9158a4ac7a7 100644
--- a/src/test/ui/compile-fail-migration/regions-addr-of-arg.stderr
+++ b/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
index cad1384f198..cad1384f198 100644
--- a/src/test/ui/compile-fail-migration/regions-addr-of-self.nll.stderr
+++ b/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
index 04ee0526403..04ee0526403 100644
--- a/src/test/ui/compile-fail-migration/regions-addr-of-self.rs
+++ b/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
index 387aeeb8a5b..387aeeb8a5b 100644
--- a/src/test/ui/compile-fail-migration/regions-addr-of-self.stderr
+++ b/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
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
index 28491f1155c..28491f1155c 100644
--- a/src/test/ui/compile-fail-migration/regions-addr-of-upvar-self.rs
+++ b/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
index 35e721288cd..35e721288cd 100644
--- a/src/test/ui/compile-fail-migration/regions-addr-of-upvar-self.stderr
+++ b/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
index f342155c8b1..f342155c8b1 100644
--- a/src/test/ui/compile-fail-migration/regions-adjusted-lvalue-op.nll.stderr
+++ b/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
index bb02d6d8bba..bb02d6d8bba 100644
--- a/src/test/ui/compile-fail-migration/regions-adjusted-lvalue-op.rs
+++ b/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
index 95228d9ccbb..95228d9ccbb 100644
--- a/src/test/ui/compile-fail-migration/regions-adjusted-lvalue-op.stderr
+++ b/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
index 96eb65daaff..96eb65daaff 100644
--- 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
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
index 7b7881d6ea7..7b7881d6ea7 100644
--- 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
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
index f921eccef1f..f921eccef1f 100644
--- 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
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
index 2261e92166e..2261e92166e 100644
--- 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
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
index 1cf83b8ac58..1cf83b8ac58 100644
--- 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
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
index a7ae685c3a4..a7ae685c3a4 100644
--- 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
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
index 8a15656f8a7..8a15656f8a7 100644
--- 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
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
index 2cd82707a2a..2cd82707a2a 100644
--- 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
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
index 553eedec398..553eedec398 100644
--- 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
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
index 24e4c5fbd91..24e4c5fbd91 100644
--- 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
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
index 898629d8ab9..898629d8ab9 100644
--- 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
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
index adcf4921e53..adcf4921e53 100644
--- 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
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
index 3e9d2aa6c3b..3e9d2aa6c3b 100644
--- 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
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
index f9f9c38b1b6..f9f9c38b1b6 100644
--- 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
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
index b53c80c3963..b53c80c3963 100644
--- a/src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters.rs
+++ b/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
index b8953a1719c..b8953a1719c 100644
--- a/src/test/ui/compile-fail-migration/regions-bounded-method-type-parameters.stderr
+++ b/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
index 4d4a30a88c6..4d4a30a88c6 100644
--- a/src/test/ui/compile-fail-migration/regions-bounds.nll.stderr
+++ b/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
index 5ce80be98d9..5ce80be98d9 100644
--- a/src/test/ui/compile-fail-migration/regions-bounds.rs
+++ b/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
index 7d5a47c0df3..7d5a47c0df3 100644
--- a/src/test/ui/compile-fail-migration/regions-bounds.stderr
+++ b/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
index 5bec650a41d..5bec650a41d 100644
--- 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
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
index 6b88abfca6c..6b88abfca6c 100644
--- 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
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
index 9d56de4c152..9d56de4c152 100644
--- 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
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
index 84e486872a7..84e486872a7 100644
--- 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
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
index 5d9818d624b..5d9818d624b 100644
--- 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
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
index bd05a63c398..bd05a63c398 100644
--- 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
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
index 5258dbe793a..5258dbe793a 100644
--- 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
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
index 6cef9956655..6cef9956655 100644
--- 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
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
index b2e44cd2c77..b2e44cd2c77 100644
--- 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
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
index 62504ab8d80..62504ab8d80 100644
--- 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
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
index 3004245b15a..3004245b15a 100644
--- 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
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
index 9e412e50da9..9e412e50da9 100644
--- 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
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
index 62146778f68..62146778f68 100644
--- 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
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
index bc5b7b7cf78..bc5b7b7cf78 100644
--- 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
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
index 15e53f1b54d..15e53f1b54d 100644
--- 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
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
index d7f9253d0b4..d7f9253d0b4 100644
--- 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
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
index 6cbe5234ce0..6cbe5234ce0 100644
--- 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
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
index 2c3cc603e04..2c3cc603e04 100644
--- 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
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
index ff74d46b011..ff74d46b011 100644
--- 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
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
index b70ec59420d..b70ec59420d 100644
--- 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
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
index 9158cf26838..9158cf26838 100644
--- 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
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
index 9e0dd9da0e4..9e0dd9da0e4 100644
--- 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
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
index ad6c5a31bbb..ad6c5a31bbb 100644
--- 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
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
index f85041e8ced..f85041e8ced 100644
--- 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
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
index 260a4067e10..260a4067e10 100644
--- 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
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
index c9063405bd7..c9063405bd7 100644
--- a/src/test/ui/compile-fail-migration/regions-close-param-into-object.rs
+++ b/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
index 72ed7ac9448..72ed7ac9448 100644
--- a/src/test/ui/compile-fail-migration/regions-close-param-into-object.stderr
+++ b/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
index 58dff9c6c37..58dff9c6c37 100644
--- a/src/test/ui/compile-fail-migration/regions-creating-enums.nll.stderr
+++ b/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
index ad2dc28afef..ad2dc28afef 100644
--- a/src/test/ui/compile-fail-migration/regions-creating-enums.rs
+++ b/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
index 7b0847739d7..7b0847739d7 100644
--- a/src/test/ui/compile-fail-migration/regions-creating-enums.stderr
+++ b/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
index 9b327100667..9b327100667 100644
--- a/src/test/ui/compile-fail-migration/regions-creating-enums3.nll.stderr
+++ b/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
index dcc579d26c1..dcc579d26c1 100644
--- a/src/test/ui/compile-fail-migration/regions-creating-enums3.rs
+++ b/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
index b2cca9a3c62..b2cca9a3c62 100644
--- a/src/test/ui/compile-fail-migration/regions-creating-enums3.stderr
+++ b/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
index 6a3554b41a7..6a3554b41a7 100644
--- a/src/test/ui/compile-fail-migration/regions-creating-enums4.nll.stderr
+++ b/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
index 5dc9b370f32..5dc9b370f32 100644
--- a/src/test/ui/compile-fail-migration/regions-creating-enums4.rs
+++ b/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
index 729dc2f107a..729dc2f107a 100644
--- a/src/test/ui/compile-fail-migration/regions-creating-enums4.stderr
+++ b/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
index 0319d63d596..0319d63d596 100644
--- 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
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
index eaf9a750570..eaf9a750570 100644
--- a/src/test/ui/compile-fail-migration/regions-early-bound-error-method.rs
+++ b/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
index 6c542ef5ddf..6c542ef5ddf 100644
--- a/src/test/ui/compile-fail-migration/regions-early-bound-error-method.stderr
+++ b/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
index b19de2201f7..b19de2201f7 100644
--- a/src/test/ui/compile-fail-migration/regions-early-bound-error.nll.stderr
+++ b/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
index 90a33950047..90a33950047 100644
--- a/src/test/ui/compile-fail-migration/regions-early-bound-error.rs
+++ b/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
index 579a7c91e43..579a7c91e43 100644
--- a/src/test/ui/compile-fail-migration/regions-early-bound-error.stderr
+++ b/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
index e21f92bc9b8..e21f92bc9b8 100644
--- a/src/test/ui/compile-fail-migration/regions-enum-not-wf.rs
+++ b/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
index 381a8aada5a..381a8aada5a 100644
--- a/src/test/ui/compile-fail-migration/regions-enum-not-wf.stderr
+++ b/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
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
index e3771cfebba..e3771cfebba 100644
--- a/src/test/ui/compile-fail-migration/regions-escape-method.rs
+++ b/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
index fb0bf845f3b..fb0bf845f3b 100644
--- a/src/test/ui/compile-fail-migration/regions-escape-method.stderr
+++ b/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
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
index a4363b00e1c..a4363b00e1c 100644
--- 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
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
index 60bd14ba4d7..60bd14ba4d7 100644
--- 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
diff --git a/src/test/ui/regions-fn-subtyping-return-static.rs b/src/test/ui/regions/regions-fn-subtyping-return-static.rs
index 90985111867..90985111867 100644
--- a/src/test/ui/regions-fn-subtyping-return-static.rs
+++ b/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
index bd10dc8a808..bd10dc8a808 100644
--- a/src/test/ui/regions-fn-subtyping-return-static.stderr
+++ b/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
index bd31d1a5a90..bd31d1a5a90 100644
--- 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
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
index 70970a9cf3b..70970a9cf3b 100644
--- 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
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
index 25f2e1a5657..25f2e1a5657 100644
--- 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
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
index 073a4f79b05..073a4f79b05 100644
--- a/src/test/ui/compile-fail-migration/regions-free-region-ordering-callee.rs
+++ b/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
index 13d94f91c6d..13d94f91c6d 100644
--- a/src/test/ui/compile-fail-migration/regions-free-region-ordering-callee.stderr
+++ b/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
index ee6cd6c4b15..ee6cd6c4b15 100644
--- a/src/test/ui/compile-fail-migration/regions-free-region-ordering-caller.rs
+++ b/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
index 96502b69c08..96502b69c08 100644
--- a/src/test/ui/compile-fail-migration/regions-free-region-ordering-caller.stderr
+++ b/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
index acf7a033ade..acf7a033ade 100644
--- 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
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
index b29518ccdab..b29518ccdab 100644
--- a/src/test/ui/compile-fail-migration/regions-free-region-ordering-caller1.rs
+++ b/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
index c0dff6ec384..c0dff6ec384 100644
--- a/src/test/ui/compile-fail-migration/regions-free-region-ordering-caller1.stderr
+++ b/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
index 34fcd91b319..34fcd91b319 100644
--- 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
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
index 9cb61c24922..9cb61c24922 100644
--- a/src/test/ui/compile-fail-migration/regions-free-region-ordering-incorrect.rs
+++ b/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
index 3dce04e2452..3dce04e2452 100644
--- a/src/test/ui/compile-fail-migration/regions-free-region-ordering-incorrect.stderr
+++ b/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
index 93e8bd75bdb..93e8bd75bdb 100644
--- a/src/test/ui/compile-fail-migration/regions-glb-free-free.nll.stderr
+++ b/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
index 843c5f512f8..843c5f512f8 100644
--- a/src/test/ui/compile-fail-migration/regions-glb-free-free.rs
+++ b/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
index 48c95a88654..48c95a88654 100644
--- a/src/test/ui/compile-fail-migration/regions-glb-free-free.stderr
+++ b/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
index 01de3ddcdf8..01de3ddcdf8 100644
--- 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
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
index e6efb4d5c6b..e6efb4d5c6b 100644
--- 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
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
index b3037a1e187..b3037a1e187 100644
--- 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
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
index 7a38797e469..7a38797e469 100644
--- 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
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
index a2e6de21376..a2e6de21376 100644
--- 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
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
index 1a12697a474..1a12697a474 100644
--- 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
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
index b8582f8c26b..b8582f8c26b 100644
--- 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
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
index 85b1702e2a0..85b1702e2a0 100644
--- 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
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
index fd186d16559..fd186d16559 100644
--- 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
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
index 172a3cdeade..172a3cdeade 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/regions-in-enums-anon.rs b/src/test/ui/regions/regions-in-enums-anon.rs
index 305bf88c4d5..305bf88c4d5 100644
--- a/src/test/ui/compile-fail-migration/regions-in-enums-anon.rs
+++ b/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
index f5630f84aed..f5630f84aed 100644
--- a/src/test/ui/compile-fail-migration/regions-in-enums-anon.stderr
+++ b/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
index 613a90dda67..613a90dda67 100644
--- a/src/test/ui/compile-fail-migration/regions-in-enums.rs
+++ b/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
index cdc0b6ca122..cdc0b6ca122 100644
--- a/src/test/ui/compile-fail-migration/regions-in-enums.stderr
+++ b/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
index b85928b1b9f..b85928b1b9f 100644
--- a/src/test/ui/compile-fail-migration/regions-in-structs-anon.rs
+++ b/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
index ecfac87c6c0..ecfac87c6c0 100644
--- a/src/test/ui/compile-fail-migration/regions-in-structs-anon.stderr
+++ b/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
index c231d3a913e..c231d3a913e 100644
--- a/src/test/ui/compile-fail-migration/regions-in-structs.rs
+++ b/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
index 679a219fbb1..679a219fbb1 100644
--- a/src/test/ui/compile-fail-migration/regions-in-structs.stderr
+++ b/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
index 6bc3dafea51..6bc3dafea51 100644
--- 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
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
index ec73bf90b6e..ec73bf90b6e 100644
--- 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
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
index f129ffae23a..f129ffae23a 100644
--- 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
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
index 28bf252bc95..28bf252bc95 100644
--- 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
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
index 2628e6a1ce2..2628e6a1ce2 100644
--- 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
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
index 4c4a9b91958..4c4a9b91958 100644
--- 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
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
index c71bd17ac78..c71bd17ac78 100644
--- 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
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
index 23b8ebfe54b..23b8ebfe54b 100644
--- 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
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
index 7b30f9a58f5..7b30f9a58f5 100644
--- 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
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
index 25f69031507..25f69031507 100644
--- 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
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
index f7a91054766..f7a91054766 100644
--- a/src/test/ui/compile-fail-migration/regions-infer-bound-from-trait.rs
+++ b/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
index 4c89f4bd8a8..4c89f4bd8a8 100644
--- a/src/test/ui/compile-fail-migration/regions-infer-bound-from-trait.stderr
+++ b/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
index c8665fe6a11..c8665fe6a11 100644
--- a/src/test/ui/compile-fail-migration/regions-infer-call-3.nll.stderr
+++ b/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
index 95783a420b6..95783a420b6 100644
--- a/src/test/ui/compile-fail-migration/regions-infer-call-3.rs
+++ b/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
index d42e5bfc7dd..d42e5bfc7dd 100644
--- a/src/test/ui/compile-fail-migration/regions-infer-call-3.stderr
+++ b/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
index a16001b5788..a16001b5788 100644
--- 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
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
index 675cbc58583..675cbc58583 100644
--- 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
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
index f794063610a..f794063610a 100644
--- 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
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
index 6b3673a8002..6b3673a8002 100644
--- 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
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
index 86a7e1f2c48..86a7e1f2c48 100644
--- 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
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
index 8c191fbd5bb..8c191fbd5bb 100644
--- 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
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
index edd37b1622a..edd37b1622a 100644
--- 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
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
index a021239af1e..a021239af1e 100644
--- 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
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
index f280e4d978e..f280e4d978e 100644
--- 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
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
index 3a807b755af..3a807b755af 100644
--- 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
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
index 20e0e730c02..20e0e730c02 100644
--- 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
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
index 87b5efbfadd..87b5efbfadd 100644
--- 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
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
index fb47433ba17..fb47433ba17 100644
--- 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
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
index deeca293a1a..deeca293a1a 100644
--- a/src/test/ui/compile-fail-migration/regions-infer-not-param.nll.stderr
+++ b/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
index 131b7170951..131b7170951 100644
--- a/src/test/ui/compile-fail-migration/regions-infer-not-param.rs
+++ b/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
index 2a029518953..2a029518953 100644
--- a/src/test/ui/compile-fail-migration/regions-infer-not-param.stderr
+++ b/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
index 01ae2910bd5..01ae2910bd5 100644
--- a/src/test/ui/compile-fail-migration/regions-infer-paramd-indirect.nll.stderr
+++ b/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
index c559992c865..c559992c865 100644
--- a/src/test/ui/compile-fail-migration/regions-infer-paramd-indirect.rs
+++ b/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
index 602f30957f1..602f30957f1 100644
--- a/src/test/ui/compile-fail-migration/regions-infer-paramd-indirect.stderr
+++ b/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
index fa358a9cc45..fa358a9cc45 100644
--- 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
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
index ee5d5cad0a3..ee5d5cad0a3 100644
--- a/src/test/ui/compile-fail-migration/regions-infer-proc-static-upvar.rs
+++ b/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
index 93fe45ed300..93fe45ed300 100644
--- a/src/test/ui/compile-fail-migration/regions-infer-proc-static-upvar.stderr
+++ b/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
index 01f0cfa4a71..01f0cfa4a71 100644
--- 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
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
index 5955619ea92..5955619ea92 100644
--- a/src/test/ui/compile-fail-migration/regions-lifetime-bounds-on-fns.rs
+++ b/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
index 1b600ef905f..1b600ef905f 100644
--- a/src/test/ui/compile-fail-migration/regions-lifetime-bounds-on-fns.stderr
+++ b/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
index 46c486c63a3..46c486c63a3 100644
--- 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
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
index 390173ed749..390173ed749 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/regions-name-duplicated.rs b/src/test/ui/regions/regions-name-duplicated.rs
index b4b9cfd75cb..b4b9cfd75cb 100644
--- a/src/test/ui/compile-fail-migration/regions-name-duplicated.rs
+++ b/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
index ad945d54ad1..ad945d54ad1 100644
--- a/src/test/ui/compile-fail-migration/regions-name-duplicated.stderr
+++ b/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
index 69d63f3820c..69d63f3820c 100644
--- a/src/test/ui/compile-fail-migration/regions-name-static.rs
+++ b/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
index 48077d61c45..48077d61c45 100644
--- a/src/test/ui/compile-fail-migration/regions-name-static.stderr
+++ b/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
index a61d3094933..a61d3094933 100644
--- a/src/test/ui/compile-fail-migration/regions-name-undeclared.rs
+++ b/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
index 62fc5f5c7f7..62fc5f5c7f7 100644
--- a/src/test/ui/compile-fail-migration/regions-name-undeclared.stderr
+++ b/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
index 1b5bb7d5007..1b5bb7d5007 100644
--- a/src/test/ui/regions-nested-fns-2.nll.stderr
+++ b/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
index e66b62b6fb1..e66b62b6fb1 100644
--- a/src/test/ui/regions-nested-fns-2.rs
+++ b/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
index c0aa6f9d542..c0aa6f9d542 100644
--- a/src/test/ui/regions-nested-fns-2.stderr
+++ b/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
index d90015b1b21..d90015b1b21 100644
--- a/src/test/ui/compile-fail-migration/regions-nested-fns.nll.stderr
+++ b/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
index 010b7d17688..010b7d17688 100644
--- a/src/test/ui/compile-fail-migration/regions-nested-fns.rs
+++ b/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
index 93004b4c3bf..93004b4c3bf 100644
--- a/src/test/ui/compile-fail-migration/regions-nested-fns.stderr
+++ b/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
index 68642598ed2..68642598ed2 100644
--- 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
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
index ec153f111d6..ec153f111d6 100644
--- 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
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
index db25a0698fe..db25a0698fe 100644
--- 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
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
index 5084097e30d..5084097e30d 100644
--- 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
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
index 403757042d2..403757042d2 100644
--- 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
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
index ce187eddfa9..ce187eddfa9 100644
--- 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
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
index cc294651db7..cc294651db7 100644
--- 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
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
index 8636b89b71a..8636b89b71a 100644
--- 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
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
index e269767cc16..e269767cc16 100644
--- 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
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
index c209547e20c..c209547e20c 100644
--- 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
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
index c7e6ace8b92..c7e6ace8b92 100644
--- 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
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
index 48980bdf832..48980bdf832 100644
--- 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
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
index 2fe6444c33a..2fe6444c33a 100644
--- 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
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
index e2b328886b3..e2b328886b3 100644
--- 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
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
index c4b631bce98..c4b631bce98 100644
--- 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
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
index 2bf04ffa64a..2bf04ffa64a 100644
--- 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
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
index 1c9489444a6..1c9489444a6 100644
--- 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
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
index af9f1d3722a..af9f1d3722a 100644
--- 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
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
index db1508a8c8b..db1508a8c8b 100644
--- 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
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
index ec0631a881a..ec0631a881a 100644
--- a/src/test/ui/compile-fail-migration/regions-outlives-projection-container-hrtb.rs
+++ b/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
index 32c9359b684..32c9359b684 100644
--- a/src/test/ui/compile-fail-migration/regions-outlives-projection-container-hrtb.stderr
+++ b/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
index 79300d5176e..79300d5176e 100644
--- a/src/test/ui/compile-fail-migration/regions-outlives-projection-container-wc.rs
+++ b/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
index d0680ecbb99..d0680ecbb99 100644
--- a/src/test/ui/compile-fail-migration/regions-outlives-projection-container-wc.stderr
+++ b/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
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
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<TheType<'b>>`, 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<TheType<'b>> = 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<TheType<'b>>`, 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<TheType<'b>> = 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<TheType<'b>>`, 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<TheType<'b>>>();
    |            ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-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<TheType<'b>>`, 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<TheType<'b>>>(); //~ 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
index 2d271b7be73..2d271b7be73 100644
--- a/src/test/ui/compile-fail-migration/regions-outlives-projection-hrtype.rs
+++ b/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
index ba4e318957e..ba4e318957e 100644
--- a/src/test/ui/compile-fail-migration/regions-outlives-projection-hrtype.stderr
+++ b/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
index 04682a77297..04682a77297 100644
--- a/src/test/ui/compile-fail-migration/regions-outlives-projection-trait-def.rs
+++ b/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
index 0a4cbe64d46..0a4cbe64d46 100644
--- a/src/test/ui/compile-fail-migration/regions-outlives-projection-trait-def.stderr
+++ b/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
index 94f7a350cf7..94f7a350cf7 100644
--- a/src/test/ui/compile-fail-migration/regions-outlives-scalar.rs
+++ b/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
index d754bdd6032..d754bdd6032 100644
--- a/src/test/ui/compile-fail-migration/regions-outlives-scalar.stderr
+++ b/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
index c39d007312f..c39d007312f 100644
--- 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
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
index 3401dd1becd..3401dd1becd 100644
--- a/src/test/ui/compile-fail-migration/regions-pattern-typing-issue-19552.rs
+++ b/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
index cefedefa243..cefedefa243 100644
--- a/src/test/ui/compile-fail-migration/regions-pattern-typing-issue-19552.stderr
+++ b/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
index 2acac5d5cf8..2acac5d5cf8 100644
--- 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
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
index c26a0369740..c26a0369740 100644
--- 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
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
index 2acac5d5cf8..2acac5d5cf8 100644
--- 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
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
index 1f23dcbb725..1f23dcbb725 100644
--- a/src/test/ui/compile-fail-migration/regions-pattern-typing-issue-19997.rs
+++ b/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
index 00728aa4783..00728aa4783 100644
--- a/src/test/ui/compile-fail-migration/regions-proc-bound-capture.nll.stderr
+++ b/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
index dd7b2bf9635..dd7b2bf9635 100644
--- a/src/test/ui/compile-fail-migration/regions-proc-bound-capture.rs
+++ b/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
index b38543bdc43..b38543bdc43 100644
--- a/src/test/ui/compile-fail-migration/regions-proc-bound-capture.stderr
+++ b/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
index 761fa6f32ff..761fa6f32ff 100644
--- 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
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
index f6f1a189e5e..f6f1a189e5e 100644
--- 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
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
index cddb60a4337..cddb60a4337 100644
--- 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
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
index c3eb6fd9097..c3eb6fd9097 100644
--- 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
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
index 7270b477d2d..7270b477d2d 100644
--- 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
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
index 9f8d0168ede..9f8d0168ede 100644
--- 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
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
index 87fe858769d..87fe858769d 100644
--- 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
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
index bc8060e3915..bc8060e3915 100644
--- a/src/test/ui/compile-fail-migration/regions-ref-in-fn-arg.rs
+++ b/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
index 0250f6e26fe..0250f6e26fe 100644
--- a/src/test/ui/compile-fail-migration/regions-ref-in-fn-arg.stderr
+++ b/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
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
index b8cebe66518..b8cebe66518 100644
--- a/src/test/ui/compile-fail-migration/regions-ret-borrowed-1.rs
+++ b/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
index ac886bcbc7c..ac886bcbc7c 100644
--- a/src/test/ui/compile-fail-migration/regions-ret-borrowed-1.stderr
+++ b/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
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
index 40909ddd4ad..40909ddd4ad 100644
--- a/src/test/ui/compile-fail-migration/regions-ret-borrowed.rs
+++ b/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
index 36c4ce7e174..36c4ce7e174 100644
--- a/src/test/ui/compile-fail-migration/regions-ret-borrowed.stderr
+++ b/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
index cacc119d410..cacc119d410 100644
--- a/src/test/ui/compile-fail-migration/regions-ret.nll.stderr
+++ b/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
index c7cd3ced98d..c7cd3ced98d 100644
--- a/src/test/ui/compile-fail-migration/regions-ret.rs
+++ b/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
index 84515a9b44c..84515a9b44c 100644
--- a/src/test/ui/compile-fail-migration/regions-ret.stderr
+++ b/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
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
index 99e5cc03153..99e5cc03153 100644
--- 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
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
index c841c9605bd..c841c9605bd 100644
--- 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
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
index b5d4e07d04b..b5d4e07d04b 100644
--- a/src/test/ui/compile-fail-migration/regions-return-stack-allocated-vec.rs
+++ b/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
index 77c1d177acb..77c1d177acb 100644
--- a/src/test/ui/compile-fail-migration/regions-return-stack-allocated-vec.stderr
+++ b/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
index aaae14fede6..aaae14fede6 100644
--- a/src/test/ui/compile-fail-migration/regions-static-bound.ll.nll.stderr
+++ b/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
index 4a11677765d..4a11677765d 100644
--- a/src/test/ui/compile-fail-migration/regions-static-bound.ll.stderr
+++ b/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
index aaae14fede6..aaae14fede6 100644
--- a/src/test/ui/compile-fail-migration/regions-static-bound.nll.stderr
+++ b/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
index 0a37df4f0c7..0a37df4f0c7 100644
--- a/src/test/ui/compile-fail-migration/regions-static-bound.rs
+++ b/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
index ed70e38362d..ed70e38362d 100644
--- a/src/test/ui/compile-fail-migration/regions-steal-closure.nll.stderr
+++ b/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
index 7ca63b9896f..7ca63b9896f 100644
--- a/src/test/ui/compile-fail-migration/regions-steal-closure.rs
+++ b/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
index 44843d19e92..44843d19e92 100644
--- a/src/test/ui/compile-fail-migration/regions-steal-closure.stderr
+++ b/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
index 9433b8b1952..9433b8b1952 100644
--- a/src/test/ui/compile-fail-migration/regions-struct-not-wf.lexical.stderr
+++ b/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
index 9433b8b1952..9433b8b1952 100644
--- a/src/test/ui/compile-fail-migration/regions-struct-not-wf.nll.stderr
+++ b/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
index 9106f1f0ba6..9106f1f0ba6 100644
--- a/src/test/ui/compile-fail-migration/regions-struct-not-wf.rs
+++ b/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
index 9cd08656b62..9cd08656b62 100644
--- a/src/test/ui/compile-fail-migration/regions-trait-1.rs
+++ b/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
index dbc47a55950..dbc47a55950 100644
--- a/src/test/ui/compile-fail-migration/regions-trait-1.stderr
+++ b/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
index 3d884f6fc5f..3d884f6fc5f 100644
--- a/src/test/ui/compile-fail-migration/regions-trait-object-subtyping.nll.stderr
+++ b/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
index 948fb7e1ef6..948fb7e1ef6 100644
--- a/src/test/ui/compile-fail-migration/regions-trait-object-subtyping.rs
+++ b/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
index 1b078855efd..1b078855efd 100644
--- a/src/test/ui/compile-fail-migration/regions-trait-object-subtyping.stderr
+++ b/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
index c610394c51b..c610394c51b 100644
--- a/src/test/ui/compile-fail-migration/regions-trait-variance.nll.stderr
+++ b/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
index 9ba4ef4e358..9ba4ef4e358 100644
--- a/src/test/ui/compile-fail-migration/regions-trait-variance.rs
+++ b/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
index cd48d6bf8af..cd48d6bf8af 100644
--- a/src/test/ui/compile-fail-migration/regions-trait-variance.stderr
+++ b/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
index 31908751580..31908751580 100644
--- a/src/test/ui/compile-fail-migration/regions-undeclared.rs
+++ b/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
index 9870f328abe..9870f328abe 100644
--- a/src/test/ui/compile-fail-migration/regions-undeclared.stderr
+++ b/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
index 54b1a6fa970..54b1a6fa970 100644
--- 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
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
index 031091c4523..031091c4523 100644
--- 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
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
index 92a6451c3bd..92a6451c3bd 100644
--- 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
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
index a028bae4001..a028bae4001 100644
--- 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
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
index fd1d3ab99f3..fd1d3ab99f3 100644
--- 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
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
index 84c4e52a9c0..84c4e52a9c0 100644
--- a/src/test/ui/compile-fail-migration/regions-variance-contravariant-use-covariant.rs
+++ b/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
index a1e4913aa3a..a1e4913aa3a 100644
--- a/src/test/ui/compile-fail-migration/regions-variance-contravariant-use-covariant.stderr
+++ b/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
index 824a442c87d..824a442c87d 100644
--- a/src/test/ui/compile-fail-migration/regions-variance-covariant-use-contravariant.rs
+++ b/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
index fc1c6c304f8..fc1c6c304f8 100644
--- a/src/test/ui/compile-fail-migration/regions-variance-covariant-use-contravariant.stderr
+++ b/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
index 9c6db331c01..9c6db331c01 100644
--- a/src/test/ui/compile-fail-migration/regions-variance-invariant-use-contravariant.rs
+++ b/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
index 6b67e6b192e..6b67e6b192e 100644
--- a/src/test/ui/compile-fail-migration/regions-variance-invariant-use-contravariant.stderr
+++ b/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
index ed393de357a..ed393de357a 100644
--- a/src/test/ui/compile-fail-migration/regions-variance-invariant-use-covariant.rs
+++ b/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
index 5b50f4bd513..5b50f4bd513 100644
--- a/src/test/ui/compile-fail-migration/regions-variance-invariant-use-covariant.stderr
+++ b/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
index 39b8482cfa3..39b8482cfa3 100644
--- a/src/test/ui/compile-fail-migration/regions-wf-trait-object.rs
+++ b/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
index caaa902abbe..caaa902abbe 100644
--- a/src/test/ui/compile-fail-migration/regions-wf-trait-object.stderr
+++ b/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
index 1ea956bbd54..1ea956bbd54 100644
--- a/src/test/ui/compile-fail-migration/reject-specialized-drops-8142.rs
+++ b/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
index c0f1525a761..c0f1525a761 100644
--- a/src/test/ui/compile-fail-migration/reject-specialized-drops-8142.stderr
+++ b/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
index 88441594a7e..88441594a7e 100644
--- a/src/test/ui/compile-fail-migration/repeat-to-run-dtor-twice.rs
+++ b/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
index 408c28af10e..408c28af10e 100644
--- a/src/test/ui/compile-fail-migration/repeat-to-run-dtor-twice.stderr
+++ b/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
index a716f3e29d4..a716f3e29d4 100644
--- a/src/test/ui/compile-fail-migration/repeat_count.rs
+++ b/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
index 4852023ec8b..4852023ec8b 100644
--- a/src/test/ui/compile-fail-migration/repeat_count.stderr
+++ b/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
index 62147e7625e..62147e7625e 100644
--- a/src/test/ui/repr-align-assign.fixed
+++ b/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
index 3bc3b5c64ce..3bc3b5c64ce 100644
--- a/src/test/ui/repr-align-assign.rs
+++ b/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
index c325b6968fe..c325b6968fe 100644
--- a/src/test/ui/repr-align-assign.stderr
+++ b/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
index 9b0408de2a4..9b0408de2a4 100644
--- a/src/test/ui/compile-fail-migration/repr-align.rs
+++ b/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
index 2195789bd69..2195789bd69 100644
--- a/src/test/ui/compile-fail-migration/repr-align.stderr
+++ b/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
index 27890333a51..27890333a51 100644
--- a/src/test/ui/compile-fail-migration/repr-packed-contains-align.rs
+++ b/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
index 4558cf2e104..4558cf2e104 100644
--- a/src/test/ui/compile-fail-migration/repr-packed-contains-align.stderr
+++ b/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
index 685d62dc3a9..685d62dc3a9 100644
--- a/src/test/ui/compile-fail-migration/repr-transparent-other-items.rs
+++ b/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
index e5889cf53e5..e5889cf53e5 100644
--- a/src/test/ui/compile-fail-migration/repr-transparent-other-items.stderr
+++ b/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
index a391c0ae1f8..a391c0ae1f8 100644
--- a/src/test/ui/compile-fail-migration/repr-transparent-other-reprs.rs
+++ b/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
index 40f41c474db..40f41c474db 100644
--- a/src/test/ui/compile-fail-migration/repr-transparent-other-reprs.stderr
+++ b/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
index 4d8ec4cdb40..4d8ec4cdb40 100644
--- a/src/test/ui/compile-fail-migration/repr-transparent.rs
+++ b/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
index 0f620880fa9..0f620880fa9 100644
--- a/src/test/ui/compile-fail-migration/repr-transparent.stderr
+++ b/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
index ce40702b3dc..ce40702b3dc 100644
--- a/src/test/ui/compile-fail-migration/required-lang-item.rs
+++ b/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
index 83764a91ac7..83764a91ac7 100644
--- a/src/test/ui/compile-fail-migration/required-lang-item.stderr
+++ b/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
index db8f82a70e1..db8f82a70e1 100644
--- a/src/test/ui/compile-fail-migration/reserved-attr-on-macro.rs
+++ b/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
index e8bfcc04f48..e8bfcc04f48 100644
--- a/src/test/ui/compile-fail-migration/reserved-attr-on-macro.stderr
+++ b/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
index bcda61e363d..bcda61e363d 100644
--- a/src/test/ui/compile-fail-migration/reserved-become.rs
+++ b/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
index fa9a9601208..fa9a9601208 100644
--- a/src/test/ui/compile-fail-migration/reserved-become.stderr
+++ b/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
index 370782fc7d9..370782fc7d9 100644
--- a/src/test/ui/compile-fail-migration/resolve-bad-import-prefix.rs
+++ b/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
index 76d0c035335..76d0c035335 100644
--- a/src/test/ui/compile-fail-migration/resolve-bad-import-prefix.stderr
+++ b/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
index 420a45a2147..420a45a2147 100644
--- a/src/test/ui/compile-fail-migration/resolve-bad-visibility.rs
+++ b/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
index aa4817163e3..aa4817163e3 100644
--- a/src/test/ui/compile-fail-migration/resolve-bad-visibility.stderr
+++ b/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
index 6a04a2c3704..6a04a2c3704 100644
--- 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
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
index 5f21b4413e7..5f21b4413e7 100644
--- 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
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
index 91cf1d35954..91cf1d35954 100644
--- 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
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
index 9978e75af30..9978e75af30 100644
--- 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
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
index 8db9023310e..8db9023310e 100644
--- a/src/test/ui/compile-fail-migration/resolve-conflict-import-vs-import.rs
+++ b/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
index 80ccb9aa2b3..80ccb9aa2b3 100644
--- a/src/test/ui/compile-fail-migration/resolve-conflict-import-vs-import.stderr
+++ b/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
index b50a60d39c8..b50a60d39c8 100644
--- 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
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
index d9ad248c013..d9ad248c013 100644
--- 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
diff --git a/src/test/ui/resolve-conflict-item-vs-import.rs b/src/test/ui/resolve/resolve-conflict-item-vs-import.rs
index 4e74ab95d61..4e74ab95d61 100644
--- a/src/test/ui/resolve-conflict-item-vs-import.rs
+++ b/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
index 5ef4bdf4aad..5ef4bdf4aad 100644
--- a/src/test/ui/resolve-conflict-item-vs-import.stderr
+++ b/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
index bbb6ee622b1..bbb6ee622b1 100644
--- a/src/test/ui/compile-fail-migration/resolve-conflict-type-vs-import.rs
+++ b/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
index 1e8df8f8ea7..1e8df8f8ea7 100644
--- a/src/test/ui/compile-fail-migration/resolve-conflict-type-vs-import.stderr
+++ b/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
index 63d33a9e5fa..63d33a9e5fa 100644
--- a/src/test/ui/compile-fail-migration/resolve-inconsistent-binding-mode.rs
+++ b/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
index e36eea26fcf..e36eea26fcf 100644
--- a/src/test/ui/compile-fail-migration/resolve-inconsistent-binding-mode.stderr
+++ b/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
index 79d78b4ca59..79d78b4ca59 100644
--- a/src/test/ui/resolve-inconsistent-names.rs
+++ b/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
index 17caac210d4..17caac210d4 100644
--- a/src/test/ui/resolve-inconsistent-names.stderr
+++ b/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
index 6695e972f33..6695e972f33 100644
--- a/src/test/ui/compile-fail-migration/resolve-label.rs
+++ b/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
index a7b89752f5e..a7b89752f5e 100644
--- a/src/test/ui/compile-fail-migration/resolve-label.stderr
+++ b/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
index c1584b0bdcd..c1584b0bdcd 100644
--- a/src/test/ui/compile-fail-migration/resolve-primitive-fallback.rs
+++ b/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
index 2d852369afc..2d852369afc 100644
--- a/src/test/ui/compile-fail-migration/resolve-primitive-fallback.stderr
+++ b/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
index adc208a0202..adc208a0202 100644
--- a/src/test/ui/compile-fail-migration/resolve-self-in-impl-2.rs
+++ b/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
index 183b9b66327..183b9b66327 100644
--- a/src/test/ui/compile-fail-migration/resolve-self-in-impl-2.stderr
+++ b/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
index 2a894c57b8d..2a894c57b8d 100644
--- a/src/test/ui/compile-fail-migration/resolve-self-in-impl.rs
+++ b/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
index 3fa384808db..3fa384808db 100644
--- a/src/test/ui/compile-fail-migration/resolve-self-in-impl.stderr
+++ b/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
index a1572b85666..a1572b85666 100644
--- 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
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
index 73ee7102e6e..73ee7102e6e 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/resolve-unknown-trait.rs b/src/test/ui/resolve/resolve-unknown-trait.rs
index 9432e727fa5..9432e727fa5 100644
--- a/src/test/ui/compile-fail-migration/resolve-unknown-trait.rs
+++ b/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
index 8a2d791654d..8a2d791654d 100644
--- a/src/test/ui/compile-fail-migration/resolve-unknown-trait.stderr
+++ b/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
index 869eed5a8d7..869eed5a8d7 100644
--- a/src/test/ui/compile-fail-migration/resolve-variant-assoc-item.rs
+++ b/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
index a80a7c39249..a80a7c39249 100644
--- a/src/test/ui/compile-fail-migration/resolve-variant-assoc-item.stderr
+++ b/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
index a89fd802baf..a89fd802baf 100644
--- a/src/test/ui/compile-fail-migration/resolve_self_super_hint.rs
+++ b/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
index 8538da06baf..8538da06baf 100644
--- a/src/test/ui/compile-fail-migration/resolve_self_super_hint.stderr
+++ b/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
index 6be98fbd827..6be98fbd827 100644
--- a/src/test/ui/compile-fail-migration/ret-non-nil.rs
+++ b/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
index 01f126bd11e..01f126bd11e 100644
--- a/src/test/ui/compile-fail-migration/ret-non-nil.stderr
+++ b/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
index c5e26a26744..c5e26a26744 100644
--- a/src/test/ui/compile-fail-migration/retslot-cast.rs
+++ b/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
index 34f6e11f614..34f6e11f614 100644
--- a/src/test/ui/compile-fail-migration/retslot-cast.stderr
+++ b/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
index cec59faa918..cec59faa918 100644
--- a/src/test/ui/compile-fail-migration/return-from-diverging.rs
+++ b/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
index d965d734327..d965d734327 100644
--- a/src/test/ui/compile-fail-migration/return-from-diverging.stderr
+++ b/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
index 45fc571d79d..45fc571d79d 100644
--- a/src/test/ui/return-match-array-const.rs
+++ b/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
index 044dc8f5145..044dc8f5145 100644
--- a/src/test/ui/return-match-array-const.stderr
+++ b/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
index e63787949a4..e63787949a4 100644
--- a/src/test/ui/return-type.rs
+++ b/src/test/ui/return/return-type.rs
diff --git a/src/test/ui/return-type.stderr b/src/test/ui/return/return-type.stderr
index 7d7653eee28..7d7653eee28 100644
--- a/src/test/ui/return-type.stderr
+++ b/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
index ae2a325b24a..ae2a325b24a 100644
--- a/src/test/ui/compile-fail-migration/return-unit-from-diverging.rs
+++ b/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
index 38d4ca37366..38d4ca37366 100644
--- a/src/test/ui/compile-fail-migration/return-unit-from-diverging.stderr
+++ b/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
index 49f5621de1b..49f5621de1b 100644
--- 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
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
index 6f780d1cf1d..6f780d1cf1d 100644
--- 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
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
index b5f5472b492..b5f5472b492 100644
--- 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
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
index e1b173725d4..e1b173725d4 100644
--- 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
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
index 12d1bf9ea91..12d1bf9ea91 100644
--- 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
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
index 4d083cc5315..4d083cc5315 100644
--- 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
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
index d04c1073ad9..d04c1073ad9 100644
--- 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
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
index 0c19210e4a0..0c19210e4a0 100644
--- a/src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/enum.rs
+++ b/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
index 5276746734d..5276746734d 100644
--- a/src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/enum.stderr
+++ b/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
index df4fe1e77e9..df4fe1e77e9 100644
--- 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
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
index d75ad9ec264..d75ad9ec264 100644
--- 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
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
index 74c9c7c61ac..74c9c7c61ac 100644
--- a/src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/structs.rs
+++ b/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
index c0f7e278671..c0f7e278671 100644
--- a/src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/structs.stderr
+++ b/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
index d1b65ac1f3e..d1b65ac1f3e 100644
--- a/src/test/ui/compile-fail-migration/rfc-2008-non-exhaustive/variants.rs
+++ b/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
index f4e4b1bb84b..f4e4b1bb84b 100644
--- 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
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
index 1e4e0943a69..1e4e0943a69 100644
--- 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
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
index 65f11c063ed..65f11c063ed 100644
--- 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
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
index f4d33e0b9db..f4d33e0b9db 100644
--- 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
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
index bdd03be4356..bdd03be4356 100644
--- 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
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
index e4d2db057f2..e4d2db057f2 100644
--- 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
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
index c3da4a51872..c3da4a51872 100644
--- 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
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
index 826bf675bd6..826bf675bd6 100644
--- 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
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
index 27a69ec1b1f..27a69ec1b1f 100644
--- 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
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
index 053bf92f4d1..053bf92f4d1 100644
--- 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
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
index eb96d5f05d7..eb96d5f05d7 100644
--- 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
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
index 1b9e5a75e83..1b9e5a75e83 100644
--- 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
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
index 434bde79a83..434bde79a83 100644
--- 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
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
index 69fc4b4f7f8..69fc4b4f7f8 100644
--- 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
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
index c3da4a51872..c3da4a51872 100644
--- 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
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
index 7eba02ed444..7eba02ed444 100644
--- 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
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
index c25698c395e..c25698c395e 100644
--- 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
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
index 4d09a05253e..4d09a05253e 100644
--- 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
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
index b7ca8890c19..b7ca8890c19 100644
--- 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
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
index 402d294b2e3..402d294b2e3 100644
--- 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
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
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
index 017844a0252..017844a0252 100644
--- 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
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
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
index 1141b79c7c6..1141b79c7c6 100644
--- a/src/test/ui/compile-fail-migration/rfc1445/feature-gate.no_gate.stderr
+++ b/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
index f729220eabb..f729220eabb 100644
--- a/src/test/ui/compile-fail-migration/rfc1445/feature-gate.rs
+++ b/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
index 87835162c93..87835162c93 100644
--- a/src/test/ui/compile-fail-migration/rfc1445/feature-gate.with_gate.stderr
+++ b/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
index ca9af78dd99..ca9af78dd99 100644
--- a/src/test/ui/compile-fail-migration/rfc1445/match-forbidden-without-eq.rs
+++ b/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
index a2cb536b212..a2cb536b212 100644
--- a/src/test/ui/compile-fail-migration/rfc1445/match-forbidden-without-eq.stderr
+++ b/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
index e02f9153e7e..e02f9153e7e 100644
--- 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
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
index 60f3191cd27..60f3191cd27 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/rfc1623.rs b/src/test/ui/rfc1623.rs
index 579fa378a1c..579fa378a1c 100644
--- a/src/test/ui/compile-fail-migration/rfc1623.rs
+++ b/src/test/ui/rfc1623.rs
diff --git a/src/test/ui/compile-fail-migration/rfc1623.stderr b/src/test/ui/rfc1623.stderr
index 3815558fb25..3815558fb25 100644
--- a/src/test/ui/compile-fail-migration/rfc1623.stderr
+++ b/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
index 810efdedfd6..810efdedfd6 100644
--- a/src/test/ui/compile-fail-migration/rfc1717/missing-link-attr.rs
+++ b/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
index 30555e80944..30555e80944 100644
--- a/src/test/ui/compile-fail-migration/rfc1717/missing-link-attr.stderr
+++ b/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
index e75c1a14b24..e75c1a14b24 100644
--- a/src/test/ui/compile-fail-migration/rfc1717/multiple-renames.rs
+++ b/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
index 4e5a3647fa2..4e5a3647fa2 100644
--- a/src/test/ui/compile-fail-migration/rfc1717/multiple-renames.stderr
+++ b/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
index ab8c238bc27..ab8c238bc27 100644
--- a/src/test/ui/compile-fail-migration/rfc1717/rename-to-empty.rs
+++ b/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
index aca839d804f..aca839d804f 100644
--- a/src/test/ui/compile-fail-migration/rfc1717/rename-to-empty.stderr
+++ b/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
index 2df6a659724..2df6a659724 100644
--- a/src/test/ui/compile-fail-migration/rmeta-lib-pass.rs
+++ b/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
index 6ee914c5e5b..6ee914c5e5b 100644
--- a/src/test/ui/compile-fail-migration/rmeta-pass.rs
+++ b/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
index bcf869c9432..bcf869c9432 100644
--- a/src/test/ui/compile-fail-migration/rmeta-priv-warn.rs
+++ b/src/test/ui/rmeta-priv-warn.rs
diff --git a/src/test/ui/compile-fail-migration/rmeta.rs b/src/test/ui/rmeta.rs
index 962fe9f66aa..962fe9f66aa 100644
--- a/src/test/ui/compile-fail-migration/rmeta.rs
+++ b/src/test/ui/rmeta.rs
diff --git a/src/test/ui/compile-fail-migration/rmeta.stderr b/src/test/ui/rmeta.stderr
index fa154f81b29..fa154f81b29 100644
--- a/src/test/ui/compile-fail-migration/rmeta.stderr
+++ b/src/test/ui/rmeta.stderr
diff --git a/src/test/ui/compile-fail-migration/rmeta_lib.rs b/src/test/ui/rmeta_lib.rs
index a61ff05e8c8..a61ff05e8c8 100644
--- a/src/test/ui/compile-fail-migration/rmeta_lib.rs
+++ b/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
index 8a9179cca6b..8a9179cca6b 100644
--- a/src/test/ui/compile-fail-migration/rmeta_lib.stderr
+++ b/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
index ffeb5bc3b85..ffeb5bc3b85 100644
--- a/src/test/ui/compile-fail-migration/rmeta_meta_main.rs
+++ b/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
index f246a8b5f63..f246a8b5f63 100644
--- a/src/test/ui/compile-fail-migration/rmeta_meta_main.stderr
+++ b/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
index abc92c86eec..abc92c86eec 100644
--- a/src/test/ui/compile-fail-migration/rust-unstable-column-gated.rs
+++ b/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
index 785fcd7af42..785fcd7af42 100644
--- a/src/test/ui/compile-fail-migration/rust-unstable-column-gated.stderr
+++ b/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
index aac9299eaaf..aac9299eaaf 100644
--- a/src/test/ui/compile-fail-migration/rustc-args-required-const.rs
+++ b/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
index 07f2d880c82..07f2d880c82 100644
--- a/src/test/ui/compile-fail-migration/rustc-args-required-const.stderr
+++ b/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
index aa63019307b..aa63019307b 100644
--- a/src/test/ui/compile-fail-migration/rustc-args-required-const2.rs
+++ b/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
index 766f8adb0b4..766f8adb0b4 100644
--- a/src/test/ui/compile-fail-migration/rustc-args-required-const2.stderr
+++ b/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
index 82f32cbcd14..82f32cbcd14 100644
--- a/src/test/ui/compile-fail-migration/rustc-error.rs
+++ b/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
index 7456d2af51f..7456d2af51f 100644
--- a/src/test/ui/compile-fail-migration/rustc-error.stderr
+++ b/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
index 35ea6dd52c4..35ea6dd52c4 100644
--- a/src/test/ui/compile-fail-migration/safe-extern-statics-mut.rs
+++ b/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
index f48dce65afa..f48dce65afa 100644
--- a/src/test/ui/compile-fail-migration/safe-extern-statics-mut.stderr
+++ b/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
index 83aa4b3316d..83aa4b3316d 100644
--- a/src/test/ui/compile-fail-migration/safe-extern-statics.rs
+++ b/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
index 657d57967bb..657d57967bb 100644
--- a/src/test/ui/compile-fail-migration/safe-extern-statics.stderr
+++ b/src/test/ui/safe-extern-statics.stderr
diff --git a/src/test/ui/self-impl.rs b/src/test/ui/self/self-impl.rs
index 1494d9ca574..1494d9ca574 100644
--- a/src/test/ui/self-impl.rs
+++ b/src/test/ui/self/self-impl.rs
diff --git a/src/test/ui/self-impl.stderr b/src/test/ui/self/self-impl.stderr
index a5a5135faad..a5a5135faad 100644
--- a/src/test/ui/self-impl.stderr
+++ b/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
index fd011318a48..fd011318a48 100644
--- a/src/test/ui/compile-fail-migration/self-infer.rs
+++ b/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
index 642e0de5290..642e0de5290 100644
--- a/src/test/ui/compile-fail-migration/self-infer.stderr
+++ b/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
index b2dba3bd61b..b2dba3bd61b 100644
--- a/src/test/ui/compile-fail-migration/self-vs-path-ambiguity.rs
+++ b/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
index 76517433170..76517433170 100644
--- a/src/test/ui/compile-fail-migration/self-vs-path-ambiguity.stderr
+++ b/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
index 8331ae0b307..8331ae0b307 100644
--- a/src/test/ui/compile-fail-migration/self_type_keyword-2.rs
+++ b/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
index 972e5bdddc6..972e5bdddc6 100644
--- a/src/test/ui/compile-fail-migration/self_type_keyword-2.stderr
+++ b/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
index 20d2e2ca9cf..20d2e2ca9cf 100644
--- a/src/test/ui/compile-fail-migration/self_type_keyword.rs
+++ b/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
index 4a7b9a6ce2c..4a7b9a6ce2c 100644
--- a/src/test/ui/compile-fail-migration/self_type_keyword.stderr
+++ b/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
index 44b049d6561..44b049d6561 100644
--- a/src/test/ui/compile-fail-migration/seq-args.rs
+++ b/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
index dc9d0a7fc0b..dc9d0a7fc0b 100644
--- a/src/test/ui/compile-fail-migration/seq-args.stderr
+++ b/src/test/ui/seq-args.stderr
diff --git a/src/test/ui/shadowed-lifetime.rs b/src/test/ui/shadowed/shadowed-lifetime.rs
index 63e4038398d..63e4038398d 100644
--- a/src/test/ui/shadowed-lifetime.rs
+++ b/src/test/ui/shadowed/shadowed-lifetime.rs
diff --git a/src/test/ui/shadowed-lifetime.stderr b/src/test/ui/shadowed/shadowed-lifetime.stderr
index 8d7c00bb61e..8d7c00bb61e 100644
--- a/src/test/ui/shadowed-lifetime.stderr
+++ b/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
index 3146017a0b4..3146017a0b4 100644
--- a/src/test/ui/compile-fail-migration/shadowed-trait-methods.rs
+++ b/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
index 910f125a148..910f125a148 100644
--- a/src/test/ui/compile-fail-migration/shadowed-trait-methods.stderr
+++ b/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
index 1f72db1e894..1f72db1e894 100644
--- a/src/test/ui/shadowed-type-parameter.rs
+++ b/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
index c40343e31b4..c40343e31b4 100644
--- a/src/test/ui/shadowed-type-parameter.stderr
+++ b/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
index e7e57a73de0..e7e57a73de0 100644
--- a/src/test/ui/compile-fail-migration/shadowed-use-visibility.rs
+++ b/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
index 5764ed76ef4..5764ed76ef4 100644
--- a/src/test/ui/compile-fail-migration/shadowed-use-visibility.stderr
+++ b/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
index e847d332416..e847d332416 100644
--- a/src/test/ui/compile-fail-migration/shadowing-in-the-same-pattern.rs
+++ b/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
index 46722891476..46722891476 100644
--- a/src/test/ui/compile-fail-migration/shadowing-in-the-same-pattern.stderr
+++ b/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
index 2d06161111e..2d06161111e 100644
--- a/src/test/ui/compile-fail-migration/shift-various-bad-types.rs
+++ b/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
index 7798b619cd9..7798b619cd9 100644
--- a/src/test/ui/compile-fail-migration/shift-various-bad-types.stderr
+++ b/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
index 8c9a24f4e72..8c9a24f4e72 100644
--- 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
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
index d8570ad4e83..d8570ad4e83 100644
--- 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
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
index 6f95f10c0d9..6f95f10c0d9 100644
--- 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
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
index 9dc0d1968e6..9dc0d1968e6 100644
--- 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
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
index ef1f4d6f230..ef1f4d6f230 100644
--- a/src/test/ui/compile-fail-migration/simd-intrinsic-declaration-type.rs
+++ b/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
index 4a8fd2d1bef..4a8fd2d1bef 100644
--- a/src/test/ui/compile-fail-migration/simd-intrinsic-declaration-type.stderr
+++ b/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
index ee08ca05e80..ee08ca05e80 100644
--- a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-arithmetic.rs
+++ b/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
index f81fa75c56b..f81fa75c56b 100644
--- a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-arithmetic.stderr
+++ b/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
index 4999b790b13..4999b790b13 100644
--- a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-cast.rs
+++ b/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
index 6ad5ac7dbfd..6ad5ac7dbfd 100644
--- a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-cast.stderr
+++ b/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
index 617b03a8711..617b03a8711 100644
--- a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-comparison.rs
+++ b/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
index 06eb94a4f97..06eb94a4f97 100644
--- a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-comparison.stderr
+++ b/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
index 78f7d42e25a..78f7d42e25a 100644
--- a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-elements.rs
+++ b/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
index 5a2def2c8c7..5a2def2c8c7 100644
--- a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-elements.stderr
+++ b/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
index 725960a866b..725960a866b 100644
--- a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-reduction.rs
+++ b/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
index 47b1e9dac78..47b1e9dac78 100644
--- a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-reduction.stderr
+++ b/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
index d74d6815d5f..d74d6815d5f 100644
--- a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-select.rs
+++ b/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
index 61e42027039..61e42027039 100644
--- a/src/test/ui/compile-fail-migration/simd-intrinsic-generic-select.stderr
+++ b/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
index 0d0bf240f72..0d0bf240f72 100644
--- 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
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
index 0692aa7275b..0692aa7275b 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/simd-type-generic-monomorphisation.rs b/src/test/ui/simd-type-generic-monomorphisation.rs
index 336855eb5e1..336855eb5e1 100644
--- a/src/test/ui/compile-fail-migration/simd-type-generic-monomorphisation.rs
+++ b/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
index 2a74506e80e..2a74506e80e 100644
--- a/src/test/ui/compile-fail-migration/simd-type-generic-monomorphisation.stderr
+++ b/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
index cde63aa0cd1..cde63aa0cd1 100644
--- a/src/test/ui/compile-fail-migration/simd-type.rs
+++ b/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
index 5899f4aacc0..5899f4aacc0 100644
--- a/src/test/ui/compile-fail-migration/simd-type.stderr
+++ b/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
index 0a0f9ce4bd1..0a0f9ce4bd1 100644
--- a/src/test/ui/compile-fail-migration/single-primitive-inherent-impl.rs
+++ b/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
index b781ee866c0..b781ee866c0 100644
--- a/src/test/ui/compile-fail-migration/single-primitive-inherent-impl.stderr
+++ b/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
index 712b4ac22f0..712b4ac22f0 100644
--- a/src/test/ui/compile-fail-migration/sized-cycle-note.rs
+++ b/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
index 96657152038..96657152038 100644
--- a/src/test/ui/compile-fail-migration/sized-cycle-note.stderr
+++ b/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
index 44b9d94c566..44b9d94c566 100644
--- a/src/test/ui/compile-fail-migration/slice-2.rs
+++ b/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
index e0f34daf513..e0f34daf513 100644
--- a/src/test/ui/compile-fail-migration/slice-2.stderr
+++ b/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
index 98d9297e112..98d9297e112 100644
--- a/src/test/ui/compile-fail-migration/slice-mut-2.nll.stderr
+++ b/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
index e20e968a012..e20e968a012 100644
--- a/src/test/ui/compile-fail-migration/slice-mut-2.rs
+++ b/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
index 4483c6f1a8a..4483c6f1a8a 100644
--- a/src/test/ui/compile-fail-migration/slice-mut-2.stderr
+++ b/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
index bee3704a353..bee3704a353 100644
--- a/src/test/ui/compile-fail-migration/slice-mut.rs
+++ b/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
index 59b70959d86..59b70959d86 100644
--- a/src/test/ui/compile-fail-migration/slice-mut.stderr
+++ b/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
index 2eba7c2e534..2eba7c2e534 100644
--- a/src/test/ui/compile-fail-migration/slightly-nice-generic-literal-messages.rs
+++ b/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
index 463eb98b4ee..463eb98b4ee 100644
--- a/src/test/ui/compile-fail-migration/slightly-nice-generic-literal-messages.stderr
+++ b/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
index f2b4bf946c5..f2b4bf946c5 100644
--- a/src/test/ui/compile-fail-migration/specialization/README.md
+++ b/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
index 5bab4c5438e..5bab4c5438e 100644
--- 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
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
index d92466967e1..d92466967e1 100644
--- 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
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
index 2874108157d..2874108157d 100644
--- a/src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-no-default.rs
+++ b/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
index 98f5e6d619e..98f5e6d619e 100644
--- a/src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-no-default.stderr
+++ b/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
index eacec2e40f0..eacec2e40f0 100644
--- 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
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
index c3c2a9840ad..c3c2a9840ad 100644
--- 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
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
index 04ddf9ebb17..04ddf9ebb17 100644
--- 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
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
index bc597e9f30c..bc597e9f30c 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-wfcheck.rs b/src/test/ui/specialization/defaultimpl/specialization-wfcheck.rs
index 445a59a373e..445a59a373e 100644
--- a/src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-wfcheck.rs
+++ b/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
index a623e9708cd..a623e9708cd 100644
--- a/src/test/ui/compile-fail-migration/specialization/defaultimpl/specialization-wfcheck.stderr
+++ b/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
index 26b8b737f34..26b8b737f34 100644
--- a/src/test/ui/compile-fail-migration/specialization/defaultimpl/validation.rs
+++ b/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
index 54b92da7b21..54b92da7b21 100644
--- a/src/test/ui/compile-fail-migration/specialization/defaultimpl/validation.stderr
+++ b/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
index 70cdb4899c4..70cdb4899c4 100644
--- a/src/test/ui/compile-fail-migration/specialization/issue-52050.rs
+++ b/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
index eee571f8f46..eee571f8f46 100644
--- a/src/test/ui/compile-fail-migration/specialization/issue-52050.stderr
+++ b/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
index 96cbd7a4852..96cbd7a4852 100644
--- a/src/test/ui/compile-fail-migration/specialization/specialization-default-projection.rs
+++ b/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
index 38b51394711..38b51394711 100644
--- a/src/test/ui/compile-fail-migration/specialization/specialization-default-projection.stderr
+++ b/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
index 18acecb4229..18acecb4229 100644
--- a/src/test/ui/compile-fail-migration/specialization/specialization-default-types.rs
+++ b/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
index a9abc1f6ab5..a9abc1f6ab5 100644
--- a/src/test/ui/compile-fail-migration/specialization/specialization-default-types.stderr
+++ b/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
index 3a01ecdf9db..3a01ecdf9db 100644
--- a/src/test/ui/specialization-feature-gate-default.rs
+++ b/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
index 30548bb2450..30548bb2450 100644
--- a/src/test/ui/specialization-feature-gate-default.stderr
+++ b/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
index 5eb48eab15e..5eb48eab15e 100644
--- a/src/test/ui/specialization-feature-gate-overlap.rs
+++ b/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
index bb2d071c93d..bb2d071c93d 100644
--- a/src/test/ui/specialization-feature-gate-overlap.stderr
+++ b/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
index 96156168543..96156168543 100644
--- a/src/test/ui/compile-fail-migration/specialization/specialization-no-default.rs
+++ b/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
index 880c2e5d6f4..880c2e5d6f4 100644
--- a/src/test/ui/compile-fail-migration/specialization/specialization-no-default.stderr
+++ b/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
index 62a6d8d9b50..62a6d8d9b50 100644
--- a/src/test/ui/compile-fail-migration/specialization/specialization-overlap-negative.rs
+++ b/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
index 2b85ba54e90..2b85ba54e90 100644
--- a/src/test/ui/compile-fail-migration/specialization/specialization-overlap-negative.stderr
+++ b/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
index ff12a82db5b..ff12a82db5b 100644
--- a/src/test/ui/compile-fail-migration/specialization/specialization-overlap.rs
+++ b/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
index 6830b7de473..6830b7de473 100644
--- a/src/test/ui/compile-fail-migration/specialization/specialization-overlap.stderr
+++ b/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
index b28a63c8293..b28a63c8293 100644
--- a/src/test/ui/compile-fail-migration/specialization/specialization-polarity.rs
+++ b/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
index a4627305885..a4627305885 100644
--- a/src/test/ui/compile-fail-migration/specialization/specialization-polarity.stderr
+++ b/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
index 1ee623c34fb..1ee623c34fb 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/stability_attribute_issue.rs
+++ b/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
index dac50db3fd9..dac50db3fd9 100644
--- a/src/test/ui/compile-fail-migration/stability-attribute-issue-43027.rs
+++ b/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
index bdfdd9ccc87..bdfdd9ccc87 100644
--- a/src/test/ui/compile-fail-migration/stability-attribute-issue-43027.stderr
+++ b/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
index 754c6f792f9..754c6f792f9 100644
--- a/src/test/ui/compile-fail-migration/stability-attribute-issue.rs
+++ b/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
index 15e91926a73..15e91926a73 100644
--- a/src/test/ui/compile-fail-migration/stability-attribute-issue.stderr
+++ b/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
index 512fb24a0c2..512fb24a0c2 100644
--- 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
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
index 479f2ff5095..479f2ff5095 100644
--- 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
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
index 35256f21f92..35256f21f92 100644
--- a/src/test/ui/compile-fail-migration/stability-attribute-non-staged.rs
+++ b/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
index f2a9879bd10..f2a9879bd10 100644
--- a/src/test/ui/compile-fail-migration/stability-attribute-non-staged.stderr
+++ b/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
index 9c54315bfd0..9c54315bfd0 100644
--- a/src/test/ui/compile-fail-migration/stability-attribute-sanity-2.rs
+++ b/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
index a9d70e25302..a9d70e25302 100644
--- a/src/test/ui/compile-fail-migration/stability-attribute-sanity-2.stderr
+++ b/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
index d4821e009f2..d4821e009f2 100644
--- a/src/test/ui/compile-fail-migration/stability-attribute-sanity-3.rs
+++ b/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
index b5b5847e8e1..b5b5847e8e1 100644
--- a/src/test/ui/compile-fail-migration/stability-attribute-sanity-3.stderr
+++ b/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
index 794ae1ca087..794ae1ca087 100644
--- a/src/test/ui/compile-fail-migration/stability-attribute-sanity.rs
+++ b/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
index f9d301f643d..f9d301f643d 100644
--- a/src/test/ui/compile-fail-migration/stability-attribute-sanity.stderr
+++ b/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
index 32991dd6499..32991dd6499 100644
--- a/src/test/ui/compile-fail-migration/stable-features.rs
+++ b/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
index 53d642c07e6..53d642c07e6 100644
--- a/src/test/ui/compile-fail-migration/stable-features.stderr
+++ b/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
index 14299a9b639..14299a9b639 100644
--- a/src/test/ui/compile-fail-migration/static-priv-by-default.rs
+++ b/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
index 73597e51f08..73597e51f08 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/static_priv_by_default.rs
+++ b/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
index 8593eb5333e..8593eb5333e 100644
--- a/src/test/ui/compile-fail-migration/static-closures.rs
+++ b/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
index 761d8374bcc..761d8374bcc 100644
--- a/src/test/ui/compile-fail-migration/static-closures.stderr
+++ b/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
index e22eb7e4484..e22eb7e4484 100644
--- a/src/test/ui/compile-fail-migration/static-drop-scope.rs
+++ b/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
index ce158239370..ce158239370 100644
--- a/src/test/ui/compile-fail-migration/static-drop-scope.stderr
+++ b/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
index c8fddeb1214..c8fddeb1214 100644
--- a/src/test/ui/compile-fail-migration/static-items-cant-move.rs
+++ b/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
index 254710b6b2e..254710b6b2e 100644
--- a/src/test/ui/compile-fail-migration/static-items-cant-move.stderr
+++ b/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
index ad4d04343fe..ad4d04343fe 100644
--- a/src/test/ui/compile-fail-migration/static-lifetime-bound.nll.stderr
+++ b/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
index 38534ab0a36..38534ab0a36 100644
--- a/src/test/ui/compile-fail-migration/static-lifetime-bound.rs
+++ b/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
index 0ee2b665cf1..0ee2b665cf1 100644
--- a/src/test/ui/compile-fail-migration/static-lifetime-bound.stderr
+++ b/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
index 62abf11654e..62abf11654e 100644
--- a/src/test/ui/static-lifetime.rs
+++ b/src/test/ui/static/static-lifetime.rs
diff --git a/src/test/ui/static-lifetime.stderr b/src/test/ui/static/static-lifetime.stderr
index c38b8a96f9f..c38b8a96f9f 100644
--- a/src/test/ui/static-lifetime.stderr
+++ b/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
index 5e175aa0fee..5e175aa0fee 100644
--- a/src/test/ui/compile-fail-migration/static-method-privacy.rs
+++ b/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
index 783b72c8ed2..783b72c8ed2 100644
--- a/src/test/ui/compile-fail-migration/static-method-privacy.stderr
+++ b/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
index 088c8ef3ab8..088c8ef3ab8 100644
--- a/src/test/ui/compile-fail-migration/static-mut-bad-types.rs
+++ b/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
index f8bee22b181..f8bee22b181 100644
--- a/src/test/ui/compile-fail-migration/static-mut-bad-types.stderr
+++ b/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
index c6d744fa64d..c6d744fa64d 100644
--- a/src/test/ui/compile-fail-migration/static-mut-foreign-requires-unsafe.rs
+++ b/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
index 01cbe784b45..01cbe784b45 100644
--- a/src/test/ui/compile-fail-migration/static-mut-foreign-requires-unsafe.stderr
+++ b/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
index 7e6ced12fe6..7e6ced12fe6 100644
--- a/src/test/ui/compile-fail-migration/static-mut-not-constant.rs
+++ b/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
index ad44121e763..ad44121e763 100644
--- a/src/test/ui/compile-fail-migration/static-mut-not-constant.stderr
+++ b/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
index 351a47fdf39..351a47fdf39 100644
--- a/src/test/ui/compile-fail-migration/static-mut-not-pat.rs
+++ b/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
index 123cf7b3ac6..123cf7b3ac6 100644
--- a/src/test/ui/compile-fail-migration/static-mut-not-pat.stderr
+++ b/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
index f6ad46a0527..f6ad46a0527 100644
--- a/src/test/ui/compile-fail-migration/static-mut-requires-unsafe.rs
+++ b/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
index 310da8f67f3..310da8f67f3 100644
--- a/src/test/ui/compile-fail-migration/static-mut-requires-unsafe.stderr
+++ b/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
index 577e4f7542d..577e4f7542d 100644
--- a/src/test/ui/compile-fail-migration/static-priv-by-default2.rs
+++ b/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
index 0f749b0e4f3..0f749b0e4f3 100644
--- a/src/test/ui/compile-fail-migration/static-priv-by-default2.stderr
+++ b/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
index cf8ee1ecb41..cf8ee1ecb41 100644
--- a/src/test/ui/compile-fail-migration/static-reference-to-fn-1.rs
+++ b/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
index 609319f3b78..609319f3b78 100644
--- a/src/test/ui/compile-fail-migration/static-reference-to-fn-1.stderr
+++ b/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
index 9ef94189e90..9ef94189e90 100644
--- 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
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
index 8d9f442b81d..8d9f442b81d 100644
--- a/src/test/ui/compile-fail-migration/static-reference-to-fn-2.rs
+++ b/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
index a01ab4cef81..a01ab4cef81 100644
--- a/src/test/ui/compile-fail-migration/static-reference-to-fn-2.stderr
+++ b/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
index 90ed401659c..90ed401659c 100644
--- a/src/test/ui/compile-fail-migration/static-region-bound.rs
+++ b/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
index ee3398b96d9..ee3398b96d9 100644
--- a/src/test/ui/compile-fail-migration/static-region-bound.stderr
+++ b/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
index a533a5bd54d..a533a5bd54d 100644
--- a/src/test/ui/compile-fail-migration/static-vec-repeat-not-constant.rs
+++ b/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
index 27d1b41ed0b..27d1b41ed0b 100644
--- a/src/test/ui/compile-fail-migration/static-vec-repeat-not-constant.stderr
+++ b/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
index 2dfc9b79ee2..2dfc9b79ee2 100644
--- a/src/test/ui/compile-fail-migration/staticness-mismatch.rs
+++ b/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
index 31c06ae8a88..31c06ae8a88 100644
--- a/src/test/ui/compile-fail-migration/staticness-mismatch.stderr
+++ b/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
index 35877db610e..35877db610e 100644
--- a/src/test/ui/compile-fail-migration/std-uncopyable-atomics.rs
+++ b/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
index 4452bfa95d8..4452bfa95d8 100644
--- a/src/test/ui/compile-fail-migration/std-uncopyable-atomics.stderr
+++ b/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
index 896817bb858..896817bb858 100644
--- a/src/test/ui/compile-fail-migration/stmt_expr_attrs_no_feature.rs
+++ b/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
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,4 +1,12 @@
 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
    |
 LL |     fn y(a: [u8; #[attr] 5]); //~ ERROR 15701
@@ -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
index 9d6cf5fe598..9d6cf5fe598 100644
--- a/src/test/ui/str-array-assignment.rs
+++ b/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
index 59521bd2e2f..59521bd2e2f 100644
--- a/src/test/ui/str-array-assignment.stderr
+++ b/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
index c0dad38e436..c0dad38e436 100644
--- a/src/test/ui/str-as-char.fixed
+++ b/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
index b5a5df0af7f..b5a5df0af7f 100644
--- a/src/test/ui/str-as-char.rs
+++ b/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
index 60eb182adf1..60eb182adf1 100644
--- a/src/test/ui/str-as-char.stderr
+++ b/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
index 292dcbf8ef7..292dcbf8ef7 100644
--- a/src/test/ui/str-concat-on-double-ref.rs
+++ b/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
index d42c859598f..d42c859598f 100644
--- a/src/test/ui/str-concat-on-double-ref.stderr
+++ b/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
index b5f1ffb977e..b5f1ffb977e 100644
--- a/src/test/ui/compile-fail-migration/str-idx.rs
+++ b/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
index 496187c92f1..496187c92f1 100644
--- a/src/test/ui/compile-fail-migration/str-idx.stderr
+++ b/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
index 4a062f78a32..4a062f78a32 100644
--- a/src/test/ui/str-lit-type-mismatch.rs
+++ b/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
index de18851636d..de18851636d 100644
--- a/src/test/ui/str-lit-type-mismatch.stderr
+++ b/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
index 136bfaefa71..136bfaefa71 100644
--- a/src/test/ui/compile-fail-migration/str-mut-idx.rs
+++ b/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
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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index 5fea97da03e..5fea97da03e 100644
--- a/src/test/ui/auxiliary/struct_field_privacy.rs
+++ b/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
index 40868fa3f70..40868fa3f70 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/struct_variant_privacy.rs
+++ b/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
index 7e5510edb2c..7e5510edb2c 100644
--- a/src/test/ui/compile-fail-migration/struct-base-wrong-type-2.rs
+++ b/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
index aab5ed0a74a..aab5ed0a74a 100644
--- a/src/test/ui/compile-fail-migration/struct-base-wrong-type-2.stderr
+++ b/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
index 3703b15d4db..3703b15d4db 100644
--- a/src/test/ui/compile-fail-migration/struct-base-wrong-type.rs
+++ b/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
index 2c87f52ee04..2c87f52ee04 100644
--- a/src/test/ui/compile-fail-migration/struct-base-wrong-type.stderr
+++ b/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
index d7ee2f220d4..d7ee2f220d4 100644
--- a/src/test/ui/struct-duplicate-comma.rs
+++ b/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
index 06e3b95c248..06e3b95c248 100644
--- a/src/test/ui/struct-duplicate-comma.stderr
+++ b/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
index 974d500d9cb..974d500d9cb 100644
--- a/src/test/ui/compile-fail-migration/struct-field-cfg.rs
+++ b/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
index db4790659c3..db4790659c3 100644
--- a/src/test/ui/compile-fail-migration/struct-field-cfg.stderr
+++ b/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
index f1e24495f84..f1e24495f84 100644
--- a/src/test/ui/struct-field-init-syntax.rs
+++ b/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
index 2c4ae0e472b..2c4ae0e472b 100644
--- a/src/test/ui/struct-field-init-syntax.stderr
+++ b/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
index f487ef62aa4..f487ef62aa4 100644
--- a/src/test/ui/compile-fail-migration/struct-field-privacy.rs
+++ b/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
index ad3ee12637a..ad3ee12637a 100644
--- a/src/test/ui/compile-fail-migration/struct-field-privacy.stderr
+++ b/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
index 1f6b070d837..1f6b070d837 100644
--- a/src/test/ui/struct-fields-decl-dupe.rs
+++ b/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
index b5068b4abda..b5068b4abda 100644
--- a/src/test/ui/struct-fields-decl-dupe.stderr
+++ b/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
index 578091f5e9a..578091f5e9a 100644
--- a/src/test/ui/compile-fail-migration/struct-fields-dupe.rs
+++ b/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
index fa2079317e0..fa2079317e0 100644
--- a/src/test/ui/compile-fail-migration/struct-fields-dupe.stderr
+++ b/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
index e4366cf79b1..e4366cf79b1 100644
--- a/src/test/ui/struct-fields-hints-no-dupe.rs
+++ b/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
index d04d193c665..d04d193c665 100644
--- a/src/test/ui/struct-fields-hints-no-dupe.stderr
+++ b/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
index 85dc1aedb44..85dc1aedb44 100644
--- a/src/test/ui/struct-fields-hints.rs
+++ b/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
index 6d0ec8bdf92..6d0ec8bdf92 100644
--- a/src/test/ui/struct-fields-hints.stderr
+++ b/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
index d5ab13affaf..d5ab13affaf 100644
--- a/src/test/ui/compile-fail-migration/struct-fields-missing.rs
+++ b/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
index 606288ef277..606288ef277 100644
--- a/src/test/ui/compile-fail-migration/struct-fields-missing.stderr
+++ b/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
index 984f337fb3d..984f337fb3d 100644
--- a/src/test/ui/compile-fail-migration/struct-fields-shorthand-unresolved.rs
+++ b/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
index f66ac96e0b7..f66ac96e0b7 100644
--- a/src/test/ui/compile-fail-migration/struct-fields-shorthand-unresolved.stderr
+++ b/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
index e46ae73f1a1..e46ae73f1a1 100644
--- a/src/test/ui/compile-fail-migration/struct-fields-shorthand.rs
+++ b/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
index a65a9c86581..a65a9c86581 100644
--- a/src/test/ui/compile-fail-migration/struct-fields-shorthand.stderr
+++ b/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
index 1e0b8efc96f..1e0b8efc96f 100644
--- a/src/test/ui/struct-fields-too-many.rs
+++ b/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
index 01b3fe16fbb..01b3fe16fbb 100644
--- a/src/test/ui/struct-fields-too-many.stderr
+++ b/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
index 0e30c1e86e4..0e30c1e86e4 100644
--- a/src/test/ui/compile-fail-migration/struct-fields-typo.rs
+++ b/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
index 9f2f97a6c09..9f2f97a6c09 100644
--- a/src/test/ui/compile-fail-migration/struct-fields-typo.stderr
+++ b/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
index a14e43f4c94..a14e43f4c94 100644
--- a/src/test/ui/compile-fail-migration/struct-like-enum-nonexhaustive.rs
+++ b/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
index 56dbf0c93ba..56dbf0c93ba 100644
--- a/src/test/ui/compile-fail-migration/struct-like-enum-nonexhaustive.stderr
+++ b/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
index 87ae8ab2605..87ae8ab2605 100644
--- a/src/test/ui/struct-missing-comma.rs
+++ b/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
index 28283bfb713..28283bfb713 100644
--- a/src/test/ui/struct-missing-comma.stderr
+++ b/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
index d3130c4e831..d3130c4e831 100644
--- a/src/test/ui/compile-fail-migration/struct-pat-derived-error.rs
+++ b/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
index 68b71efc106..68b71efc106 100644
--- a/src/test/ui/compile-fail-migration/struct-pat-derived-error.stderr
+++ b/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
index 1b6e51e3703..1b6e51e3703 100644
--- a/src/test/ui/compile-fail-migration/struct-path-alias-bounds.rs
+++ b/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
index f8e2fe1410f..f8e2fe1410f 100644
--- a/src/test/ui/compile-fail-migration/struct-path-alias-bounds.stderr
+++ b/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
index 660ac44ce0b..660ac44ce0b 100644
--- a/src/test/ui/compile-fail-migration/struct-path-associated-type.rs
+++ b/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
index 1364b2a6b0c..1364b2a6b0c 100644
--- a/src/test/ui/compile-fail-migration/struct-path-associated-type.stderr
+++ b/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
index e966ea65902..e966ea65902 100644
--- a/src/test/ui/struct-path-self-type-mismatch.rs
+++ b/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
index cfba3be6130..cfba3be6130 100644
--- a/src/test/ui/struct-path-self-type-mismatch.stderr
+++ b/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
index 067d6ac22dc..067d6ac22dc 100644
--- a/src/test/ui/compile-fail-migration/struct-path-self.rs
+++ b/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
index 1b5506072e8..1b5506072e8 100644
--- a/src/test/ui/compile-fail-migration/struct-path-self.stderr
+++ b/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
index dda30141b4a..dda30141b4a 100644
--- a/src/test/ui/compile-fail-migration/struct-pattern-match-useless.rs
+++ b/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
index 60f17d1d906..60f17d1d906 100644
--- a/src/test/ui/compile-fail-migration/struct-pattern-match-useless.stderr
+++ b/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
index 8507acd26ce..8507acd26ce 100644
--- a/src/test/ui/compile-fail-migration/struct-variant-privacy-xc.rs
+++ b/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
index 731d23e6a97..731d23e6a97 100644
--- a/src/test/ui/compile-fail-migration/struct-variant-privacy-xc.stderr
+++ b/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
index 7de4ca62555..7de4ca62555 100644
--- a/src/test/ui/compile-fail-migration/struct-variant-privacy.rs
+++ b/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
index a82ac8ab318..a82ac8ab318 100644
--- a/src/test/ui/compile-fail-migration/struct-variant-privacy.stderr
+++ b/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
index 87fc5ba93ae..87fc5ba93ae 100644
--- a/src/test/ui/compile-fail-migration/structure-constructor-type-mismatch.rs
+++ b/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
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
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 |     <str as Foo<u8>>::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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index d0e9a7f4a40..d0e9a7f4a40 100644
--- a/src/test/ui/compile-fail-migration/substs-ppaux.rs
+++ b/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
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 |     <str as Foo<u8>>::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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index bf55b7bdcb1..bf55b7bdcb1 100644
--- a/src/test/ui/compile-fail-migration/suffixed-literal-meta.rs
+++ b/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
index 6d88ab1df16..6d88ab1df16 100644
--- a/src/test/ui/compile-fail-migration/suffixed-literal-meta.stderr
+++ b/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
index 5fea97da03e..5fea97da03e 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/struct_field_privacy.rs
+++ b/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
index 9fb519c57ed..9fb519c57ed 100644
--- a/src/test/ui/suggest-labels.rs
+++ b/src/test/ui/suggestions/suggest-labels.rs
diff --git a/src/test/ui/suggest-labels.stderr b/src/test/ui/suggestions/suggest-labels.stderr
index 671ff1a56db..671ff1a56db 100644
--- a/src/test/ui/suggest-labels.stderr
+++ b/src/test/ui/suggestions/suggest-labels.stderr
diff --git a/src/test/ui/suggest-methods.rs b/src/test/ui/suggestions/suggest-methods.rs
index 49027deecc1..49027deecc1 100644
--- a/src/test/ui/suggest-methods.rs
+++ b/src/test/ui/suggestions/suggest-methods.rs
diff --git a/src/test/ui/suggest-methods.stderr b/src/test/ui/suggestions/suggest-methods.stderr
index cb352361f33..cb352361f33 100644
--- a/src/test/ui/suggest-methods.stderr
+++ b/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
index 77b38abad84..77b38abad84 100644
--- a/src/test/ui/suggest-private-fields.rs
+++ b/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
index 51a96df951a..51a96df951a 100644
--- a/src/test/ui/suggest-private-fields.stderr
+++ b/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
index 30b5371af1a..30b5371af1a 100644
--- a/src/test/ui/suggest-ref-mut.rs
+++ b/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
index 0b2b240ef53..0b2b240ef53 100644
--- a/src/test/ui/suggest-ref-mut.stderr
+++ b/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
index 0f19c48337b..0f19c48337b 100644
--- a/src/test/ui/suggest-remove-refs-1.rs
+++ b/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
index c47b4d283d7..c47b4d283d7 100644
--- a/src/test/ui/suggest-remove-refs-1.stderr
+++ b/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
index c427f697ae1..c427f697ae1 100644
--- a/src/test/ui/suggest-remove-refs-2.rs
+++ b/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
index fdd654ea392..fdd654ea392 100644
--- a/src/test/ui/suggest-remove-refs-2.stderr
+++ b/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
index f54ae30caeb..f54ae30caeb 100644
--- a/src/test/ui/suggest-remove-refs-3.rs
+++ b/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
index b0920a0fa52..b0920a0fa52 100644
--- a/src/test/ui/suggest-remove-refs-3.stderr
+++ b/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
index c607711c44f..c607711c44f 100644
--- a/src/test/ui/compile-fail-migration/super-at-top-level.rs
+++ b/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
index b4af73055a0..b4af73055a0 100644
--- a/src/test/ui/compile-fail-migration/super-at-top-level.stderr
+++ b/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
index 9a4a52ced20..9a4a52ced20 100644
--- a/src/test/ui/compile-fail-migration/suppressed-error.rs
+++ b/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
index d17e7cb6891..d17e7cb6891 100644
--- a/src/test/ui/compile-fail-migration/suppressed-error.stderr
+++ b/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
index 31a97f695f0..31a97f695f0 100644
--- a/src/test/ui/auxiliary/svh-a-base.rs
+++ b/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
index 5339fc8295c..5339fc8295c 100644
--- a/src/test/ui/auxiliary/svh-a-change-lit.rs
+++ b/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
index 2a5d9446f87..2a5d9446f87 100644
--- a/src/test/ui/auxiliary/svh-a-change-significant-cfg.rs
+++ b/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
index 61f2f2803ab..61f2f2803ab 100644
--- a/src/test/ui/auxiliary/svh-a-change-trait-bound.rs
+++ b/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
index 270ce95be2b..270ce95be2b 100644
--- a/src/test/ui/auxiliary/svh-a-change-type-arg.rs
+++ b/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
index de4cc85a7dc..de4cc85a7dc 100644
--- a/src/test/ui/auxiliary/svh-a-change-type-ret.rs
+++ b/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
index 0d4c76abb10..0d4c76abb10 100644
--- a/src/test/ui/auxiliary/svh-a-change-type-static.rs
+++ b/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
index b8946fdc995..b8946fdc995 100644
--- a/src/test/ui/auxiliary/svh-b.rs
+++ b/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
index 6bd3ddab06c..6bd3ddab06c 100644
--- a/src/test/ui/auxiliary/svh-uta-base.rs
+++ b/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
index e8634168177..e8634168177 100644
--- a/src/test/ui/auxiliary/svh-uta-change-use-trait.rs
+++ b/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
index eb3da985242..eb3da985242 100644
--- a/src/test/ui/auxiliary/svh-utb.rs
+++ b/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
index c529873e732..c529873e732 100644
--- a/src/test/ui/svh-change-lit.rs
+++ b/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
index bf018cdf829..bf018cdf829 100644
--- a/src/test/ui/svh-change-lit.stderr
+++ b/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
index ad51cbc5ec8..ad51cbc5ec8 100644
--- a/src/test/ui/svh-change-significant-cfg.rs
+++ b/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
index e8926cda9e9..e8926cda9e9 100644
--- a/src/test/ui/svh-change-significant-cfg.stderr
+++ b/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
index ae17ff3feb7..ae17ff3feb7 100644
--- a/src/test/ui/svh-change-trait-bound.rs
+++ b/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
index d9824876a95..d9824876a95 100644
--- a/src/test/ui/svh-change-trait-bound.stderr
+++ b/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
index 5b796a3f5c0..5b796a3f5c0 100644
--- a/src/test/ui/svh-change-type-arg.rs
+++ b/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
index 1f942cc1989..1f942cc1989 100644
--- a/src/test/ui/svh-change-type-arg.stderr
+++ b/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
index 88bf146760f..88bf146760f 100644
--- a/src/test/ui/svh-change-type-ret.rs
+++ b/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
index 0d59f31ccb6..0d59f31ccb6 100644
--- a/src/test/ui/svh-change-type-ret.stderr
+++ b/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
index c9a167c5a02..c9a167c5a02 100644
--- a/src/test/ui/svh-change-type-static.rs
+++ b/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
index cbfb74f59ed..cbfb74f59ed 100644
--- a/src/test/ui/svh-change-type-static.stderr
+++ b/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
index 3a87f6bfc77..3a87f6bfc77 100644
--- a/src/test/ui/svh-use-trait.rs
+++ b/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
index 612f52ba959..612f52ba959 100644
--- a/src/test/ui/svh-use-trait.stderr
+++ b/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
index 0095774fcb8..0095774fcb8 100644
--- a/src/test/ui/compile-fail-migration/symbol-names/basic.rs
+++ b/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
index eeeb1b5e34d..eeeb1b5e34d 100644
--- a/src/test/ui/compile-fail-migration/symbol-names/basic.stderr
+++ b/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
index 93fa48b880f..93fa48b880f 100644
--- a/src/test/ui/compile-fail-migration/symbol-names/impl1.rs
+++ b/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
index edce6929695..edce6929695 100644
--- a/src/test/ui/compile-fail-migration/symbol-names/impl1.stderr
+++ b/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
index 96adfea43f3..96adfea43f3 100644
--- a/src/test/ui/compile-fail-migration/syntax-extension-minor.rs
+++ b/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
index 7df1f303146..7df1f303146 100644
--- a/src/test/ui/compile-fail-migration/syntax-extension-minor.stderr
+++ b/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
index 8d5e89cc66f..8d5e89cc66f 100644
--- a/src/test/ui/compile-fail-migration/syntax-trait-polarity-feature-gate.rs
+++ b/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
index eebd018b887..eebd018b887 100644
--- a/src/test/ui/compile-fail-migration/syntax-trait-polarity-feature-gate.stderr
+++ b/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
index 1a5d058cb9a..1a5d058cb9a 100644
--- a/src/test/ui/compile-fail-migration/syntax-trait-polarity.rs
+++ b/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
index 724ac60ed91..724ac60ed91 100644
--- a/src/test/ui/compile-fail-migration/syntax-trait-polarity.stderr
+++ b/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
index 337cae1369e..337cae1369e 100644
--- a/src/test/ui/compile-fail-migration/synthetic-param.rs
+++ b/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
index 2711f6f8bdc..2711f6f8bdc 100644
--- a/src/test/ui/compile-fail-migration/synthetic-param.stderr
+++ b/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
index 8f420f1ce4b..8f420f1ce4b 100644
--- 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
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
index b9580eafc33..b9580eafc33 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/tag-type-args.rs b/src/test/ui/tag-type-args.rs
index 5785a13b006..5785a13b006 100644
--- a/src/test/ui/compile-fail-migration/tag-type-args.rs
+++ b/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
index 1431ee9cc86..1431ee9cc86 100644
--- a/src/test/ui/compile-fail-migration/tag-type-args.stderr
+++ b/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
index 220537633ea..220537633ea 100644
--- a/src/test/ui/compile-fail-migration/tag-variant-cast-non-nullary.rs
+++ b/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
index 1e64c74d121..1e64c74d121 100644
--- a/src/test/ui/compile-fail-migration/tag-variant-cast-non-nullary.stderr
+++ b/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
index 5da5bb85409..5da5bb85409 100644
--- a/src/test/ui/compile-fail-migration/tag-variant-disr-dup.rs
+++ b/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
index de5a0fac54f..de5a0fac54f 100644
--- a/src/test/ui/compile-fail-migration/tag-variant-disr-dup.stderr
+++ b/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
index 5c1270aa0e4..5c1270aa0e4 100644
--- a/src/test/ui/compile-fail-migration/tail-typeck.rs
+++ b/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
index 302bd6aa2d8..302bd6aa2d8 100644
--- a/src/test/ui/compile-fail-migration/tail-typeck.stderr
+++ b/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
index 4a21e133981..4a21e133981 100644
--- a/src/test/ui/compile-fail-migration/terr-in-field.rs
+++ b/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
index 5d06eef90be..5d06eef90be 100644
--- a/src/test/ui/compile-fail-migration/terr-in-field.stderr
+++ b/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
index fd92a26d0fc..fd92a26d0fc 100644
--- a/src/test/ui/compile-fail-migration/terr-sorts.rs
+++ b/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
index a16216c842e..a16216c842e 100644
--- a/src/test/ui/compile-fail-migration/terr-sorts.stderr
+++ b/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
index 71cae0b6df9..71cae0b6df9 100644
--- a/src/test/ui/compile-fail-migration/test-cfg.rs
+++ b/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
index 1db6d5eccbe..1db6d5eccbe 100644
--- a/src/test/ui/compile-fail-migration/test-cfg.stderr
+++ b/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
index 0e25f1e965a..0e25f1e965a 100644
--- a/src/test/ui/compile-fail-migration/test-warns-dead-code.rs
+++ b/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
index 46ff31c65d6..46ff31c65d6 100644
--- a/src/test/ui/compile-fail-migration/test-warns-dead-code.stderr
+++ b/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
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
index 62e26f28b06..62e26f28b06 100644
--- a/src/test/ui/compile-fail-migration/thread-local-in-ctfe.rs
+++ b/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
index 76079d9a9ee..76079d9a9ee 100644
--- a/src/test/ui/compile-fail-migration/thread-local-in-ctfe.stderr
+++ b/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
index 87d47b75607..87d47b75607 100644
--- a/src/test/ui/tool-attributes-disabled-1.rs
+++ b/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
index 6302c06057a..6302c06057a 100644
--- a/src/test/ui/tool-attributes-disabled-1.stderr
+++ b/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
index 2d97e160f49..2d97e160f49 100644
--- a/src/test/ui/tool-attributes-disabled-2.rs
+++ b/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
index b327773dd6a..b327773dd6a 100644
--- a/src/test/ui/tool-attributes-disabled-2.stderr
+++ b/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
index 7a6b9ae9943..7a6b9ae9943 100644
--- a/src/test/ui/tool-attributes-misplaced-1.rs
+++ b/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
index 60188aebce7..60188aebce7 100644
--- a/src/test/ui/tool-attributes-misplaced-1.stderr
+++ b/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
index 102edf2813b..102edf2813b 100644
--- a/src/test/ui/tool-attributes-misplaced-2.rs
+++ b/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
index 5b968cd6b8e..5b968cd6b8e 100644
--- a/src/test/ui/tool-attributes-misplaced-2.stderr
+++ b/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
index 7913c9f40b5..7913c9f40b5 100644
--- a/src/test/ui/tool-attributes-shadowing.rs
+++ b/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
index f668d677f7a..f668d677f7a 100644
--- a/src/test/ui/tool-attributes-shadowing.stderr
+++ b/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
index ea1efab4cb6..ea1efab4cb6 100644
--- a/src/test/ui/compile-fail-migration/tool_lints.rs
+++ b/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
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
index 95cb17c215b..95cb17c215b 100644
--- a/src/test/ui/compile-fail-migration/trace_macros-format.rs
+++ b/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
index 8dad041e9fe..8dad041e9fe 100644
--- a/src/test/ui/compile-fail-migration/trace_macros-format.stderr
+++ b/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
index d4a7c4ed0e0..d4a7c4ed0e0 100644
--- a/src/test/ui/compile-fail-migration/trace_macros-gate.rs
+++ b/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
index ed92e1227ba..ed92e1227ba 100644
--- a/src/test/ui/compile-fail-migration/trace_macros-gate.stderr
+++ b/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
index 7aca227a76c..7aca227a76c 100644
--- a/src/test/ui/compile-fail-migration/trait-alias.rs
+++ b/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
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<T: Clone = ()> = 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<T: Clone = ()> = 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<T> = Default where T: Clone; // ok
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -31,7 +31,7 @@ LL | trait Alias1<T> = 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<T: Clone = ()> = Default;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/compile-fail-migration/auxiliary/crate_a1.rs b/src/test/ui/traits/auxiliary/crate_a1.rs
index 70f7cac94de..70f7cac94de 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/crate_a1.rs
+++ b/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
index 29cb0bc176a..29cb0bc176a 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/auxiliary/trait_safety_lib.rs b/src/test/ui/traits/auxiliary/trait_safety_lib.rs
index 585a756fd07..585a756fd07 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/trait_safety_lib.rs
+++ b/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
index 9ea211b4d7d..9ea211b4d7d 100644
--- a/src/test/ui/trait-alias.rs
+++ b/src/test/ui/traits/trait-alias.rs
diff --git a/src/test/ui/trait-alias.stderr b/src/test/ui/traits/trait-alias.stderr
index 5d290e5c7fb..5d290e5c7fb 100644
--- a/src/test/ui/trait-alias.stderr
+++ b/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
index 49d58580da5..49d58580da5 100644
--- a/src/test/ui/compile-fail-migration/trait-as-struct-constructor.rs
+++ b/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
index ecb4e5d44c9..ecb4e5d44c9 100644
--- a/src/test/ui/compile-fail-migration/trait-as-struct-constructor.stderr
+++ b/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
index 9c38d8a9e2a..9c38d8a9e2a 100644
--- 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
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
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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index 76bbca60658..76bbca60658 100644
--- a/src/test/ui/compile-fail-migration/trait-bounds-not-on-struct.rs
+++ b/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
index 929a1bfaa15..929a1bfaa15 100644
--- a/src/test/ui/compile-fail-migration/trait-bounds-not-on-struct.stderr
+++ b/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
index 6a271a7b749..6a271a7b749 100644
--- 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
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
index 6dd4d1fca86..6dd4d1fca86 100644
--- 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
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
index 77abe6f7f74..77abe6f7f74 100644
--- 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
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
index 6f917706873..6f917706873 100644
--- 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
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
index 9e680d17fb9..9e680d17fb9 100644
--- 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
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
index cdaa12428ae..cdaa12428ae 100644
--- 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
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
index 2b59fdcae35..2b59fdcae35 100644
--- 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
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
index 28d4257a9fb..28d4257a9fb 100644
--- 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
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
index 975de00d02a..975de00d02a 100644
--- 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
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
index b798ccfc7a4..b798ccfc7a4 100644
--- 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
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
index 515684bcf42..515684bcf42 100644
--- 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
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
index 0b0bd4f6ab1..0b0bd4f6ab1 100644
--- 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
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
index 24e2418e8d4..24e2418e8d4 100644
--- 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
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
index 5686e62c8b9..5686e62c8b9 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/trait-bounds-sugar.rs b/src/test/ui/traits/trait-bounds-sugar.rs
index 0a36fcbed69..0a36fcbed69 100644
--- a/src/test/ui/compile-fail-migration/trait-bounds-sugar.rs
+++ b/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
index bd899e06545..bd899e06545 100644
--- a/src/test/ui/compile-fail-migration/trait-bounds-sugar.stderr
+++ b/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
index 3839e90ed9f..3839e90ed9f 100644
--- a/src/test/ui/compile-fail-migration/trait-coercion-generic-bad.rs
+++ b/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
index a186877e57b..a186877e57b 100644
--- a/src/test/ui/compile-fail-migration/trait-coercion-generic-bad.stderr
+++ b/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
index c6a7482c29f..c6a7482c29f 100644
--- a/src/test/ui/compile-fail-migration/trait-coercion-generic-regions.nll.stderr
+++ b/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
index 18d3ded77f8..18d3ded77f8 100644
--- a/src/test/ui/compile-fail-migration/trait-coercion-generic-regions.rs
+++ b/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
index 8eaf7e9c1ef..8eaf7e9c1ef 100644
--- a/src/test/ui/compile-fail-migration/trait-coercion-generic-regions.stderr
+++ b/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
index d35caa40a2d..d35caa40a2d 100644
--- a/src/test/ui/trait-duplicate-methods.rs
+++ b/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
index 1dfddd937ca..1dfddd937ca 100644
--- a/src/test/ui/trait-duplicate-methods.stderr
+++ b/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
index e682d3c81e7..e682d3c81e7 100644
--- a/src/test/ui/compile-fail-migration/trait-impl-1.rs
+++ b/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
index b8033900505..b8033900505 100644
--- a/src/test/ui/compile-fail-migration/trait-impl-1.stderr
+++ b/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
index cc143a6209d..cc143a6209d 100644
--- 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
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
index e23225bc124..e23225bc124 100644
--- 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
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
index 647dd4e05fa..647dd4e05fa 100644
--- a/src/test/ui/compile-fail-migration/trait-impl-different-num-params.rs
+++ b/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
index c3bbf99b06a..c3bbf99b06a 100644
--- a/src/test/ui/compile-fail-migration/trait-impl-different-num-params.stderr
+++ b/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
index 1fe8f6294da..1fe8f6294da 100644
--- a/src/test/ui/compile-fail-migration/trait-impl-for-module.rs
+++ b/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
index 62ae84da99e..62ae84da99e 100644
--- a/src/test/ui/compile-fail-migration/trait-impl-for-module.stderr
+++ b/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
index a05e007d6b7..a05e007d6b7 100644
--- a/src/test/ui/compile-fail-migration/trait-impl-method-mismatch.rs
+++ b/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
index 526a37f7651..526a37f7651 100644
--- a/src/test/ui/compile-fail-migration/trait-impl-method-mismatch.stderr
+++ b/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
index 44c53e70f86..44c53e70f86 100644
--- 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
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
index 6a97a4eccbb..6a97a4eccbb 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/trait-item-privacy.rs b/src/test/ui/traits/trait-item-privacy.rs
index f8e4f0d596e..f8e4f0d596e 100644
--- a/src/test/ui/compile-fail-migration/trait-item-privacy.rs
+++ b/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
index a3747bcee5d..a3747bcee5d 100644
--- a/src/test/ui/compile-fail-migration/trait-item-privacy.stderr
+++ b/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
index 5ab80065572..5ab80065572 100644
--- a/src/test/ui/compile-fail-migration/trait-matching-lifetimes.rs
+++ b/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
index 8f27947ff2a..8f27947ff2a 100644
--- a/src/test/ui/compile-fail-migration/trait-matching-lifetimes.stderr
+++ b/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
index 54cf6e6783e..54cf6e6783e 100644
--- a/src/test/ui/trait-method-private.rs
+++ b/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
index 3a625ae25a4..3a625ae25a4 100644
--- a/src/test/ui/trait-method-private.stderr
+++ b/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
index d3e4627a4c9..d3e4627a4c9 100644
--- a/src/test/ui/trait-object-auto-dedup-in-impl.rs
+++ b/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
index 9abd81cdcfa..9abd81cdcfa 100644
--- a/src/test/ui/trait-object-auto-dedup-in-impl.stderr
+++ b/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
index 8497a699e97..8497a699e97 100644
--- a/src/test/ui/compile-fail-migration/trait-object-macro-matcher.rs
+++ b/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
index 05511b554cc..05511b554cc 100644
--- a/src/test/ui/compile-fail-migration/trait-object-macro-matcher.stderr
+++ b/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
index baf239f5956..baf239f5956 100644
--- a/src/test/ui/compile-fail-migration/trait-object-safety.rs
+++ b/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
index be0440db4da..be0440db4da 100644
--- a/src/test/ui/compile-fail-migration/trait-object-safety.stderr
+++ b/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
index 9801cac4714..9801cac4714 100644
--- a/src/test/ui/compile-fail-migration/trait-object-vs-lifetime-2.rs
+++ b/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
index db38aca2383..db38aca2383 100644
--- a/src/test/ui/compile-fail-migration/trait-object-vs-lifetime-2.stderr
+++ b/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
index a70141edc29..a70141edc29 100644
--- a/src/test/ui/compile-fail-migration/trait-object-vs-lifetime.rs
+++ b/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
index d875e7d4845..d875e7d4845 100644
--- a/src/test/ui/compile-fail-migration/trait-object-vs-lifetime.stderr
+++ b/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
index b1e4d06affe..b1e4d06affe 100644
--- a/src/test/ui/compile-fail-migration/trait-or-new-type-instead.rs
+++ b/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
index 1b4d173c312..1b4d173c312 100644
--- a/src/test/ui/compile-fail-migration/trait-or-new-type-instead.stderr
+++ b/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
index 5f9e8ba6c0a..5f9e8ba6c0a 100644
--- a/src/test/ui/compile-fail-migration/trait-privacy.rs
+++ b/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
index d38e869df8f..d38e869df8f 100644
--- a/src/test/ui/compile-fail-migration/trait-privacy.stderr
+++ b/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
index 1f57c4cf93a..1f57c4cf93a 100644
--- a/src/test/ui/compile-fail-migration/trait-resolution-in-overloaded-op.rs
+++ b/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
index ba20eae56c7..ba20eae56c7 100644
--- a/src/test/ui/compile-fail-migration/trait-resolution-in-overloaded-op.stderr
+++ b/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
index 1a2bcc471b4..1a2bcc471b4 100644
--- a/src/test/ui/trait-safety-fn-body.rs
+++ b/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
index 0b7b6e61678..0b7b6e61678 100644
--- a/src/test/ui/trait-safety-fn-body.stderr
+++ b/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
index 059fdc100c9..059fdc100c9 100644
--- a/src/test/ui/compile-fail-migration/trait-safety-inherent-impl.rs
+++ b/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
index 5154a591c4c..5154a591c4c 100644
--- a/src/test/ui/compile-fail-migration/trait-safety-inherent-impl.stderr
+++ b/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
index f30c8f521bd..f30c8f521bd 100644
--- a/src/test/ui/compile-fail-migration/trait-safety-trait-impl-cc.rs
+++ b/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
index 0611d2da02a..0611d2da02a 100644
--- a/src/test/ui/compile-fail-migration/trait-safety-trait-impl-cc.stderr
+++ b/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
index e846b660c2a..e846b660c2a 100644
--- a/src/test/ui/compile-fail-migration/trait-safety-trait-impl.rs
+++ b/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
index 137e9f7c043..137e9f7c043 100644
--- a/src/test/ui/compile-fail-migration/trait-safety-trait-impl.stderr
+++ b/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
index 0e357d9d4d5..0e357d9d4d5 100644
--- a/src/test/ui/compile-fail-migration/trait-static-method-generic-inference.rs
+++ b/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
index a903bd998f2..a903bd998f2 100644
--- a/src/test/ui/compile-fail-migration/trait-static-method-generic-inference.stderr
+++ b/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
index a43b75d2fe8..a43b75d2fe8 100644
--- a/src/test/ui/trait-suggest-where-clause.rs
+++ b/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
index 3b335960867..3b335960867 100644
--- a/src/test/ui/trait-suggest-where-clause.stderr
+++ b/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
index b08aab6da85..b08aab6da85 100644
--- a/src/test/ui/compile-fail-migration/trait-test-2.rs
+++ b/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
index 58e91447963..58e91447963 100644
--- a/src/test/ui/compile-fail-migration/trait-test-2.stderr
+++ b/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
index d53e353d9d9..d53e353d9d9 100644
--- a/src/test/ui/compile-fail-migration/trait-test.rs
+++ b/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
index 89dbb3dee87..89dbb3dee87 100644
--- a/src/test/ui/compile-fail-migration/trait-test.stderr
+++ b/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
index 971869ba85b..971869ba85b 100644
--- 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
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
index bf5e8a77f83..bf5e8a77f83 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/traits-inductive-overflow-simultaneous.rs b/src/test/ui/traits/traits-inductive-overflow-simultaneous.rs
index 777746a189c..777746a189c 100644
--- a/src/test/ui/compile-fail-migration/traits-inductive-overflow-simultaneous.rs
+++ b/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
index 7eabb00935c..7eabb00935c 100644
--- a/src/test/ui/compile-fail-migration/traits-inductive-overflow-simultaneous.stderr
+++ b/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
index 59d5dc6c58b..59d5dc6c58b 100644
--- a/src/test/ui/compile-fail-migration/traits-inductive-overflow-supertrait-oibit.rs
+++ b/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
index 5438cc54dc6..5438cc54dc6 100644
--- a/src/test/ui/compile-fail-migration/traits-inductive-overflow-supertrait-oibit.stderr
+++ b/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
index c717ae9639f..c717ae9639f 100644
--- a/src/test/ui/compile-fail-migration/traits-inductive-overflow-supertrait.rs
+++ b/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
index 6f0929d696f..6f0929d696f 100644
--- a/src/test/ui/compile-fail-migration/traits-inductive-overflow-supertrait.stderr
+++ b/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
index c622dca2b4d..c622dca2b4d 100644
--- a/src/test/ui/compile-fail-migration/traits-inductive-overflow-two-traits.rs
+++ b/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
index 900ed1b2e8b..900ed1b2e8b 100644
--- a/src/test/ui/compile-fail-migration/traits-inductive-overflow-two-traits.stderr
+++ b/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
index 80d2884ee60..80d2884ee60 100644
--- a/src/test/ui/compile-fail-migration/traits-issue-23003-overflow.rs
+++ b/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
index 3c26e426a4e..3c26e426a4e 100644
--- a/src/test/ui/compile-fail-migration/traits-issue-23003-overflow.stderr
+++ b/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
index 392eccf0f31..392eccf0f31 100644
--- a/src/test/ui/compile-fail-migration/traits-multidispatch-bad.rs
+++ b/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
index 6068edea585..6068edea585 100644
--- a/src/test/ui/compile-fail-migration/traits-multidispatch-bad.stderr
+++ b/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
index 0d4855c544f..0d4855c544f 100644
--- a/src/test/ui/traits-multidispatch-convert-ambig-dest.rs
+++ b/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
index 46c86cd767a..46c86cd767a 100644
--- a/src/test/ui/traits-multidispatch-convert-ambig-dest.stderr
+++ b/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
index a272686c535..a272686c535 100644
--- a/src/test/ui/compile-fail-migration/traits-negative-impls.rs
+++ b/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
index 0d10f4863d3..0d10f4863d3 100644
--- a/src/test/ui/compile-fail-migration/traits-negative-impls.stderr
+++ b/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
index 559871af72e..559871af72e 100644
--- a/src/test/ui/compile-fail-migration/traits-repeated-supertrait-ambig.rs
+++ b/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
index 87d3c8117d3..87d3c8117d3 100644
--- a/src/test/ui/compile-fail-migration/traits-repeated-supertrait-ambig.stderr
+++ b/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
index 113e2ed4c80..113e2ed4c80 100644
--- a/src/test/ui/compile-fail-migration/transmute-different-sizes.rs
+++ b/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
index e33e0e93fd1..e33e0e93fd1 100644
--- a/src/test/ui/compile-fail-migration/transmute-different-sizes.stderr
+++ b/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
index 59027fc7787..59027fc7787 100644
--- a/src/test/ui/compile-fail-migration/transmute-fat-pointers.rs
+++ b/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
index e5d9459e3ec..e5d9459e3ec 100644
--- a/src/test/ui/compile-fail-migration/transmute-fat-pointers.stderr
+++ b/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
index 2f8f9e46e1a..2f8f9e46e1a 100644
--- a/src/test/ui/compile-fail-migration/transmute-impl.rs
+++ b/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
index f435e28976b..f435e28976b 100644
--- a/src/test/ui/compile-fail-migration/transmute-impl.stderr
+++ b/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
index 62db4c5d366..62db4c5d366 100644
--- a/src/test/ui/compile-fail-migration/transmute-imut-to-mut.rs
+++ b/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
index 4434e35af7f..4434e35af7f 100644
--- a/src/test/ui/compile-fail-migration/transmute-imut-to-mut.stderr
+++ b/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
index 49c9df95bc7..49c9df95bc7 100644
--- a/src/test/ui/trivial-bounds-inconsistent-associated-functions.rs
+++ b/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
index 56897baeb4e..56897baeb4e 100644
--- a/src/test/ui/trivial-bounds-inconsistent-copy-reborrow.nll.stderr
+++ b/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
index 2c4d9d81385..2c4d9d81385 100644
--- a/src/test/ui/trivial-bounds-inconsistent-copy-reborrow.rs
+++ b/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
index bea2bb66857..bea2bb66857 100644
--- a/src/test/ui/trivial-bounds-inconsistent-copy-reborrow.stderr
+++ b/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
index 375885a02c7..375885a02c7 100644
--- a/src/test/ui/trivial-bounds-inconsistent-copy.rs
+++ b/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
index ae639005756..ae639005756 100644
--- a/src/test/ui/trivial-bounds-inconsistent-copy.stderr
+++ b/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
index 1a3bd3a8cd7..1a3bd3a8cd7 100644
--- a/src/test/ui/trivial-bounds-inconsistent-projection-error.rs
+++ b/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
index 0f720bee2b4..0f720bee2b4 100644
--- a/src/test/ui/trivial-bounds-inconsistent-projection-error.stderr
+++ b/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
index 8de6f06bf5f..8de6f06bf5f 100644
--- a/src/test/ui/trivial-bounds-inconsistent-projection.rs
+++ b/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
index 201a041830f..201a041830f 100644
--- a/src/test/ui/trivial-bounds-inconsistent-projection.stderr
+++ b/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
index 14ba11c44de..14ba11c44de 100644
--- a/src/test/ui/trivial-bounds-inconsistent-sized.rs
+++ b/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
index e18018c6f0c..e18018c6f0c 100644
--- a/src/test/ui/trivial-bounds-inconsistent-sized.stderr
+++ b/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
index 5fcdbfc437a..5fcdbfc437a 100644
--- a/src/test/ui/trivial-bounds-inconsistent-well-formed.rs
+++ b/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
index b51ecd49900..b51ecd49900 100644
--- a/src/test/ui/trivial-bounds-inconsistent-well-formed.stderr
+++ b/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
index 2c8b873b8c9..2c8b873b8c9 100644
--- a/src/test/ui/trivial-bounds-inconsistent.rs
+++ b/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
index 85b16b17042..85b16b17042 100644
--- a/src/test/ui/trivial-bounds-inconsistent.stderr
+++ b/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
index 9850ec2bd1f..9850ec2bd1f 100644
--- a/src/test/ui/trivial-bounds-leak-copy.rs
+++ b/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
index 3c3fcbf9b80..3c3fcbf9b80 100644
--- a/src/test/ui/trivial-bounds-leak-copy.stderr
+++ b/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
index 98cb5b2b503..98cb5b2b503 100644
--- a/src/test/ui/trivial-bounds-leak.rs
+++ b/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
index 984e492281f..984e492281f 100644
--- a/src/test/ui/trivial-bounds-leak.stderr
+++ b/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
index e6988cb9f8b..e6988cb9f8b 100644
--- a/src/test/ui/trivial-bounds-lint.rs
+++ b/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
index 6a3e1981025..6a3e1981025 100644
--- a/src/test/ui/trivial-bounds-lint.stderr
+++ b/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
index 00986eefbda..00986eefbda 100644
--- a/src/test/ui/trivial-bounds-object.rs
+++ b/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
index 3f2bd2ffabf..3f2bd2ffabf 100644
--- a/src/test/ui/compile-fail-migration/trivial_casts.rs
+++ b/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
index dc2a6a058bd..dc2a6a058bd 100644
--- a/src/test/ui/compile-fail-migration/trivial_casts.stderr
+++ b/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
index a71f4410294..a71f4410294 100644
--- a/src/test/ui/compile-fail-migration/tuple-arity-mismatch.rs
+++ b/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
index 574a1f0a5c9..574a1f0a5c9 100644
--- a/src/test/ui/compile-fail-migration/tuple-arity-mismatch.stderr
+++ b/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
index 55bc2f77dad..55bc2f77dad 100644
--- a/src/test/ui/tuple-float-index.fixed
+++ b/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
index d569ca4cb86..d569ca4cb86 100644
--- a/src/test/ui/tuple-float-index.rs
+++ b/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
index 15af0834f03..15af0834f03 100644
--- a/src/test/ui/tuple-float-index.stderr
+++ b/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
index 471104d6872..471104d6872 100644
--- a/src/test/ui/compile-fail-migration/tuple-index-not-tuple.rs
+++ b/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
index fa0d0b4172b..fa0d0b4172b 100644
--- a/src/test/ui/compile-fail-migration/tuple-index-not-tuple.stderr
+++ b/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
index 35b843676b4..35b843676b4 100644
--- a/src/test/ui/compile-fail-migration/tuple-index-out-of-bounds.rs
+++ b/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
index 068e83ab091..068e83ab091 100644
--- a/src/test/ui/compile-fail-migration/tuple-index-out-of-bounds.stderr
+++ b/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
index 22d54a38340..22d54a38340 100644
--- a/src/test/ui/tuple-struct-fields/test.rs
+++ b/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
index 59228ea8c14..59228ea8c14 100644
--- a/src/test/ui/tuple-struct-fields/test.stderr
+++ b/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
index eead027cb13..eead027cb13 100644
--- a/src/test/ui/tuple-struct-fields/test2.rs
+++ b/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
index 983e74772ac..983e74772ac 100644
--- a/src/test/ui/tuple-struct-fields/test2.stderr
+++ b/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
index d666c8abd3c..d666c8abd3c 100644
--- a/src/test/ui/tuple-struct-fields/test3.rs
+++ b/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
index 6738595b997..6738595b997 100644
--- a/src/test/ui/tuple-struct-fields/test3.stderr
+++ b/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
index e4fda6dd534..e4fda6dd534 100644
--- a/src/test/ui/compile-fail-migration/tuple-struct-nonexhaustive.rs
+++ b/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
index ee274bedbb8..ee274bedbb8 100644
--- a/src/test/ui/compile-fail-migration/tuple-struct-nonexhaustive.stderr
+++ b/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
index dadf7eb91d8..dadf7eb91d8 100644
--- a/src/test/ui/compile-fail-migration/tutorial-suffix-inference-test.rs
+++ b/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
index d315f9b87f9..d315f9b87f9 100644
--- a/src/test/ui/compile-fail-migration/tutorial-suffix-inference-test.stderr
+++ b/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
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 trait Remote1<T> {
-    fn foo(&self, t: T) { }
+pub fn bar() -> Box<Bar> {
+    unimplemented!()
 }
 
-pub trait Remote2<T, U> {
-    fn foo(&self, t: T, u: U) { }
-}
 
-pub struct Pair<T,U>(T,U);
+pub fn try_foo(x: Foo){}
+pub fn try_bar(x: Box<Bar>){}
diff --git a/src/test/ui/compile-fail-migration/auxiliary/crate_a2.rs b/src/test/ui/type/auxiliary/crate_a2.rs
index d801f25ba2e..d801f25ba2e 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/crate_a2.rs
+++ b/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
index a17bb9e952d..a17bb9e952d 100644
--- a/src/test/ui/type-alias-bounds.rs
+++ b/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
index 2a2b0b0f26e..2a2b0b0f26e 100644
--- a/src/test/ui/type-alias-bounds.stderr
+++ b/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
index 3ed6e5daf00..3ed6e5daf00 100644
--- a/src/test/ui/type-annotation-needed.rs
+++ b/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
index d48891596df..d48891596df 100644
--- a/src/test/ui/type-annotation-needed.stderr
+++ b/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
index 04cd961e97f..04cd961e97f 100644
--- a/src/test/ui/compile-fail-migration/type-arg-out-of-scope.rs
+++ b/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
index 20bf303129f..20bf303129f 100644
--- a/src/test/ui/compile-fail-migration/type-arg-out-of-scope.stderr
+++ b/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
index d80dad8fbd4..d80dad8fbd4 100644
--- a/src/test/ui/type-ascription-instead-of-initializer.rs
+++ b/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
index 3722d2a0e3f..3722d2a0e3f 100644
--- a/src/test/ui/type-ascription-instead-of-initializer.stderr
+++ b/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
index 01d773dd5e1..01d773dd5e1 100644
--- a/src/test/ui/type-ascription-instead-of-statement-end.rs
+++ b/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
index 314c9060d4f..314c9060d4f 100644
--- a/src/test/ui/type-ascription-instead-of-statement-end.stderr
+++ b/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
index bb7a8bc3ddf..bb7a8bc3ddf 100644
--- a/src/test/ui/compile-fail-migration/type-ascription-precedence.rs
+++ b/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
index 252b5231220..252b5231220 100644
--- a/src/test/ui/compile-fail-migration/type-ascription-precedence.stderr
+++ b/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
index 2d882e87ab8..2d882e87ab8 100644
--- a/src/test/ui/compile-fail-migration/type-ascription-soundness.rs
+++ b/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
index 3dcd6ff49b3..3dcd6ff49b3 100644
--- a/src/test/ui/compile-fail-migration/type-ascription-soundness.stderr
+++ b/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
index b2c25c37e8e..b2c25c37e8e 100644
--- a/src/test/ui/type-ascription-with-fn-call.rs
+++ b/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
index 78df97139b6..78df97139b6 100644
--- a/src/test/ui/type-ascription-with-fn-call.stderr
+++ b/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
index 92a45db0689..92a45db0689 100644
--- a/src/test/ui/type-check-defaults.rs
+++ b/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
index f6d7086679a..f6d7086679a 100644
--- a/src/test/ui/type-check-defaults.stderr
+++ b/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
index d4d070ecaef..d4d070ecaef 100644
--- a/src/test/ui/type-check/assignment-in-if.rs
+++ b/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
index 7f3ce0d2a5f..7f3ce0d2a5f 100644
--- a/src/test/ui/type-check/assignment-in-if.stderr
+++ b/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
index 3ec96144da5..3ec96144da5 100644
--- 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
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
index bfdd614e50d..bfdd614e50d 100644
--- 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
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
index a4626799691..a4626799691 100644
--- 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
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
index e58a5b67c19..e58a5b67c19 100644
--- 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
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
index 930c51f52d9..930c51f52d9 100644
--- 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
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
index d7887216bc9..d7887216bc9 100644
--- 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
diff --git a/src/test/ui/type-check/issue-22897.rs b/src/test/ui/type/type-check/issue-22897.rs
index 62eaa616d31..62eaa616d31 100644
--- a/src/test/ui/type-check/issue-22897.rs
+++ b/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
index e2374809dd6..e2374809dd6 100644
--- a/src/test/ui/type-check/issue-22897.stderr
+++ b/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
index d2817062b27..d2817062b27 100644
--- a/src/test/ui/type-check/issue-40294.rs
+++ b/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
index fbb7427ae3e..fbb7427ae3e 100644
--- a/src/test/ui/type-check/issue-40294.stderr
+++ b/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
index 7b4d2f05f5f..7b4d2f05f5f 100644
--- a/src/test/ui/type-check/issue-41314.rs
+++ b/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
index f7d4bb9a02f..f7d4bb9a02f 100644
--- a/src/test/ui/type-check/issue-41314.stderr
+++ b/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
index b3e79ce2447..b3e79ce2447 100644
--- a/src/test/ui/type-check/missing_trait_impl.rs
+++ b/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
index 4b01a626814..4b01a626814 100644
--- a/src/test/ui/type-check/missing_trait_impl.stderr
+++ b/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
index 0c355976330..0c355976330 100644
--- a/src/test/ui/type-check/unknown_type_for_closure.rs
+++ b/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
index 25283f5e76b..25283f5e76b 100644
--- a/src/test/ui/type-check/unknown_type_for_closure.stderr
+++ b/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
index db27ae89e69..db27ae89e69 100644
--- a/src/test/ui/type-dependent-def-issue-49241.rs
+++ b/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
index 361d28f274f..361d28f274f 100644
--- a/src/test/ui/type-dependent-def-issue-49241.stderr
+++ b/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
index 9359c035956..9359c035956 100644
--- a/src/test/ui/compile-fail-migration/type-mismatch-multiple.rs
+++ b/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
index b9721a5edfa..b9721a5edfa 100644
--- a/src/test/ui/compile-fail-migration/type-mismatch-multiple.stderr
+++ b/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
index 7e93f626cfc..7e93f626cfc 100644
--- a/src/test/ui/compile-fail-migration/type-mismatch-same-crate-name.rs
+++ b/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
index c6860926056..c6860926056 100644
--- a/src/test/ui/compile-fail-migration/type-mismatch-same-crate-name.stderr
+++ b/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
index 2592b07eda7..2592b07eda7 100644
--- a/src/test/ui/type-mismatch.rs
+++ b/src/test/ui/type/type-mismatch.rs
diff --git a/src/test/ui/type-mismatch.stderr b/src/test/ui/type/type-mismatch.stderr
index 4ba1a7f37c4..4ba1a7f37c4 100644
--- a/src/test/ui/type-mismatch.stderr
+++ b/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
index 08988353886..08988353886 100644
--- 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
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
index f02bf0533a3..f02bf0533a3 100644
--- 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
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
index 9982d485024..9982d485024 100644
--- a/src/test/ui/compile-fail-migration/type-parameter-defaults-referencing-Self.rs
+++ b/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
index e163253bdf9..e163253bdf9 100644
--- a/src/test/ui/compile-fail-migration/type-parameter-defaults-referencing-Self.stderr
+++ b/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
index 11a2fc2665c..11a2fc2665c 100644
--- a/src/test/ui/compile-fail-migration/type-parameter-names.rs
+++ b/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
index 8e3d39357ed..8e3d39357ed 100644
--- a/src/test/ui/compile-fail-migration/type-parameter-names.stderr
+++ b/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
index 26eac6adde2..26eac6adde2 100644
--- 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
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
index 31f332f6095..31f332f6095 100644
--- 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
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
index 7de061eaf07..7de061eaf07 100644
--- 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
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
index af18185dd24..af18185dd24 100644
--- 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
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
index 3ad1e9ab538..3ad1e9ab538 100644
--- 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
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
index e1b4cbb2ab3..e1b4cbb2ab3 100644
--- 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
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
index 7ef099d0410..7ef099d0410 100644
--- a/src/test/ui/compile-fail-migration/type-path-err-node-types.rs
+++ b/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
index c28b30b5456..c28b30b5456 100644
--- a/src/test/ui/compile-fail-migration/type-path-err-node-types.stderr
+++ b/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
index 4bb739800df..4bb739800df 100644
--- a/src/test/ui/type-recursive.rs
+++ b/src/test/ui/type/type-recursive.rs
diff --git a/src/test/ui/type-recursive.stderr b/src/test/ui/type/type-recursive.stderr
index c0c2cbc857a..c0c2cbc857a 100644
--- a/src/test/ui/type-recursive.stderr
+++ b/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
index 6d8c0fe22bd..6d8c0fe22bd 100644
--- a/src/test/ui/compile-fail-migration/type-shadow.rs
+++ b/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
index 29e6e4352e2..29e6e4352e2 100644
--- a/src/test/ui/compile-fail-migration/type-shadow.stderr
+++ b/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
index d283f392d76..d283f392d76 100644
--- a/src/test/ui/compile-fail-migration/type_length_limit.rs
+++ b/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
index 910eca07594..910eca07594 100644
--- a/src/test/ui/compile-fail-migration/type_length_limit.stderr
+++ b/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
index f6f7a250174..f6f7a250174 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/tdticc_coherence_lib.rs
+++ b/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
index fa63088d000..fa63088d000 100644
--- 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
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
index 8fff0e2bb1c..8fff0e2bb1c 100644
--- 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
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
index c8cf96f52fc..c8cf96f52fc 100644
--- a/src/test/ui/compile-fail-migration/typeck-auto-trait-no-supertraits.rs
+++ b/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
index 26542286807..26542286807 100644
--- a/src/test/ui/compile-fail-migration/typeck-auto-trait-no-supertraits.stderr
+++ b/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
index 15fc3ecab97..15fc3ecab97 100644
--- a/src/test/ui/typeck-builtin-bound-type-parameters.rs
+++ b/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
index 221f05b9150..221f05b9150 100644
--- a/src/test/ui/typeck-builtin-bound-type-parameters.stderr
+++ b/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
index 3f8b8f49cb3..3f8b8f49cb3 100644
--- a/src/test/ui/compile-fail-migration/typeck-cast-pointer-to-float.rs
+++ b/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
index 437675ccb06..437675ccb06 100644
--- a/src/test/ui/compile-fail-migration/typeck-cast-pointer-to-float.stderr
+++ b/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
index f8342c333a3..f8342c333a3 100644
--- 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
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
index ad47fcdb042..ad47fcdb042 100644
--- 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
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
index 6e7c9afb674..6e7c9afb674 100644
--- 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
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
index a52628e233c..a52628e233c 100644
--- 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
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
index 4660ecf4fb4..4660ecf4fb4 100644
--- 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
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
index 2e382dd05cb..2e382dd05cb 100644
--- 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
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
index b918b0dde47..b918b0dde47 100644
--- 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
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
index 6efb7f39f3b..6efb7f39f3b 100644
--- 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
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
index 65438e5df8e..65438e5df8e 100644
--- 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
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
index 8dc7df90355..8dc7df90355 100644
--- 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
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
index c829ba3dcc3..c829ba3dcc3 100644
--- 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
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
index b0fe2c599be..b0fe2c599be 100644
--- 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
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
index b28cdd8aa24..b28cdd8aa24 100644
--- a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-negation.rs
+++ b/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
index 4427955c4b2..4427955c4b2 100644
--- a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-negation.stderr
+++ b/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
index d63d70bad22..d63d70bad22 100644
--- a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-precedence.rs
+++ b/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
index 0ab5eaaa34f..0ab5eaaa34f 100644
--- a/src/test/ui/compile-fail-migration/typeck-default-trait-impl-precedence.stderr
+++ b/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
index 0c548b3bd99..0c548b3bd99 100644
--- 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
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
index 82f31176f3e..82f31176f3e 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/typeck-negative-impls-builtin.rs b/src/test/ui/typeck/typeck-negative-impls-builtin.rs
index d6d8fb6235d..d6d8fb6235d 100644
--- a/src/test/ui/compile-fail-migration/typeck-negative-impls-builtin.rs
+++ b/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
index 6ae323aedfe..6ae323aedfe 100644
--- a/src/test/ui/compile-fail-migration/typeck-negative-impls-builtin.stderr
+++ b/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
index fcfc8574b21..fcfc8574b21 100644
--- a/src/test/ui/compile-fail-migration/typeck-unsafe-always-share.rs
+++ b/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
index 57c4bdf0ad2..57c4bdf0ad2 100644
--- a/src/test/ui/compile-fail-migration/typeck-unsafe-always-share.stderr
+++ b/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
index d4f3cdfd8b7..d4f3cdfd8b7 100644
--- a/src/test/ui/typeck_type_placeholder_item.rs
+++ b/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
index 3f814085955..3f814085955 100644
--- a/src/test/ui/typeck_type_placeholder_item.stderr
+++ b/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
index 49774ab173a..49774ab173a 100644
--- a/src/test/ui/typeck_type_placeholder_lifetime_1.rs
+++ b/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
index fe9566b3181..fe9566b3181 100644
--- a/src/test/ui/typeck_type_placeholder_lifetime_1.stderr
+++ b/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
index 40617613ed7..40617613ed7 100644
--- a/src/test/ui/typeck_type_placeholder_lifetime_2.rs
+++ b/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
index 64ec4245466..64ec4245466 100644
--- a/src/test/ui/typeck_type_placeholder_lifetime_2.stderr
+++ b/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
index 91e3c38322e..91e3c38322e 100644
--- a/src/test/ui/compile-fail-migration/typeck_type_placeholder_mismatch.rs
+++ b/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
index 6a762353819..6a762353819 100644
--- a/src/test/ui/compile-fail-migration/typeck_type_placeholder_mismatch.stderr
+++ b/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
index a0d1f2dc331..a0d1f2dc331 100644
--- a/src/test/ui/compile-fail-migration/ufcs-explicit-self-bad.rs
+++ b/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
index fce74605cad..fce74605cad 100644
--- a/src/test/ui/compile-fail-migration/ufcs-explicit-self-bad.stderr
+++ b/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
index f7120ddb114..f7120ddb114 100644
--- a/src/test/ui/compile-fail-migration/ufcs-partially-resolved.rs
+++ b/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
index 5de8fb158b7..5de8fb158b7 100644
--- a/src/test/ui/compile-fail-migration/ufcs-partially-resolved.stderr
+++ b/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
index 5c108e05216..5c108e05216 100644
--- a/src/test/ui/compile-fail-migration/ufcs-qpath-missing-params.rs
+++ b/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
index 6c752dba6b4..6c752dba6b4 100644
--- a/src/test/ui/compile-fail-migration/ufcs-qpath-missing-params.stderr
+++ b/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
index caf510071bd..caf510071bd 100644
--- a/src/test/ui/compile-fail-migration/ufcs-qpath-self-mismatch.rs
+++ b/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
index f4222631872..f4222631872 100644
--- a/src/test/ui/compile-fail-migration/ufcs-qpath-self-mismatch.stderr
+++ b/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
index 3a3ea058b4e..3a3ea058b4e 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closure-feature-gate.rs
+++ b/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
index aea57d9cb4e..aea57d9cb4e 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closure-feature-gate.stderr
+++ b/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
index e74c66c27b1..e74c66c27b1 100644
--- 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
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
index 427be560760..427be560760 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closure-illegal-move.rs
+++ b/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
index 7ff4c1c03ba..7ff4c1c03ba 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closure-illegal-move.stderr
+++ b/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
index 084d7ff3bcd..084d7ff3bcd 100644
--- 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
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
index 2d998374229..2d998374229 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closure-immutable-capture.rs
+++ b/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
index 02fbb5f17ee..02fbb5f17ee 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closure-immutable-capture.stderr
+++ b/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
index 506bce0dbec..506bce0dbec 100644
--- a/src/test/ui/unboxed-closure-no-cyclic-sig.rs
+++ b/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
index 0c0c339286e..0c0c339286e 100644
--- a/src/test/ui/unboxed-closure-no-cyclic-sig.stderr
+++ b/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
index cc635296210..cc635296210 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closure-region.rs
+++ b/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
index a838c3608b9..a838c3608b9 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closure-region.stderr
+++ b/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
index 849f7e0573c..849f7e0573c 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-default.rs
+++ b/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
index fccf295b72c..fccf295b72c 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-default.stderr
+++ b/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
index 0cf44a2ca61..0cf44a2ca61 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-equiv.rs
+++ b/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
index 7d687a55df9..7d687a55df9 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-equiv.stderr
+++ b/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
index a6f59b78823..a6f59b78823 100644
--- 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
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
index fa74e6e6607..fa74e6e6607 100644
--- 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
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
index ed27a4d0b2a..ed27a4d0b2a 100644
--- 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
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
index bda88f4e4d7..bda88f4e4d7 100644
--- 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
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
index 18a1185d695..18a1185d695 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-region.rs
+++ b/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
index 663034ba143..663034ba143 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closure-sugar-region.stderr
+++ b/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
index 3f88f16d2c3..3f88f16d2c3 100644
--- 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
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
index 1ca99680b53..1ca99680b53 100644
--- 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
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
index 42fffe546c2..42fffe546c2 100644
--- 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
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
index d6c08a70565..d6c08a70565 100644
--- 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
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
index 5fcde4facbe..5fcde4facbe 100644
--- 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
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
index 954ec4d63a6..954ec4d63a6 100644
--- 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
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
index bb7e02d0d8b..bb7e02d0d8b 100644
--- 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
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
index e7476f0fa6d..e7476f0fa6d 100644
--- 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
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
index 20fdd52b82a..20fdd52b82a 100644
--- 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
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
index feac4274357..feac4274357 100644
--- 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
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
index 027fa6b0fe3..027fa6b0fe3 100644
--- 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
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
index 457bea046c7..457bea046c7 100644
--- 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
diff --git a/src/test/ui/unboxed-closure-sugar-wrong-trait.rs b/src/test/ui/unboxed-closures/unboxed-closure-sugar-wrong-trait.rs
index 1519ceb8988..1519ceb8988 100644
--- a/src/test/ui/unboxed-closure-sugar-wrong-trait.rs
+++ b/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
index 82ba4e66393..82ba4e66393 100644
--- a/src/test/ui/unboxed-closure-sugar-wrong-trait.stderr
+++ b/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
index 734f89e5e0b..734f89e5e0b 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closures-borrow-conflict.rs
+++ b/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
index 9bdd1022fd1..9bdd1022fd1 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closures-borrow-conflict.stderr
+++ b/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
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
index ce60521034e..ce60521034e 100644
--- 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
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
index 8390e9f0f95..8390e9f0f95 100644
--- 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
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
index 8f5bf827fcf..8f5bf827fcf 100644
--- 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
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
index fd6858cf7bf..fd6858cf7bf 100644
--- 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
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
index 2e865b2aac8..2e865b2aac8 100644
--- 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
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
index 95aa3f15b76..95aa3f15b76 100644
--- 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
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
index a113c1ae27f..a113c1ae27f 100644
--- 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
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
index bfb24c58722..bfb24c58722 100644
--- 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
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
index 7e59347155b..7e59347155b 100644
--- 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
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
index 481346ad4b6..481346ad4b6 100644
--- 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
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
index 0062ea77c0b..0062ea77c0b 100644
--- 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
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
index 718c3a19938..718c3a19938 100644
--- 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
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
index 7c5ea031596..7c5ea031596 100644
--- 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
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
index bb2ffcd21b0..bb2ffcd21b0 100644
--- 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
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
index c57f97652b3..c57f97652b3 100644
--- 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
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
index 9e4ed307996..9e4ed307996 100644
--- 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
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
index 22e11b6977c..22e11b6977c 100644
--- 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
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
index a26dc08e54a..a26dc08e54a 100644
--- 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
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
index de17d25b4c3..de17d25b4c3 100644
--- 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
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
index f9fd6c21b70..f9fd6c21b70 100644
--- 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
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
index f4756696b6b..f4756696b6b 100644
--- 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
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
index 0050fbdde26..0050fbdde26 100644
--- 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
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
index c713b3dd8fe..c713b3dd8fe 100644
--- 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
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
index 95ed6736278..95ed6736278 100644
--- 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
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
index f9709b8c596..f9709b8c596 100644
--- 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
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
index a9006318cd8..a9006318cd8 100644
--- 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
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
index f765f207303..f765f207303 100644
--- 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
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
index 35052ec0bd5..35052ec0bd5 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closures-mutate-upvar.rs
+++ b/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
index 1164a864b6b..1164a864b6b 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closures-mutate-upvar.stderr
+++ b/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
index be18e7cee91..be18e7cee91 100644
--- 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
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
index 756bf06440c..756bf06440c 100644
--- 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
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
index be18e7cee91..be18e7cee91 100644
--- 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
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
index f20719ec7fa..f20719ec7fa 100644
--- 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
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
index e2747e1bb62..e2747e1bb62 100644
--- 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
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
index 433c0c839c5..433c0c839c5 100644
--- 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
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
index eec48dd78b0..eec48dd78b0 100644
--- 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
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
index 1c133fbfcdb..1c133fbfcdb 100644
--- 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
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
index 53386f0e68e..53386f0e68e 100644
--- 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
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
index dba4c8cc2e9..dba4c8cc2e9 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closures-type-mismatch.rs
+++ b/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
index 7e11130573b..7e11130573b 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closures-type-mismatch.stderr
+++ b/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
index 5ba93bf483f..5ba93bf483f 100644
--- 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
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
index 16b2b11ad7b..16b2b11ad7b 100644
--- 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
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
index ff06f7c559b..ff06f7c559b 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closures-wrong-abi.rs
+++ b/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
index 6e5e1b928a2..6e5e1b928a2 100644
--- a/src/test/ui/compile-fail-migration/unboxed-closures-wrong-abi.stderr
+++ b/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
index d77750d2a04..d77750d2a04 100644
--- 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
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
index 5c2e73f5716..5c2e73f5716 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/underscore-lifetime-binders.rs b/src/test/ui/underscore-lifetime/underscore-lifetime-binders.rs
index 6a6698957d9..6a6698957d9 100644
--- a/src/test/ui/compile-fail-migration/underscore-lifetime-binders.rs
+++ b/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
index 4917c2795e3..4917c2795e3 100644
--- a/src/test/ui/compile-fail-migration/underscore-lifetime-binders.stderr
+++ b/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
index eef04cbf351..eef04cbf351 100644
--- 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
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
index b36c8eb324e..b36c8eb324e 100644
--- a/src/test/ui/compile-fail-migration/underscore-lifetime-elison-mismatch.rs
+++ b/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
index 0847ea362c9..0847ea362c9 100644
--- a/src/test/ui/compile-fail-migration/underscore-lifetime-elison-mismatch.stderr
+++ b/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
index 2a5d25e6b98..2a5d25e6b98 100644
--- a/src/test/ui/compile-fail-migration/uninhabited-enum-cast.rs
+++ b/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
index 058f8fba77c..058f8fba77c 100644
--- a/src/test/ui/compile-fail-migration/uninhabited-enum-cast.stderr
+++ b/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
index 05a97b855e7..05a97b855e7 100644
--- a/src/test/ui/compile-fail-migration/uninhabited-irrefutable.rs
+++ b/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
index e14ca626222..e14ca626222 100644
--- a/src/test/ui/compile-fail-migration/uninhabited-irrefutable.stderr
+++ b/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
index 1d3f8ff12d8..1d3f8ff12d8 100644
--- a/src/test/ui/compile-fail-migration/uninhabited-matches-feature-gated.rs
+++ b/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
index d86ebda027e..d86ebda027e 100644
--- a/src/test/ui/compile-fail-migration/uninhabited-matches-feature-gated.stderr
+++ b/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
index 2cf4b78bdff..2cf4b78bdff 100644
--- a/src/test/ui/compile-fail-migration/uninhabited-patterns.rs
+++ b/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
index f11ff7c13b5..f11ff7c13b5 100644
--- a/src/test/ui/compile-fail-migration/uninhabited-patterns.stderr
+++ b/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
index 935e69d2e22..935e69d2e22 100644
--- a/src/test/ui/compile-fail-migration/union-ub-fat-ptr.rs
+++ b/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
index f8877e35f7a..f8877e35f7a 100644
--- a/src/test/ui/compile-fail-migration/union-ub-fat-ptr.stderr
+++ b/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
index 1ca2a56e757..1ca2a56e757 100644
--- 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
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
index 5f504feabb2..5f504feabb2 100644
--- 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
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
index d855435416e..d855435416e 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/union/union-const-pat.rs b/src/test/ui/union/union-const-pat.rs
index 5f75e3cc4a2..5f75e3cc4a2 100644
--- a/src/test/ui/compile-fail-migration/union/union-const-pat.rs
+++ b/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
index 2d9c9a5e520..2d9c9a5e520 100644
--- a/src/test/ui/compile-fail-migration/union/union-const-pat.stderr
+++ b/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
index 9014b3f2956..9014b3f2956 100644
--- a/src/test/ui/compile-fail-migration/union/union-copy.rs
+++ b/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
index 05da9e90af7..05da9e90af7 100644
--- a/src/test/ui/compile-fail-migration/union/union-copy.stderr
+++ b/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
index 6e226d7d79f..6e226d7d79f 100644
--- a/src/test/ui/compile-fail-migration/union/union-derive-clone.rs
+++ b/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
index e9a92b4452a..e9a92b4452a 100644
--- a/src/test/ui/compile-fail-migration/union/union-derive-clone.stderr
+++ b/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
index ffd290fb073..ffd290fb073 100644
--- a/src/test/ui/compile-fail-migration/union/union-derive.rs
+++ b/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
index e8e11e832d9..e8e11e832d9 100644
--- a/src/test/ui/compile-fail-migration/union/union-derive.stderr
+++ b/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
index 1f499c49a68..1f499c49a68 100644
--- a/src/test/ui/compile-fail-migration/union/union-empty.rs
+++ b/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
index 5abe45814ac..5abe45814ac 100644
--- a/src/test/ui/compile-fail-migration/union/union-empty.stderr
+++ b/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
index 8bd422b42d8..8bd422b42d8 100644
--- a/src/test/ui/compile-fail-migration/union/union-generic.rs
+++ b/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
index dbfffa005fb..dbfffa005fb 100644
--- a/src/test/ui/compile-fail-migration/union/union-generic.stderr
+++ b/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
index a64187c5f23..a64187c5f23 100644
--- a/src/test/ui/compile-fail-migration/union/union-lint-dead-code.rs
+++ b/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
index 2cd3aab8c29..2cd3aab8c29 100644
--- a/src/test/ui/compile-fail-migration/union/union-lint-dead-code.stderr
+++ b/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
index cb4683c2a0e..cb4683c2a0e 100644
--- a/src/test/ui/compile-fail-migration/union/union-nonrepresentable.rs
+++ b/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
index 17d78ea4c2b..17d78ea4c2b 100644
--- a/src/test/ui/compile-fail-migration/union/union-nonrepresentable.stderr
+++ b/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
index 36c42ce1104..36c42ce1104 100644
--- a/src/test/ui/compile-fail-migration/union/union-repr-c.rs
+++ b/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
index ddf50049192..ddf50049192 100644
--- a/src/test/ui/compile-fail-migration/union/union-repr-c.stderr
+++ b/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
index d993816e6f4..d993816e6f4 100644
--- a/src/test/ui/compile-fail-migration/union/union-unsafe.rs
+++ b/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
index a0b3d98f7a0..a0b3d98f7a0 100644
--- a/src/test/ui/compile-fail-migration/union/union-unsafe.stderr
+++ b/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
index d79c2ed710e..d79c2ed710e 100644
--- a/src/test/ui/compile-fail-migration/union/union-unsized.rs
+++ b/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
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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index 87a72efbe08..87a72efbe08 100644
--- 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
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
index 2d3d539cda5..2d3d539cda5 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/unique-object-noncopyable.rs b/src/test/ui/unique-object-noncopyable.rs
index c44718c4fc9..c44718c4fc9 100644
--- a/src/test/ui/compile-fail-migration/unique-object-noncopyable.rs
+++ b/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
index 777b9f19bad..777b9f19bad 100644
--- a/src/test/ui/compile-fail-migration/unique-object-noncopyable.stderr
+++ b/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
index c09feec1d4a..c09feec1d4a 100644
--- a/src/test/ui/compile-fail-migration/unique-pinned-nocopy.rs
+++ b/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
index ddc676601fa..ddc676601fa 100644
--- a/src/test/ui/compile-fail-migration/unique-pinned-nocopy.stderr
+++ b/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
index 78b736edceb..78b736edceb 100644
--- a/src/test/ui/compile-fail-migration/unknown-lint-tool-name.rs
+++ b/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
index 29c3a642d87..29c3a642d87 100644
--- a/src/test/ui/compile-fail-migration/unknown-lint-tool-name.stderr
+++ b/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
index 99c336c28cd..99c336c28cd 100644
--- a/src/test/ui/compile-fail-migration/unknown-tool-name.rs
+++ b/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
index 151f957ac56..151f957ac56 100644
--- a/src/test/ui/compile-fail-migration/unknown-tool-name.stderr
+++ b/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
index 111940aab2c..111940aab2c 100644
--- a/src/test/ui/compile-fail-migration/unop-move-semantics.nll.stderr
+++ b/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
index 94656667598..94656667598 100644
--- a/src/test/ui/compile-fail-migration/unop-move-semantics.rs
+++ b/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
index 42d17e54aa2..42d17e54aa2 100644
--- a/src/test/ui/compile-fail-migration/unop-move-semantics.stderr
+++ b/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
index 316e17c54ad..316e17c54ad 100644
--- a/src/test/ui/compile-fail-migration/unop-neg-bool.rs
+++ b/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
index 8ffb71ec4ce..8ffb71ec4ce 100644
--- a/src/test/ui/compile-fail-migration/unop-neg-bool.stderr
+++ b/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
index 8ca85f20ab2..8ca85f20ab2 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/unreachable_variant.rs
+++ b/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
index df827d2c784..df827d2c784 100644
--- a/src/test/ui/compile-fail-migration/unreachable-arm.rs
+++ b/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
index 6bd3f281ea9..6bd3f281ea9 100644
--- a/src/test/ui/compile-fail-migration/unreachable-arm.stderr
+++ b/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
index dd08eed5df9..dd08eed5df9 100644
--- a/src/test/ui/compile-fail-migration/unreachable-code.rs
+++ b/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
index 0c5d94c6502..0c5d94c6502 100644
--- a/src/test/ui/compile-fail-migration/unreachable-code.stderr
+++ b/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
index 72462468432..72462468432 100644
--- a/src/test/ui/compile-fail-migration/unreachable-in-call.rs
+++ b/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
index 215829af443..215829af443 100644
--- a/src/test/ui/compile-fail-migration/unreachable-in-call.stderr
+++ b/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
index cfd829e416e..cfd829e416e 100644
--- a/src/test/ui/compile-fail-migration/unreachable-loop-patterns.rs
+++ b/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
index 724a92b0947..724a92b0947 100644
--- a/src/test/ui/compile-fail-migration/unreachable-loop-patterns.stderr
+++ b/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
index df340095bb4..df340095bb4 100644
--- a/src/test/ui/compile-fail-migration/unreachable-try-pattern.rs
+++ b/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
index a8a0ed3d03b..a8a0ed3d03b 100644
--- a/src/test/ui/compile-fail-migration/unreachable-try-pattern.stderr
+++ b/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
index 5983c83f8b4..5983c83f8b4 100644
--- a/src/test/ui/compile-fail-migration/unreachable-variant.rs
+++ b/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
index fff77586549..fff77586549 100644
--- a/src/test/ui/compile-fail-migration/unreachable-variant.stderr
+++ b/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
index 714b73ec739..714b73ec739 100644
--- a/src/test/ui/compile-fail-migration/unresolved-extern-mod-suggestion.rs
+++ b/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
index 4e3ea573d27..4e3ea573d27 100644
--- a/src/test/ui/compile-fail-migration/unresolved-extern-mod-suggestion.stderr
+++ b/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
index 8173f69191d..8173f69191d 100644
--- a/src/test/ui/compile-fail-migration/unresolved-import-recovery.rs
+++ b/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
index d4304195eb1..d4304195eb1 100644
--- a/src/test/ui/compile-fail-migration/unresolved-import-recovery.stderr
+++ b/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
index a3eeb6de96b..a3eeb6de96b 100644
--- a/src/test/ui/compile-fail-migration/unresolved-import.rs
+++ b/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
index 1e663cde48a..1e663cde48a 100644
--- a/src/test/ui/compile-fail-migration/unresolved-import.stderr
+++ b/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
index 484a8979d71..484a8979d71 100644
--- a/src/test/ui/compile-fail-migration/unsafe-around-compiler-generated-unsafe.rs
+++ b/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
index 849630ac34e..849630ac34e 100644
--- a/src/test/ui/compile-fail-migration/unsafe-around-compiler-generated-unsafe.stderr
+++ b/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
index b6fb3ec5c44..b6fb3ec5c44 100644
--- a/src/test/ui/unsafe-block-without-braces.rs
+++ b/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
index e6d2403ac4c..e6d2403ac4c 100644
--- a/src/test/ui/unsafe-block-without-braces.stderr
+++ b/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
index 765e2059a4b..765e2059a4b 100644
--- a/src/test/ui/unsafe-const-fn.rs
+++ b/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
index d4b3ed687e5..d4b3ed687e5 100644
--- a/src/test/ui/unsafe-const-fn.stderr
+++ b/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
index baf2002a94f..baf2002a94f 100644
--- a/src/test/ui/compile-fail-migration/unsafe-fn-assign-deref-ptr.rs
+++ b/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
index e98600a8f2f..e98600a8f2f 100644
--- a/src/test/ui/compile-fail-migration/unsafe-fn-assign-deref-ptr.stderr
+++ b/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
index 15b304c69ba..15b304c69ba 100644
--- a/src/test/ui/compile-fail-migration/unsafe-fn-autoderef.rs
+++ b/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
index 13fcbb347c9..13fcbb347c9 100644
--- a/src/test/ui/compile-fail-migration/unsafe-fn-autoderef.stderr
+++ b/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
index 46f28da43d0..46f28da43d0 100644
--- a/src/test/ui/compile-fail-migration/unsafe-fn-called-from-safe.rs
+++ b/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
index a781347040e..a781347040e 100644
--- a/src/test/ui/compile-fail-migration/unsafe-fn-called-from-safe.stderr
+++ b/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
index 8e3ce8ff9b5..8e3ce8ff9b5 100644
--- a/src/test/ui/compile-fail-migration/unsafe-fn-deref-ptr.rs
+++ b/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
index 885f6e446fe..885f6e446fe 100644
--- a/src/test/ui/compile-fail-migration/unsafe-fn-deref-ptr.stderr
+++ b/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
index f09a0c7107a..f09a0c7107a 100644
--- a/src/test/ui/compile-fail-migration/unsafe-fn-used-as-value.rs
+++ b/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
index 7f8af300be5..7f8af300be5 100644
--- a/src/test/ui/compile-fail-migration/unsafe-fn-used-as-value.stderr
+++ b/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
index b4e425e7bbf..b4e425e7bbf 100644
--- a/src/test/ui/compile-fail-migration/unsafe-move-val-init.rs
+++ b/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
index be92623b5d0..be92623b5d0 100644
--- a/src/test/ui/compile-fail-migration/unsafe-move-val-init.stderr
+++ b/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
index f4867636819..f4867636819 100644
--- a/src/test/ui/compile-fail-migration/unsafe-subtyping.rs
+++ b/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
index 645f2a7939e..645f2a7939e 100644
--- a/src/test/ui/compile-fail-migration/unsafe-subtyping.stderr
+++ b/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
index fb4652affd0..fb4652affd0 100644
--- a/src/test/ui/compile-fail-migration/unsafe-trait-impl.rs
+++ b/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
index ae47d6c1627..ae47d6c1627 100644
--- a/src/test/ui/compile-fail-migration/unsafe-trait-impl.stderr
+++ b/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
index 498bdded350..498bdded350 100644
--- a/src/test/ui/compile-fail-migration/unsized-bare-typaram.rs
+++ b/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
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<T: ?Sized>() { bar::<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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index 4a6a5557c95..4a6a5557c95 100644
--- a/src/test/ui/compile-fail-migration/unsized-enum.rs
+++ b/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
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<T: ?Sized>() { not_sized::<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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index dadcc4206c3..dadcc4206c3 100644
--- a/src/test/ui/unsized-enum2.rs
+++ b/src/test/ui/unsized/unsized-enum2.rs
diff --git a/src/test/ui/unsized-enum2.stderr b/src/test/ui/unsized/unsized-enum2.stderr
index ecaa0146469..ecaa0146469 100644
--- a/src/test/ui/unsized-enum2.stderr
+++ b/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
index a679bf77015..a679bf77015 100644
--- a/src/test/ui/compile-fail-migration/unsized-inherent-impl-self-type.rs
+++ b/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
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<X: ?Sized> S5<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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index f2c63455c51..f2c63455c51 100644
--- a/src/test/ui/compile-fail-migration/unsized-struct.rs
+++ b/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
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<T: ?Sized>() { not_sized::<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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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<T: ?Sized>() { is_sized::<Bar<T>>() }
    |                        ^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
    |
    = help: within `Bar<T>`, the trait `std::marker::Sized` is not implemented for `T`
-   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = help: consider adding a `where T: std::marker::Sized` bound
    = note: required because it appears within the type `Bar<T>`
 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
index 5c0b8f12402..5c0b8f12402 100644
--- a/src/test/ui/compile-fail-migration/unsized-trait-impl-self-type.rs
+++ b/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
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<X: ?Sized> T3<X> for S5<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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index 875a52e11c0..875a52e11c0 100644
--- a/src/test/ui/compile-fail-migration/unsized-trait-impl-trait-arg.rs
+++ b/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
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<X: ?Sized> T2<X> for S4<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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index 2e346e473ca..2e346e473ca 100644
--- a/src/test/ui/compile-fail-migration/unsized3.rs
+++ b/src/test/ui/unsized3.rs
diff --git a/src/test/ui/compile-fail-migration/unsized3.stderr b/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>(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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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>(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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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<X>`, the trait `std::marker::Sized` is not implemented for `X`
-   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = help: consider adding a `where X: std::marker::Sized` bound
    = note: required because it appears within the type `S<X>`
 note: required by `f5`
@@ -51,7 +51,7 @@ LL |     f5(&(*x1, 34));
    |     ^^ doesn't have a size known at compile-time
    |
    = help: within `S<X>`, the trait `std::marker::Sized` is not implemented for `X`
-   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = help: consider adding a `where X: std::marker::Sized` bound
    = note: required because it appears within the type `S<X>`
    = 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<X>)`, the trait `std::marker::Sized` is not implemented for `X`
-   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = help: consider adding a `where X: std::marker::Sized` bound
    = note: required because it appears within the type `S<X>`
    = note: required because it appears within the type `({integer}, S<X>)`
@@ -76,7 +76,7 @@ LL |     f5(&(32, *x1));
    |     ^^ doesn't have a size known at compile-time
    |
    = help: within `({integer}, S<X>)`, the trait `std::marker::Sized` is not implemented for `X`
-   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = help: consider adding a `where X: std::marker::Sized` bound
    = note: required because it appears within the type `S<X>`
    = note: required because it appears within the type `({integer}, S<X>)`
diff --git a/src/test/ui/compile-fail-migration/unsized5.rs b/src/test/ui/unsized5.rs
index a50786e306a..a50786e306a 100644
--- a/src/test/ui/compile-fail-migration/unsized5.rs
+++ b/src/test/ui/unsized5.rs
diff --git a/src/test/ui/compile-fail-migration/unsized5.stderr b/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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index 1a57f2caf8d..1a57f2caf8d 100644
--- a/src/test/ui/compile-fail-migration/unsized6.rs
+++ b/src/test/ui/unsized6.rs
diff --git a/src/test/ui/compile-fail-migration/unsized6.stderr b/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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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: ?Sized>(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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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: ?Sized + T>(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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index 07b4ae4c394..07b4ae4c394 100644
--- a/src/test/ui/compile-fail-migration/unsized7.rs
+++ b/src/test/ui/unsized7.rs
diff --git a/src/test/ui/compile-fail-migration/unsized7.stderr b/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<X: ?Sized + T> T1<X> for S3<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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index cf8f3e91602..cf8f3e91602 100644
--- a/src/test/ui/compile-fail-migration/unspecified-self-in-trait-ref.rs
+++ b/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
index c036540068b..c036540068b 100644
--- a/src/test/ui/compile-fail-migration/unspecified-self-in-trait-ref.stderr
+++ b/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
index 5137663a269..5137663a269 100644
--- a/src/test/ui/compile-fail-migration/unsupported-cast.rs
+++ b/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
index 4babc01ad7f..4babc01ad7f 100644
--- a/src/test/ui/compile-fail-migration/unsupported-cast.stderr
+++ b/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
index e20d03478ec..e20d03478ec 100644
--- a/src/test/ui/compile-fail-migration/unused-attr.rs
+++ b/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
index 7265dd3c63f..7265dd3c63f 100644
--- a/src/test/ui/compile-fail-migration/unused-attr.stderr
+++ b/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
index 5e401c09bda..5e401c09bda 100644
--- a/src/test/ui/compile-fail-migration/unused-macro-rules.rs
+++ b/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
index 8ced41022f8..8ced41022f8 100644
--- a/src/test/ui/compile-fail-migration/unused-macro-rules.stderr
+++ b/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
index 28a69e6f9e2..28a69e6f9e2 100644
--- 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
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
index 88435878905..88435878905 100644
--- 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
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
index dda0d3fc955..dda0d3fc955 100644
--- a/src/test/ui/compile-fail-migration/unused-macro-with-follow-violation.rs
+++ b/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
index 8efb191c7c6..8efb191c7c6 100644
--- a/src/test/ui/compile-fail-migration/unused-macro-with-follow-violation.stderr
+++ b/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
index 9e32f01724d..9e32f01724d 100644
--- a/src/test/ui/compile-fail-migration/unused-macro.rs
+++ b/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
index 3e1c1164d5b..3e1c1164d5b 100644
--- a/src/test/ui/compile-fail-migration/unused-macro.stderr
+++ b/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
index d4dc58864ad..d4dc58864ad 100644
--- a/src/test/ui/compile-fail-migration/unused-mut-warning-captured-var.rs
+++ b/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
index ae976d85bde..ae976d85bde 100644
--- a/src/test/ui/compile-fail-migration/unused-mut-warning-captured-var.stderr
+++ b/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
index 363ab6220bd..363ab6220bd 100644
--- a/src/test/ui/compile-fail-migration/unused-result.rs
+++ b/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
index e6ca7b8fab8..e6ca7b8fab8 100644
--- a/src/test/ui/compile-fail-migration/unused-result.stderr
+++ b/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
index 9a6d176d088..9a6d176d088 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/use_from_trait_xc.rs
+++ b/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
index a18c25cbb55..a18c25cbb55 100644
--- 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
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
index e2167ca446f..e2167ca446f 100644
--- 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
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
index 510cc708bed..510cc708bed 100644
--- 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
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
index 23753506368..23753506368 100644
--- 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
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
index addc5721752..addc5721752 100644
--- 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
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
index ab7494702d7..ab7494702d7 100644
--- 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
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
index 810fc68a0f4..810fc68a0f4 100644
--- 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
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
index 60cd142799e..60cd142799e 100644
--- 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
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
index 3b19e96d12c..3b19e96d12c 100644
--- a/src/test/ui/compile-fail-migration/use-after-move-self.nll.stderr
+++ b/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
index e9ffb26aba5..e9ffb26aba5 100644
--- a/src/test/ui/compile-fail-migration/use-after-move-self.rs
+++ b/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
index 7273602aadc..7273602aadc 100644
--- a/src/test/ui/compile-fail-migration/use-after-move-self.stderr
+++ b/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
index 3848b6814d9..3848b6814d9 100644
--- a/src/test/ui/compile-fail-migration/use-from-trait-xc.rs
+++ b/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
index 130aca8162a..130aca8162a 100644
--- a/src/test/ui/compile-fail-migration/use-from-trait-xc.stderr
+++ b/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
index 29db949acd0..29db949acd0 100644
--- a/src/test/ui/compile-fail-migration/use-from-trait.rs
+++ b/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
index b43a32988ca..b43a32988ca 100644
--- a/src/test/ui/compile-fail-migration/use-from-trait.stderr
+++ b/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
index aff54f18c19..aff54f18c19 100644
--- a/src/test/ui/compile-fail-migration/use-keyword.rs
+++ b/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
index 11893bce5c4..11893bce5c4 100644
--- a/src/test/ui/compile-fail-migration/use-keyword.stderr
+++ b/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
index 6b7b9c89149..6b7b9c89149 100644
--- a/src/test/ui/compile-fail-migration/use-meta-mismatch.rs
+++ b/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
index 063de29510e..063de29510e 100644
--- a/src/test/ui/compile-fail-migration/use-meta-mismatch.stderr
+++ b/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
index 37495cd1724..37495cd1724 100644
--- a/src/test/ui/use-mod.rs
+++ b/src/test/ui/use/use-mod.rs
diff --git a/src/test/ui/use-mod.stderr b/src/test/ui/use/use-mod.stderr
index dcdba6fce9a..dcdba6fce9a 100644
--- a/src/test/ui/use-mod.stderr
+++ b/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
index 5f8842a521a..5f8842a521a 100644
--- a/src/test/ui/compile-fail-migration/use-mod-2.rs
+++ b/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
index f343dc2b31d..f343dc2b31d 100644
--- a/src/test/ui/compile-fail-migration/use-mod-2.stderr
+++ b/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
index cce500800ca..cce500800ca 100644
--- a/src/test/ui/compile-fail-migration/use-mod-3.rs
+++ b/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
index 61923984641..61923984641 100644
--- a/src/test/ui/compile-fail-migration/use-mod-3.stderr
+++ b/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
index 275e5ff1da6..275e5ff1da6 100644
--- a/src/test/ui/compile-fail-migration/use-mod-4.rs
+++ b/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
index 9a6d608faac..9a6d608faac 100644
--- a/src/test/ui/compile-fail-migration/use-mod-4.stderr
+++ b/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
index 0a68d34ade9..0a68d34ade9 100644
--- a/src/test/ui/use-nested-groups-error.rs
+++ b/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
index 5e0fd503bc2..5e0fd503bc2 100644
--- a/src/test/ui/use-nested-groups-error.stderr
+++ b/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
index ddbf54fdd48..ddbf54fdd48 100644
--- a/src/test/ui/use-nested-groups-unused-imports.rs
+++ b/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
index e339664f374..e339664f374 100644
--- a/src/test/ui/use-nested-groups-unused-imports.stderr
+++ b/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
index db69bb33ae2..db69bb33ae2 100644
--- a/src/test/ui/compile-fail-migration/use-paths-as-items.rs
+++ b/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
index 200cefc23af..200cefc23af 100644
--- a/src/test/ui/compile-fail-migration/use-paths-as-items.stderr
+++ b/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
index 6b5286bf0a7..6b5286bf0a7 100644
--- a/src/test/ui/compile-fail-migration/use-self-type.rs
+++ b/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
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
index fc1a72f6f2b..fc1a72f6f2b 100644
--- a/src/test/ui/compile-fail-migration/use-super-global-path.rs
+++ b/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
index 4730653dbf9..4730653dbf9 100644
--- a/src/test/ui/compile-fail-migration/use-super-global-path.stderr
+++ b/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
index f170d9c25f5..f170d9c25f5 100644
--- a/src/test/ui/compile-fail-migration/used.rs
+++ b/src/test/ui/used.rs
diff --git a/src/test/ui/compile-fail-migration/used.stderr b/src/test/ui/used.stderr
index b8d0f42c3a3..b8d0f42c3a3 100644
--- a/src/test/ui/compile-fail-migration/used.stderr
+++ b/src/test/ui/used.stderr
diff --git a/src/test/ui/compile-fail-migration/useless-pub.rs b/src/test/ui/useless-pub.rs
index 064062df753..064062df753 100644
--- a/src/test/ui/compile-fail-migration/useless-pub.rs
+++ b/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
index 7e36bf2667e..7e36bf2667e 100644
--- a/src/test/ui/compile-fail-migration/useless-pub.stderr
+++ b/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
index 645514971da..645514971da 100644
--- a/src/test/ui/compile-fail-migration/useless_comment.rs
+++ b/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
index 78c6787c88e..78c6787c88e 100644
--- a/src/test/ui/compile-fail-migration/useless_comment.stderr
+++ b/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
index 02e1a585fa8..02e1a585fa8 100644
--- a/src/test/ui/compile-fail-migration/user-defined-macro-rules.rs
+++ b/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
index 3359aa4bcd7..3359aa4bcd7 100644
--- a/src/test/ui/compile-fail-migration/user-defined-macro-rules.stderr
+++ b/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
index 8594c35f8dd..8594c35f8dd 100644
--- a/src/test/ui/compile-fail-migration/utf8_idents.rs
+++ b/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
index 42ee13e0511..42ee13e0511 100644
--- a/src/test/ui/compile-fail-migration/utf8_idents.stderr
+++ b/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
index ec5669f6392..ec5669f6392 100644
--- a/src/test/ui/compile-fail-migration/variadic-ffi-2.rs
+++ b/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
index 9af7b5bf753..9af7b5bf753 100644
--- a/src/test/ui/compile-fail-migration/variadic-ffi-2.stderr
+++ b/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
index 9807952c636..9807952c636 100644
--- a/src/test/ui/variadic-ffi-3.rs
+++ b/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
index c7355405b2a..c7355405b2a 100644
--- a/src/test/ui/variadic-ffi-3.stderr
+++ b/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
index f245306f4d8..f245306f4d8 100644
--- a/src/test/ui/compile-fail-migration/variadic-ffi.rs
+++ b/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
index 0d0462b709d..0d0462b709d 100644
--- a/src/test/ui/compile-fail-migration/variadic-ffi.stderr
+++ b/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
index 7dbfc6ac125..7dbfc6ac125 100644
--- a/src/test/ui/compile-fail-migration/variance-associated-types.rs
+++ b/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
index 03ea1e625f8..03ea1e625f8 100644
--- a/src/test/ui/compile-fail-migration/variance-associated-types.stderr
+++ b/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
index 33230c26b8b..33230c26b8b 100644
--- a/src/test/ui/compile-fail-migration/variance-btree-invariant-types.nll.stderr
+++ b/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
index e9607de00a3..e9607de00a3 100644
--- a/src/test/ui/compile-fail-migration/variance-btree-invariant-types.rs
+++ b/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
index 96f76fa5c2d..96f76fa5c2d 100644
--- a/src/test/ui/compile-fail-migration/variance-btree-invariant-types.stderr
+++ b/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
index 39d87a563e5..39d87a563e5 100644
--- a/src/test/ui/compile-fail-migration/variance-cell-is-invariant.rs
+++ b/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
index 8fb5d9bf38b..8fb5d9bf38b 100644
--- a/src/test/ui/compile-fail-migration/variance-cell-is-invariant.stderr
+++ b/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
index 67d43dd5070..67d43dd5070 100644
--- a/src/test/ui/compile-fail-migration/variance-contravariant-arg-object.nll.stderr
+++ b/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
index 1795ac95358..1795ac95358 100644
--- a/src/test/ui/compile-fail-migration/variance-contravariant-arg-object.rs
+++ b/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
index aeed03733f3..aeed03733f3 100644
--- a/src/test/ui/compile-fail-migration/variance-contravariant-arg-object.stderr
+++ b/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
index 96791304d93..96791304d93 100644
--- a/src/test/ui/compile-fail-migration/variance-contravariant-arg-trait-match.rs
+++ b/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
index 282220d1037..282220d1037 100644
--- a/src/test/ui/compile-fail-migration/variance-contravariant-arg-trait-match.stderr
+++ b/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
index c04ba8862c3..c04ba8862c3 100644
--- a/src/test/ui/compile-fail-migration/variance-contravariant-self-trait-match.rs
+++ b/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
index 9e60a70bc16..9e60a70bc16 100644
--- a/src/test/ui/compile-fail-migration/variance-contravariant-self-trait-match.stderr
+++ b/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
index 55413e57a94..55413e57a94 100644
--- a/src/test/ui/compile-fail-migration/variance-covariant-arg-object.nll.stderr
+++ b/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
index ad059a467f5..ad059a467f5 100644
--- a/src/test/ui/compile-fail-migration/variance-covariant-arg-object.rs
+++ b/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
index 074ef658419..074ef658419 100644
--- a/src/test/ui/compile-fail-migration/variance-covariant-arg-object.stderr
+++ b/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
index fbda62f34fa..fbda62f34fa 100644
--- a/src/test/ui/compile-fail-migration/variance-covariant-arg-trait-match.rs
+++ b/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
index 648acc2119f..648acc2119f 100644
--- a/src/test/ui/compile-fail-migration/variance-covariant-arg-trait-match.stderr
+++ b/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
index 3e0c1da3bca..3e0c1da3bca 100644
--- a/src/test/ui/compile-fail-migration/variance-covariant-self-trait-match.rs
+++ b/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
index cb8fe0b7890..cb8fe0b7890 100644
--- a/src/test/ui/compile-fail-migration/variance-covariant-self-trait-match.stderr
+++ b/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
index f9097519246..f9097519246 100644
--- a/src/test/ui/compile-fail-migration/variance-invariant-arg-object.nll.stderr
+++ b/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
index 9edb510b826..9edb510b826 100644
--- a/src/test/ui/compile-fail-migration/variance-invariant-arg-object.rs
+++ b/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
index 3283ae67e51..3283ae67e51 100644
--- a/src/test/ui/compile-fail-migration/variance-invariant-arg-object.stderr
+++ b/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
index 771fcdeb62f..771fcdeb62f 100644
--- a/src/test/ui/compile-fail-migration/variance-invariant-arg-trait-match.rs
+++ b/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
index 3f635495069..3f635495069 100644
--- a/src/test/ui/compile-fail-migration/variance-invariant-arg-trait-match.stderr
+++ b/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
index 57abf6f8979..57abf6f8979 100644
--- a/src/test/ui/compile-fail-migration/variance-invariant-self-trait-match.rs
+++ b/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
index 1b864abc4f0..1b864abc4f0 100644
--- a/src/test/ui/compile-fail-migration/variance-invariant-self-trait-match.stderr
+++ b/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
index f9e2ae89a9d..f9e2ae89a9d 100644
--- a/src/test/ui/compile-fail-migration/variance-issue-20533.nll.stderr
+++ b/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
index 60690012485..60690012485 100644
--- a/src/test/ui/compile-fail-migration/variance-issue-20533.rs
+++ b/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
index 680dea2447f..680dea2447f 100644
--- a/src/test/ui/compile-fail-migration/variance-issue-20533.stderr
+++ b/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
index 1f54771e367..1f54771e367 100644
--- a/src/test/ui/compile-fail-migration/variance-object-types.rs
+++ b/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
index 9a1c9965de3..9a1c9965de3 100644
--- a/src/test/ui/compile-fail-migration/variance-object-types.stderr
+++ b/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
index cd047cc580f..cd047cc580f 100644
--- a/src/test/ui/compile-fail-migration/variance-regions-direct.rs
+++ b/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
index 81cb929c63b..81cb929c63b 100644
--- a/src/test/ui/compile-fail-migration/variance-regions-direct.stderr
+++ b/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
index 60d4d73fe88..60d4d73fe88 100644
--- a/src/test/ui/compile-fail-migration/variance-regions-indirect.rs
+++ b/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
index edf39537ff6..edf39537ff6 100644
--- a/src/test/ui/compile-fail-migration/variance-regions-indirect.stderr
+++ b/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
index 037fff72c80..037fff72c80 100644
--- a/src/test/ui/compile-fail-migration/variance-regions-unused-direct.rs
+++ b/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
index e3d02c649dc..e3d02c649dc 100644
--- a/src/test/ui/compile-fail-migration/variance-regions-unused-direct.stderr
+++ b/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
index 2d234ed7b57..2d234ed7b57 100644
--- a/src/test/ui/compile-fail-migration/variance-regions-unused-indirect.rs
+++ b/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
index f3eee86d5ab..f3eee86d5ab 100644
--- a/src/test/ui/compile-fail-migration/variance-regions-unused-indirect.stderr
+++ b/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
index ff446f175b7..ff446f175b7 100644
--- a/src/test/ui/compile-fail-migration/variance-trait-bounds.rs
+++ b/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
index 1c82ed772e2..1c82ed772e2 100644
--- a/src/test/ui/compile-fail-migration/variance-trait-bounds.stderr
+++ b/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
index baf75b73463..baf75b73463 100644
--- a/src/test/ui/compile-fail-migration/variance-trait-matching.nll.stderr
+++ b/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
index bc9eab2be82..bc9eab2be82 100644
--- a/src/test/ui/compile-fail-migration/variance-trait-matching.rs
+++ b/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
index 645d0ffd311..645d0ffd311 100644
--- a/src/test/ui/compile-fail-migration/variance-trait-matching.stderr
+++ b/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
index b120588ecab..b120588ecab 100644
--- a/src/test/ui/compile-fail-migration/variance-trait-object-bound.rs
+++ b/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
index b44fa940ed3..b44fa940ed3 100644
--- a/src/test/ui/compile-fail-migration/variance-trait-object-bound.stderr
+++ b/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
index 5075dd2ceed..5075dd2ceed 100644
--- a/src/test/ui/compile-fail-migration/variance-types-bounds.rs
+++ b/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
index e4b0887912b..e4b0887912b 100644
--- a/src/test/ui/compile-fail-migration/variance-types-bounds.stderr
+++ b/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
index 7667972c9d2..7667972c9d2 100644
--- a/src/test/ui/compile-fail-migration/variance-types.rs
+++ b/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
index 59975fa7a7e..59975fa7a7e 100644
--- a/src/test/ui/compile-fail-migration/variance-types.stderr
+++ b/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
index 407282e5ce0..407282e5ce0 100644
--- a/src/test/ui/compile-fail-migration/variance-unused-region-param.rs
+++ b/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
index 354fcf373a6..354fcf373a6 100644
--- a/src/test/ui/compile-fail-migration/variance-unused-region-param.stderr
+++ b/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
index a5f6fd2fda1..a5f6fd2fda1 100644
--- a/src/test/ui/variance-unused-type-param.rs
+++ b/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
index b3ae91a6fa5..b3ae91a6fa5 100644
--- a/src/test/ui/variance-unused-type-param.stderr
+++ b/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
index 5189945982d..5189945982d 100644
--- 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
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
index d2fd2978750..d2fd2978750 100644
--- a/src/test/ui/compile-fail-migration/variance-use-contravariant-struct-1.rs
+++ b/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
index 48e0d380c66..48e0d380c66 100644
--- a/src/test/ui/compile-fail-migration/variance-use-contravariant-struct-1.stderr
+++ b/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
index b38fd0e9ffc..b38fd0e9ffc 100644
--- a/src/test/ui/compile-fail-migration/variance-use-contravariant-struct-2.rs
+++ b/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
index e3663eb0345..e3663eb0345 100644
--- a/src/test/ui/compile-fail-migration/variance-use-contravariant-struct-2.stderr
+++ b/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
index 8c47513a587..8c47513a587 100644
--- 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
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
index 2631cfc05e8..2631cfc05e8 100644
--- a/src/test/ui/compile-fail-migration/variance-use-covariant-struct-1.rs
+++ b/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
index 947abe24b55..947abe24b55 100644
--- a/src/test/ui/compile-fail-migration/variance-use-covariant-struct-1.stderr
+++ b/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
index d8e1a5f5f1c..d8e1a5f5f1c 100644
--- a/src/test/ui/compile-fail-migration/variance-use-covariant-struct-2.rs
+++ b/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
index 9c3a1cf1cc2..9c3a1cf1cc2 100644
--- a/src/test/ui/compile-fail-migration/variance-use-covariant-struct-2.stderr
+++ b/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
index 6553efdbd62..6553efdbd62 100644
--- 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
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
index c89436b2094..c89436b2094 100644
--- a/src/test/ui/compile-fail-migration/variance-use-invariant-struct-1.rs
+++ b/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
index 30da7e38c57..30da7e38c57 100644
--- a/src/test/ui/compile-fail-migration/variance-use-invariant-struct-1.stderr
+++ b/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
index d7fd2968495..d7fd2968495 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/variant-namespacing.rs
+++ b/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
index 58bfd91550e..58bfd91550e 100644
--- a/src/test/ui/compile-fail-migration/variant-namespacing.rs
+++ b/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
index 322ea617f34..322ea617f34 100644
--- a/src/test/ui/compile-fail-migration/variant-namespacing.stderr
+++ b/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
index f2cffeefe90..f2cffeefe90 100644
--- a/src/test/ui/compile-fail-migration/variant-size-differences.rs
+++ b/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
index a41a5c17ea3..a41a5c17ea3 100644
--- a/src/test/ui/compile-fail-migration/variant-size-differences.stderr
+++ b/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
index c889b7d28f8..c889b7d28f8 100644
--- a/src/test/ui/compile-fail-migration/variant-used-as-type.rs
+++ b/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
index 972fe8a8a61..972fe8a8a61 100644
--- a/src/test/ui/compile-fail-migration/variant-used-as-type.stderr
+++ b/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
index c79e67a3768..c79e67a3768 100644
--- a/src/test/ui/compile-fail-migration/vec-macro-with-comma-only.rs
+++ b/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
index f5341ccc312..f5341ccc312 100644
--- a/src/test/ui/compile-fail-migration/vec-macro-with-comma-only.stderr
+++ b/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
index fd7843f39bc..fd7843f39bc 100644
--- a/src/test/ui/compile-fail-migration/vec-mut-iter-borrow.nll.stderr
+++ b/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
index 571634e3992..571634e3992 100644
--- a/src/test/ui/compile-fail-migration/vec-mut-iter-borrow.rs
+++ b/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
index 18fdf2c6867..18fdf2c6867 100644
--- a/src/test/ui/compile-fail-migration/vec-mut-iter-borrow.stderr
+++ b/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
index 27f6fc51164..27f6fc51164 100644
--- a/src/test/ui/compile-fail-migration/vec-res-add.rs
+++ b/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
index 62d3f046c96..62d3f046c96 100644
--- a/src/test/ui/compile-fail-migration/vec-res-add.stderr
+++ b/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
index 26c59c440d4..26c59c440d4 100644
--- a/src/test/ui/compile-fail-migration/vector-cast-weirdness.rs
+++ b/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
index a096fee16b9..a096fee16b9 100644
--- a/src/test/ui/compile-fail-migration/vector-cast-weirdness.stderr
+++ b/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
index 8b3e9369ece..8b3e9369ece 100644
--- a/src/test/ui/compile-fail-migration/vtable-res-trait-param.rs
+++ b/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
index 0d0e8202623..0d0e8202623 100644
--- a/src/test/ui/compile-fail-migration/vtable-res-trait-param.stderr
+++ b/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
index 668473882ab..668473882ab 100644
--- a/src/test/ui/compile-fail-migration/walk-struct-literal-with.nll.stderr
+++ b/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
index 10503084b9d..10503084b9d 100644
--- a/src/test/ui/compile-fail-migration/walk-struct-literal-with.rs
+++ b/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
index 751e41f5ce9..751e41f5ce9 100644
--- a/src/test/ui/compile-fail-migration/walk-struct-literal-with.stderr
+++ b/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
index 892d82d0934..892d82d0934 100644
--- a/src/test/ui/compile-fail-migration/warn-path-statement.rs
+++ b/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
index 44b194bc62d..44b194bc62d 100644
--- a/src/test/ui/compile-fail-migration/warn-path-statement.stderr
+++ b/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
index 42972c40674..42972c40674 100644
--- a/src/test/ui/compile-fail-migration/weak-lang-item.rs
+++ b/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
index e85b777b203..e85b777b203 100644
--- a/src/test/ui/compile-fail-migration/weak-lang-item.stderr
+++ b/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
index 946341a1a75..946341a1a75 100644
--- a/src/test/ui/compile-fail-migration/wf-array-elem-sized.rs
+++ b/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
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 <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-sized>
+   = note: to learn more, visit <https://doc.rust-lang.org/book/second-edition/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = 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
index c3015afd8dd..c3015afd8dd 100644
--- a/src/test/ui/compile-fail-migration/wf-const-type.rs
+++ b/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
index 1c07824ef77..1c07824ef77 100644
--- a/src/test/ui/compile-fail-migration/wf-const-type.stderr
+++ b/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
index e3e79fdd940..e3e79fdd940 100644
--- a/src/test/ui/compile-fail-migration/wf-enum-bound.rs
+++ b/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
index 3313eb20508..3313eb20508 100644
--- a/src/test/ui/compile-fail-migration/wf-enum-bound.stderr
+++ b/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
index 5eb53e7edde..5eb53e7edde 100644
--- a/src/test/ui/compile-fail-migration/wf-enum-fields-struct-variant.rs
+++ b/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
index 86a605f073c..86a605f073c 100644
--- a/src/test/ui/compile-fail-migration/wf-enum-fields-struct-variant.stderr
+++ b/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
index 76ad40f8457..76ad40f8457 100644
--- a/src/test/ui/compile-fail-migration/wf-enum-fields.rs
+++ b/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
index 5aa263f389a..5aa263f389a 100644
--- a/src/test/ui/compile-fail-migration/wf-enum-fields.stderr
+++ b/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
index 3ed9e5d9f1e..3ed9e5d9f1e 100644
--- a/src/test/ui/compile-fail-migration/wf-fn-where-clause.rs
+++ b/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
index 5f0f982577e..5f0f982577e 100644
--- a/src/test/ui/compile-fail-migration/wf-fn-where-clause.stderr
+++ b/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
index a319b676eeb..a319b676eeb 100644
--- a/src/test/ui/compile-fail-migration/wf-impl-associated-type-region.rs
+++ b/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
index f238b3c0d13..f238b3c0d13 100644
--- a/src/test/ui/compile-fail-migration/wf-impl-associated-type-region.stderr
+++ b/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
index 1e82f609d2a..1e82f609d2a 100644
--- a/src/test/ui/compile-fail-migration/wf-impl-associated-type-trait.rs
+++ b/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
index 595c5b4d8fd..595c5b4d8fd 100644
--- a/src/test/ui/compile-fail-migration/wf-impl-associated-type-trait.stderr
+++ b/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
index e302cac0006..e302cac0006 100644
--- a/src/test/ui/compile-fail-migration/wf-in-fn-arg.rs
+++ b/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
index f82bc1674df..f82bc1674df 100644
--- a/src/test/ui/compile-fail-migration/wf-in-fn-arg.stderr
+++ b/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
index 719bc9282ad..719bc9282ad 100644
--- a/src/test/ui/compile-fail-migration/wf-in-fn-ret.rs
+++ b/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
index 357199c4e31..357199c4e31 100644
--- a/src/test/ui/compile-fail-migration/wf-in-fn-ret.stderr
+++ b/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
index 08ee0e954ac..08ee0e954ac 100644
--- a/src/test/ui/compile-fail-migration/wf-in-fn-type-arg.rs
+++ b/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
index 7e3d22b262c..7e3d22b262c 100644
--- a/src/test/ui/compile-fail-migration/wf-in-fn-type-arg.stderr
+++ b/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
index 6942f786060..6942f786060 100644
--- a/src/test/ui/compile-fail-migration/wf-in-fn-type-ret.rs
+++ b/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
index 5d592532d28..5d592532d28 100644
--- a/src/test/ui/compile-fail-migration/wf-in-fn-type-ret.stderr
+++ b/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
index 8e3bca09758..8e3bca09758 100644
--- a/src/test/ui/compile-fail-migration/wf-in-fn-type-static.rs
+++ b/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
index 0013331f010..0013331f010 100644
--- a/src/test/ui/compile-fail-migration/wf-in-fn-type-static.stderr
+++ b/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
index c2f66a2a460..c2f66a2a460 100644
--- a/src/test/ui/compile-fail-migration/wf-in-fn-where-clause.rs
+++ b/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
index 76693eace2f..76693eace2f 100644
--- a/src/test/ui/compile-fail-migration/wf-in-fn-where-clause.stderr
+++ b/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
index 11535fb9f9e..11535fb9f9e 100644
--- a/src/test/ui/compile-fail-migration/wf-in-obj-type-static.rs
+++ b/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
index 5cbb4be7e92..5cbb4be7e92 100644
--- a/src/test/ui/compile-fail-migration/wf-in-obj-type-static.stderr
+++ b/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
index add48219c1d..add48219c1d 100644
--- a/src/test/ui/compile-fail-migration/wf-in-obj-type-trait.rs
+++ b/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
index 93af991cc93..93af991cc93 100644
--- a/src/test/ui/compile-fail-migration/wf-in-obj-type-trait.stderr
+++ b/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
index 78e12c47e24..78e12c47e24 100644
--- 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
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
index 25ec4195ab1..25ec4195ab1 100644
--- 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
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
index 7edbb11e245..7edbb11e245 100644
--- a/src/test/ui/compile-fail-migration/wf-inherent-impl-where-clause.rs
+++ b/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
index 3c5c557db42..3c5c557db42 100644
--- a/src/test/ui/compile-fail-migration/wf-inherent-impl-where-clause.stderr
+++ b/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
index 48a68bf5749..48a68bf5749 100644
--- 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
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
index 055c86a03a7..055c86a03a7 100644
--- a/src/test/ui/compile-fail-migration/wf-misc-methods-issue-28609.rs
+++ b/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
index 352697e6f94..352697e6f94 100644
--- a/src/test/ui/compile-fail-migration/wf-misc-methods-issue-28609.stderr
+++ b/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
index 92c0a8c5be8..92c0a8c5be8 100644
--- a/src/test/ui/compile-fail-migration/wf-object-safe.rs
+++ b/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
index 3d42c52136b..3d42c52136b 100644
--- a/src/test/ui/compile-fail-migration/wf-object-safe.stderr
+++ b/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
index c11b2e4c544..c11b2e4c544 100644
--- 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
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
index 9a8c63126f2..9a8c63126f2 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/wf-static-method.nll.stderr b/src/test/ui/wf/wf-static-method.nll.stderr
index 77896ff2ece..77896ff2ece 100644
--- a/src/test/ui/compile-fail-migration/wf-static-method.nll.stderr
+++ b/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
index e99957c7914..e99957c7914 100644
--- a/src/test/ui/compile-fail-migration/wf-static-method.rs
+++ b/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
index 0de2d8e6ca0..0de2d8e6ca0 100644
--- a/src/test/ui/compile-fail-migration/wf-static-method.stderr
+++ b/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
index ba02c5dca3e..ba02c5dca3e 100644
--- a/src/test/ui/compile-fail-migration/wf-static-type.rs
+++ b/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
index f76444cfe1f..f76444cfe1f 100644
--- a/src/test/ui/compile-fail-migration/wf-static-type.stderr
+++ b/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
index e263b251aa3..e263b251aa3 100644
--- a/src/test/ui/compile-fail-migration/wf-struct-bound.rs
+++ b/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
index 397d8609ceb..397d8609ceb 100644
--- a/src/test/ui/compile-fail-migration/wf-struct-bound.stderr
+++ b/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
index 8a631a6c335..8a631a6c335 100644
--- a/src/test/ui/compile-fail-migration/wf-struct-field.rs
+++ b/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
index 48a03c71d7d..48a03c71d7d 100644
--- a/src/test/ui/compile-fail-migration/wf-struct-field.stderr
+++ b/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
index 8420edd66a1..8420edd66a1 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-associated-type-bound.rs
+++ b/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
index f09ba381db1..f09ba381db1 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-associated-type-bound.stderr
+++ b/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
index 95d9ffdf9d3..95d9ffdf9d3 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-associated-type-region.rs
+++ b/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
index 26d56f7e964..26d56f7e964 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-associated-type-region.stderr
+++ b/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
index 902cbe2676b..902cbe2676b 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-associated-type-trait.rs
+++ b/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
index 6bfca64c443..6bfca64c443 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-associated-type-trait.stderr
+++ b/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
index ca15a6ab648..ca15a6ab648 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-bound.rs
+++ b/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
index 4c21959d9f7..4c21959d9f7 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-bound.stderr
+++ b/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
index 453aa2428ce..453aa2428ce 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-default-fn-arg.rs
+++ b/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
index 5754fd77b72..5754fd77b72 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-default-fn-arg.stderr
+++ b/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
index d94708d3e06..d94708d3e06 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-default-fn-ret.rs
+++ b/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
index 28d690b1b05..28d690b1b05 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-default-fn-ret.stderr
+++ b/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
index 29c85250583..29c85250583 100644
--- 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
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
index c135f199a26..c135f199a26 100644
--- 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
diff --git a/src/test/ui/compile-fail-migration/wf-trait-fn-arg.rs b/src/test/ui/wf/wf-trait-fn-arg.rs
index d88e36faeec..d88e36faeec 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-fn-arg.rs
+++ b/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
index 6d624fc62ff..6d624fc62ff 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-fn-arg.stderr
+++ b/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
index c368ff9a4a8..c368ff9a4a8 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-fn-ret.rs
+++ b/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
index dca26a63079..dca26a63079 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-fn-ret.stderr
+++ b/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
index f46a54504a0..f46a54504a0 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-fn-where-clause.rs
+++ b/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
index 887f60935b0..887f60935b0 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-fn-where-clause.stderr
+++ b/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
index ea8b2fdf3a1..ea8b2fdf3a1 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-superbound.rs
+++ b/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
index ac58dc7496e..ac58dc7496e 100644
--- a/src/test/ui/compile-fail-migration/wf-trait-superbound.stderr
+++ b/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
index 458ee669424..458ee669424 100644
--- 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
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
index 0d6906a85d5..0d6906a85d5 100644
--- 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
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
index b3f99f2ae25..b3f99f2ae25 100644
--- 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
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
index 976cca7b895..976cca7b895 100644
--- 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
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
index 05a58daf906..05a58daf906 100644
--- a/src/test/ui/compile-fail-migration/where-clause-method-substituion.rs
+++ b/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
index 5cd4c395869..5cd4c395869 100644
--- a/src/test/ui/compile-fail-migration/where-clause-method-substituion.stderr
+++ b/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
index 1ac03330afd..1ac03330afd 100644
--- a/src/test/ui/compile-fail-migration/where-clauses-method-unsatisfied.rs
+++ b/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
index eeb0b51b80a..eeb0b51b80a 100644
--- a/src/test/ui/compile-fail-migration/where-clauses-method-unsatisfied.stderr
+++ b/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
index ffc39008c4e..ffc39008c4e 100644
--- a/src/test/ui/compile-fail-migration/where-clauses-unsatisfied.rs
+++ b/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
index dd042599382..dd042599382 100644
--- a/src/test/ui/compile-fail-migration/where-clauses-unsatisfied.stderr
+++ b/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
index e449a736c75..e449a736c75 100644
--- a/src/test/ui/compile-fail-migration/where-equality-constraints.rs
+++ b/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
index f2bcfacc452..f2bcfacc452 100644
--- a/src/test/ui/compile-fail-migration/where-equality-constraints.stderr
+++ b/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
index bf8fc292173..bf8fc292173 100644
--- a/src/test/ui/compile-fail-migration/where-for-self-2.rs
+++ b/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
index d234c718215..d234c718215 100644
--- a/src/test/ui/compile-fail-migration/where-for-self-2.stderr
+++ b/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
index 8f447face4e..8f447face4e 100644
--- a/src/test/ui/compile-fail-migration/where-for-self.rs
+++ b/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
index 89c0bd023c3..89c0bd023c3 100644
--- a/src/test/ui/compile-fail-migration/where-for-self.stderr
+++ b/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
index 1204cc0df47..1204cc0df47 100644
--- a/src/test/ui/compile-fail-migration/where-lifetime-resolution.rs
+++ b/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
index a6fc1b25962..a6fc1b25962 100644
--- a/src/test/ui/compile-fail-migration/where-lifetime-resolution.stderr
+++ b/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
index a70dcccd4e8..a70dcccd4e8 100644
--- a/src/test/ui/compile-fail-migration/while-let.rs
+++ b/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
index de4d8be212e..de4d8be212e 100644
--- a/src/test/ui/compile-fail-migration/while-let.stderr
+++ b/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
index ecab746373a..ecab746373a 100644
--- a/src/test/ui/compile-fail-migration/while-type-error.rs
+++ b/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
index cfc3f3e257e..cfc3f3e257e 100644
--- a/src/test/ui/compile-fail-migration/while-type-error.stderr
+++ b/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
index 7772cfd6a2c..7772cfd6a2c 100644
--- a/src/test/ui/compile-fail-migration/windows-subsystem-invalid.rs
+++ b/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
index 0cb843cf0f1..0cb843cf0f1 100644
--- a/src/test/ui/compile-fail-migration/windows-subsystem-invalid.stderr
+++ b/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
index 1ea74f73723..1ea74f73723 100644
--- 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
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
index f07d240746f..f07d240746f 100644
--- 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
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
index 96899276b97..96899276b97 100644
--- a/src/test/ui/compile-fail-migration/writing-to-immutable-vec.nll.stderr
+++ b/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
index f289b85992e..f289b85992e 100644
--- a/src/test/ui/compile-fail-migration/writing-to-immutable-vec.rs
+++ b/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
index 07e17797139..07e17797139 100644
--- a/src/test/ui/compile-fail-migration/writing-to-immutable-vec.stderr
+++ b/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
index 069fd2dec99..069fd2dec99 100644
--- a/src/test/ui/compile-fail-migration/wrong-mul-method-signature.rs
+++ b/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
index 7c4d22c7cca..7c4d22c7cca 100644
--- a/src/test/ui/compile-fail-migration/wrong-mul-method-signature.stderr
+++ b/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
index 6db11fcffd2..6db11fcffd2 100644
--- a/src/test/ui/compile-fail-migration/wrong-ret-type.rs
+++ b/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
index 4ff6f707603..4ff6f707603 100644
--- a/src/test/ui/compile-fail-migration/wrong-ret-type.stderr
+++ b/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
index edc0e31040d..edc0e31040d 100644
--- a/src/test/ui/compile-fail-migration/xc-private-method.rs
+++ b/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
index 35078e73d46..35078e73d46 100644
--- a/src/test/ui/compile-fail-migration/xc-private-method.stderr
+++ b/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
index 26e055d7cbb..26e055d7cbb 100644
--- a/src/test/ui/compile-fail-migration/xc-private-method2.rs
+++ b/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
index d671aa35817..d671aa35817 100644
--- a/src/test/ui/compile-fail-migration/xc-private-method2.stderr
+++ b/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 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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
index 7a69be2b06c..7a69be2b06c 100644
--- a/src/test/ui/compile-fail-migration/auxiliary/xcrate_unit_struct.rs
+++ b/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
index 7dd4d970945..7dd4d970945 100644
--- a/src/test/ui/compile-fail-migration/xcrate-private-by-default.rs
+++ b/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
index c4560b9ca77..c4560b9ca77 100644
--- a/src/test/ui/compile-fail-migration/xcrate-private-by-default.stderr
+++ b/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
index 04af7133000..04af7133000 100644
--- a/src/test/ui/compile-fail-migration/xcrate-unit-struct.rs
+++ b/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
index 9ee4cb3ba17..9ee4cb3ba17 100644
--- a/src/test/ui/compile-fail-migration/xcrate-unit-struct.stderr
+++ b/src/test/ui/xcrate/xcrate-unit-struct.stderr